summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-23 14:34:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-28 21:13:00 +0000
commit7ec115d2988ed005c97e39c24689bd7a5aedce16 (patch)
tree36ade1dda83b2b0baf95cd1d7dbd0166b0015d41
parentf59e9cc356d97fca325b064193e63cd683da2438 (diff)
downloadpoky-7ec115d2988ed005c97e39c24689bd7a5aedce16.tar.gz
dummy-sdk-package: Add DUMMYPROVIDES_PACKAGES
We're about to need to use this variable in the main include file so restructure the users of it to all set it appropriately. (From OE-Core rev: 4a247e7c961286cbed73b6dc0f4074ecf856402a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/meta/dummy-sdk-package.inc3
-rw-r--r--meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb5
-rw-r--r--meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb5
-rw-r--r--meta/recipes-core/meta/target-sdk-provides-dummy.bb1
4 files changed, 11 insertions, 3 deletions
diff --git a/meta/recipes-core/meta/dummy-sdk-package.inc b/meta/recipes-core/meta/dummy-sdk-package.inc
index 4d653706b1..0d15a37c35 100644
--- a/meta/recipes-core/meta/dummy-sdk-package.inc
+++ b/meta/recipes-core/meta/dummy-sdk-package.inc
@@ -17,6 +17,9 @@ ALLOW_EMPTY_${PN} = "1"
17 17
18PR[vardeps] += "DUMMYPROVIDES" 18PR[vardeps] += "DUMMYPROVIDES"
19 19
20DUMMYPROVIDES_PACKAGES ??= ""
21DUMMYPROVIDES += "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}"
22
20python populate_packages_prepend() { 23python populate_packages_prepend() {
21 p = d.getVar("PN") 24 p = d.getVar("PN")
22 d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") 25 d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}")
diff --git a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
index 6a8748acdf..5bc11b9daf 100644
--- a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
+++ b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
@@ -1,6 +1,6 @@
1DUMMYARCH = "buildtools-dummy-${SDKPKGSUFFIX}" 1DUMMYARCH = "buildtools-dummy-${SDKPKGSUFFIX}"
2 2
3DUMMYPROVIDES = "\ 3DUMMYPROVIDES_PACKAGES = "\
4 nativesdk-perl \ 4 nativesdk-perl \
5 nativesdk-libxml-parser-perl \ 5 nativesdk-libxml-parser-perl \
6 nativesdk-perl-module-bytes \ 6 nativesdk-perl-module-bytes \
@@ -21,6 +21,9 @@ DUMMYPROVIDES = "\
21 nativesdk-perl-module-posix \ 21 nativesdk-perl-module-posix \
22 nativesdk-perl-module-thread-queue \ 22 nativesdk-perl-module-thread-queue \
23 nativesdk-perl-module-threads \ 23 nativesdk-perl-module-threads \
24"
25
26DUMMYPROVIDES = "\
24 /usr/bin/perl \ 27 /usr/bin/perl \
25 " 28 "
26 29
diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb
index b891efa5ef..29f4dd3633 100644
--- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb
+++ b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb
@@ -1,10 +1,13 @@
1DUMMYARCH = "sdk-provides-dummy-${SDKPKGSUFFIX}" 1DUMMYARCH = "sdk-provides-dummy-${SDKPKGSUFFIX}"
2 2
3DUMMYPROVIDES_PACKAGES = "\
4 pkgconfig \
5"
6
3# Add /bin/sh? 7# Add /bin/sh?
4DUMMYPROVIDES = "\ 8DUMMYPROVIDES = "\
5 /bin/bash \ 9 /bin/bash \
6 /usr/bin/env \ 10 /usr/bin/env \
7 pkgconfig \
8 libGL.so()(64bit) \ 11 libGL.so()(64bit) \
9 libGL.so \ 12 libGL.so \
10" 13"
diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/meta/recipes-core/meta/target-sdk-provides-dummy.bb
index 87b8bfab9c..e3beeb796c 100644
--- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb
+++ b/meta/recipes-core/meta/target-sdk-provides-dummy.bb
@@ -48,7 +48,6 @@ DUMMYPROVIDES_PACKAGES = "\
48" 48"
49 49
50DUMMYPROVIDES = "\ 50DUMMYPROVIDES = "\
51 ${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])} \
52 /bin/sh \ 51 /bin/sh \
53 /bin/bash \ 52 /bin/bash \
54 /usr/bin/env \ 53 /usr/bin/env \