diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-21 00:19:34 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-22 15:46:51 +0100 |
| commit | dd2c603befdd65c92c6196d5b103568249766b3e (patch) | |
| tree | c14bc882e08d5225ce6a9ac39caf5178e3867b9b | |
| parent | f3fc6de9de6b6a24649864c598d5ee9abfae4af3 (diff) | |
| download | openembedded-core-contrib-dd2c603befdd65c92c6196d5b103568249766b3e.tar.gz | |
nativesdk-sdk-provides-dummy: Add /bin/sh
By doing this we can revert b18c32ab6bc9c4f1953e9f79aa39bc92d1c4e30d which
was a pretty ugly hack anyway and now means the different providers are all
being handled consistently.
Anyone with SDK recipes will need to ensure nativesdk-sdk-provides-dummy
is included in those builds (or an equivalent). This is a good thing to
do anyway.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/meta/testexport-tarball.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/meta/uninative-tarball.bb | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 519c22be47..53b4700cdd 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -557,7 +557,7 @@ python write_specfile () { print_deps(srcrrecommends, "Recommends", spec_preamble_top, d) print_deps(srcrsuggests, "Suggests", spec_preamble_top, d) - print_deps(srcrprovides + (" /bin/sh" if srcname.startswith("nativesdk-") else ""), "Provides", spec_preamble_top, d) + print_deps(srcrprovides, "Provides", spec_preamble_top, d) print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d) print_deps(srcrconflicts, "Conflicts", spec_preamble_top, d) diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 3785941c2c..75b71f5532 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -6,6 +6,7 @@ LICENSE = "MIT" TOOLCHAIN_TARGET_TASK ?= "" TOOLCHAIN_HOST_TASK ?= "\ + nativesdk-sdk-provides-dummy \ nativesdk-python3-core \ nativesdk-python3-modules \ nativesdk-python3-misc \ diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb index 29f4dd3633..1d71f373a4 100644 --- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb @@ -4,8 +4,8 @@ DUMMYPROVIDES_PACKAGES = "\ pkgconfig \ " -# Add /bin/sh? DUMMYPROVIDES = "\ + /bin/sh \ /bin/bash \ /usr/bin/env \ libGL.so()(64bit) \ diff --git a/meta/recipes-core/meta/testexport-tarball.bb b/meta/recipes-core/meta/testexport-tarball.bb index c38ac902a0..daedd78cb4 100644 --- a/meta/recipes-core/meta/testexport-tarball.bb +++ b/meta/recipes-core/meta/testexport-tarball.bb @@ -8,7 +8,7 @@ TEST_EXPORT_SDK_PACKAGES ??= "" TOOLCHAIN_TARGET_TASK ?= "" -TOOLCHAIN_HOST_TASK ?= "${TEST_EXPORT_SDK_PACKAGES}" +TOOLCHAIN_HOST_TASK ?= "${TEST_EXPORT_SDK_PACKAGES} nativesdk-sdk-provides-dummy" MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}" diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb index 39638eb8c5..c4a6c96b4d 100644 --- a/meta/recipes-core/meta/uninative-tarball.bb +++ b/meta/recipes-core/meta/uninative-tarball.bb @@ -18,6 +18,7 @@ TOOLCHAIN_HOST_TASK = "\ nativesdk-libxcrypt \ nativesdk-libxcrypt-compat \ nativesdk-libnss-nis \ + nativesdk-sdk-provides-dummy \ " INHIBIT_DEFAULT_DEPS = "1" |