diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-02-20 12:23:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-14 14:42:17 +0000 |
commit | 1cf9dd6492e2e234a3b41419d84e94ca1520954c (patch) | |
tree | ff10a96ac3538e5773ff3191a7e4fb885b0f9b76 /meta/classes | |
parent | 529244ee212fe14019e35a5f163fab705ddbf141 (diff) | |
download | poky-1cf9dd6492e2e234a3b41419d84e94ca1520954c.tar.gz |
package_rpm.bbclass: add a /bin/sh Provides for nativesdk- packages
nativesdk-* rpm packages all require /bin/sh because postinst scriptlets
are run with it. We can either teach rpm4 and dnf to ignore that dependency
(a lot of non-upstreamable work), or add auto-satisfy the dependency
in each package. I've chosen to do the latter.
(From OE-Core rev: b18c32ab6bc9c4f1953e9f79aa39bc92d1c4e30d)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index ff86dc8798..2cdaae0ff2 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -560,7 +560,7 @@ python write_specfile () { | |||
560 | 560 | ||
561 | print_deps(srcrrecommends, "Recommends", spec_preamble_top, d) | 561 | print_deps(srcrrecommends, "Recommends", spec_preamble_top, d) |
562 | print_deps(srcrsuggests, "Suggests", spec_preamble_top, d) | 562 | print_deps(srcrsuggests, "Suggests", spec_preamble_top, d) |
563 | print_deps(srcrprovides, "Provides", spec_preamble_top, d) | 563 | print_deps(srcrprovides + (" /bin/sh" if srcname.startswith("nativesdk-") else ""), "Provides", spec_preamble_top, d) |
564 | print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d) | 564 | print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d) |
565 | 565 | ||
566 | # conflicts can not be in a provide! We will need to filter it. | 566 | # conflicts can not be in a provide! We will need to filter it. |