diff options
Diffstat (limited to 'meta')
-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 () { | |||
557 | 557 | ||
558 | print_deps(srcrrecommends, "Recommends", spec_preamble_top, d) | 558 | print_deps(srcrrecommends, "Recommends", spec_preamble_top, d) |
559 | print_deps(srcrsuggests, "Suggests", spec_preamble_top, d) | 559 | print_deps(srcrsuggests, "Suggests", spec_preamble_top, d) |
560 | print_deps(srcrprovides + (" /bin/sh" if srcname.startswith("nativesdk-") else ""), "Provides", spec_preamble_top, d) | 560 | print_deps(srcrprovides, "Provides", spec_preamble_top, d) |
561 | print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d) | 561 | print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d) |
562 | print_deps(srcrconflicts, "Conflicts", spec_preamble_top, d) | 562 | print_deps(srcrconflicts, "Conflicts", spec_preamble_top, d) |
563 | 563 | ||
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" | |||
6 | TOOLCHAIN_TARGET_TASK ?= "" | 6 | TOOLCHAIN_TARGET_TASK ?= "" |
7 | 7 | ||
8 | TOOLCHAIN_HOST_TASK ?= "\ | 8 | TOOLCHAIN_HOST_TASK ?= "\ |
9 | nativesdk-sdk-provides-dummy \ | ||
9 | nativesdk-python3-core \ | 10 | nativesdk-python3-core \ |
10 | nativesdk-python3-modules \ | 11 | nativesdk-python3-modules \ |
11 | nativesdk-python3-misc \ | 12 | 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 = "\ | |||
4 | pkgconfig \ | 4 | pkgconfig \ |
5 | " | 5 | " |
6 | 6 | ||
7 | # Add /bin/sh? | ||
8 | DUMMYPROVIDES = "\ | 7 | DUMMYPROVIDES = "\ |
8 | /bin/sh \ | ||
9 | /bin/bash \ | 9 | /bin/bash \ |
10 | /usr/bin/env \ | 10 | /usr/bin/env \ |
11 | libGL.so()(64bit) \ | 11 | 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 ??= "" | |||
8 | 8 | ||
9 | TOOLCHAIN_TARGET_TASK ?= "" | 9 | TOOLCHAIN_TARGET_TASK ?= "" |
10 | 10 | ||
11 | TOOLCHAIN_HOST_TASK ?= "${TEST_EXPORT_SDK_PACKAGES}" | 11 | TOOLCHAIN_HOST_TASK ?= "${TEST_EXPORT_SDK_PACKAGES} nativesdk-sdk-provides-dummy" |
12 | 12 | ||
13 | MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" | 13 | MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" |
14 | PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}" | 14 | 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 = "\ | |||
18 | nativesdk-libxcrypt \ | 18 | nativesdk-libxcrypt \ |
19 | nativesdk-libxcrypt-compat \ | 19 | nativesdk-libxcrypt-compat \ |
20 | nativesdk-libnss-nis \ | 20 | nativesdk-libnss-nis \ |
21 | nativesdk-sdk-provides-dummy \ | ||
21 | " | 22 | " |
22 | 23 | ||
23 | INHIBIT_DEFAULT_DEPS = "1" | 24 | INHIBIT_DEFAULT_DEPS = "1" |