summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-01-19 19:24:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:42:17 +0000
commitdf3734551fdf1f3f0909a83b74c4feb4c483f7d1 (patch)
tree7e6c6f680e28df144a7e409c2f31214bbb337e3e /meta
parentb9c550dd6e98dc6c79a01ba27937f3c2a9876ee6 (diff)
downloadpoky-df3734551fdf1f3f0909a83b74c4feb4c483f7d1.tar.gz
package_rpm.bbclass: correctly map RRECOMMENDS and RSUGGESTS to rpm tags
Previously they were swapped, not sure why. Their meaning, as far as rpm world goes, is different: - Recommends is a soft dependency and will be installed by default; there is an option not to do that. - Suggests is a suggestion to be picked up and presented to end user by package management tools; it has no special meaning otherwise. OE packages use RRECOMMENDS, which should be mapped to Recommends rpm tag, so that the packages will be picked up as dependencies. (From OE-Core rev: 06270f20ba4312d20d0fd348595adf1b239bcac5) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_rpm.bbclass12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 07eb974f73..480c6d58d3 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -450,10 +450,8 @@ python write_specfile () {
450 if splitrpostrm: 450 if splitrpostrm:
451 print_deps(splitrdepends, "Requires(postun)", spec_preamble_bottom, d) 451 print_deps(splitrdepends, "Requires(postun)", spec_preamble_bottom, d)
452 452
453 # Suggests in RPM are like recommends in OE-core! 453 print_deps(splitrrecommends, "Recommends", spec_preamble_bottom, d)
454 print_deps(splitrrecommends, "Suggests", spec_preamble_bottom, d) 454 print_deps(splitrsuggests, "Suggests", spec_preamble_bottom, d)
455 # While there is no analog for suggests... (So call them recommends for now)
456 print_deps(splitrsuggests, "Recommends", spec_preamble_bottom, d)
457 print_deps(splitrprovides, "Provides", spec_preamble_bottom, d) 455 print_deps(splitrprovides, "Provides", spec_preamble_bottom, d)
458 print_deps(splitrobsoletes, "Obsoletes", spec_preamble_bottom, d) 456 print_deps(splitrobsoletes, "Obsoletes", spec_preamble_bottom, d)
459 457
@@ -560,10 +558,8 @@ python write_specfile () {
560 if srcrpostrm: 558 if srcrpostrm:
561 print_deps(srcrdepends, "Requires(postun)", spec_preamble_top, d) 559 print_deps(srcrdepends, "Requires(postun)", spec_preamble_top, d)
562 560
563 # Suggests in RPM are like recommends in OE-core! 561 print_deps(srcrrecommends, "Recommends", spec_preamble_top, d)
564 print_deps(srcrrecommends, "Suggests", spec_preamble_top, d) 562 print_deps(srcrsuggests, "Suggests", spec_preamble_top, d)
565 # While there is no analog for suggests... (So call them recommends for now)
566 print_deps(srcrsuggests, "Recommends", spec_preamble_top, d)
567 print_deps(srcrprovides, "Provides", spec_preamble_top, d) 563 print_deps(srcrprovides, "Provides", spec_preamble_top, d)
568 print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d) 564 print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d)
569 565