diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-base.bb | 8 | ||||
-rw-r--r-- | meta/recipes-core/psplash/psplash_git.bb | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index aa8e059216..ff25fd4187 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -24,7 +24,7 @@ libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', | |||
24 | INSANE_SKIP_${PN}_append_aarch64 = " libdir" | 24 | INSANE_SKIP_${PN}_append_aarch64 = " libdir" |
25 | 25 | ||
26 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/*" | 26 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/*" |
27 | RRECOMMENDS_${PN} = "${@bb.utils.filter('DISTRO_FEATURES', 'ldconfig', d)}" | 27 | RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" |
28 | FILES_ldconfig = "${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" | 28 | FILES_ldconfig = "${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" |
29 | FILES_ldd = "${bindir}/ldd" | 29 | FILES_ldd = "${bindir}/ldd" |
30 | FILES_libsegfault = "${base_libdir}/libSegFault*" | 30 | FILES_libsegfault = "${base_libdir}/libSegFault*" |
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 1f802da09b..90b79adfdc 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb | |||
@@ -110,16 +110,16 @@ python __anonymous () { | |||
110 | machine_features= set(d.getVar("MACHINE_FEATURES").split()) | 110 | machine_features= set(d.getVar("MACHINE_FEATURES").split()) |
111 | 111 | ||
112 | if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): | 112 | if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): |
113 | d.setVar("ADD_BT", "packagegroup-base-bluetooth") | 113 | d.setVar("ADD_BT", "${MLPREFIX}packagegroup-base-bluetooth") |
114 | 114 | ||
115 | if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): | 115 | if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): |
116 | d.setVar("ADD_WIFI", "packagegroup-base-wifi") | 116 | d.setVar("ADD_WIFI", "${MLPREFIX}packagegroup-base-wifi") |
117 | 117 | ||
118 | if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): | 118 | if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): |
119 | d.setVar("ADD_3G", "packagegroup-base-3g") | 119 | d.setVar("ADD_3G", "${MLPREFIX}packagegroup-base-3g") |
120 | 120 | ||
121 | if "nfc" in distro_features and not "nfc" in machine_features and ("usbhost" in machine_features): | 121 | if "nfc" in distro_features and not "nfc" in machine_features and ("usbhost" in machine_features): |
122 | d.setVar("ADD_NFC", "packagegroup-base-nfc") | 122 | d.setVar("ADD_NFC", "${MLPREFIX}packagegroup-base-nfc") |
123 | } | 123 | } |
124 | 124 | ||
125 | # | 125 | # |
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 22c71f099b..44f0007daf 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
@@ -22,6 +22,7 @@ SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" | |||
22 | python __anonymous() { | 22 | python __anonymous() { |
23 | oldpkgs = d.getVar("PACKAGES").split() | 23 | oldpkgs = d.getVar("PACKAGES").split() |
24 | splashfiles = d.getVar('SPLASH_IMAGES').split() | 24 | splashfiles = d.getVar('SPLASH_IMAGES').split() |
25 | mlprefix = d.getVar('MLPREFIX') or '' | ||
25 | pkgs = [] | 26 | pkgs = [] |
26 | localpaths = [] | 27 | localpaths = [] |
27 | for uri in splashfiles: | 28 | for uri in splashfiles: |
@@ -46,9 +47,9 @@ python __anonymous() { | |||
46 | # Set these so that we have less work to do in do_compile and do_install_append | 47 | # Set these so that we have less work to do in do_compile and do_install_append |
47 | d.setVar("SPLASH_INSTALL", " ".join(pkgs)) | 48 | d.setVar("SPLASH_INSTALL", " ".join(pkgs)) |
48 | d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) | 49 | d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) |
50 | for p in pkgs: | ||
51 | d.prependVar("PACKAGES", "%s%s " % (mlprefix, p)) | ||
49 | 52 | ||
50 | d.prependVar("PACKAGES", "%s " % (" ".join(pkgs))) | ||
51 | mlprefix = d.getVar('MLPREFIX') or '' | ||
52 | pn = d.getVar('PN') or '' | 53 | pn = d.getVar('PN') or '' |
53 | for p in pkgs: | 54 | for p in pkgs: |
54 | ep = '%s%s' % (mlprefix, p) | 55 | ep = '%s%s' % (mlprefix, p) |