diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-02-27 14:02:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 11:17:45 +0000 |
commit | 254bfb107134702d8d1e0bfbdd1b011212e8c291 (patch) | |
tree | 188ddf3ea786bc1b913904330e4f95125bd6def4 /meta/recipes-core | |
parent | dec5650bc292aa3c4a0a04ace72d2cf762e9620b (diff) | |
download | poky-254bfb107134702d8d1e0bfbdd1b011212e8c291.tar.gz |
recipes: Make use of the new bb.utils.filter() function
(From OE-Core rev: 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/coreutils/coreutils_6.9.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.26.bb | 3 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.10.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 6 | ||||
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.0.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.9.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_232.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 4 |
8 files changed, 11 insertions, 16 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb index 9bfbeabc04..821aafc6e0 100644 --- a/meta/recipes-core/coreutils/coreutils_6.9.bb +++ b/meta/recipes-core/coreutils/coreutils_6.9.bb | |||
@@ -36,7 +36,7 @@ EXTRA_OECONF += "ac_cv_func_getgroups_works=yes \ | |||
36 | 36 | ||
37 | # acl is not a default feature | 37 | # acl is not a default feature |
38 | # | 38 | # |
39 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" | 39 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" |
40 | 40 | ||
41 | # with, without, depends, rdepends | 41 | # with, without, depends, rdepends |
42 | # | 42 | # |
diff --git a/meta/recipes-core/coreutils/coreutils_8.26.bb b/meta/recipes-core/coreutils/coreutils_8.26.bb index caa6d96e25..52ef1013ca 100644 --- a/meta/recipes-core/coreutils/coreutils_8.26.bb +++ b/meta/recipes-core/coreutils/coreutils_8.26.bb | |||
@@ -35,8 +35,7 @@ EXTRA_OECONF_class-nativesdk = "--enable-install-program=arch" | |||
35 | # acl and xattr are not default features | 35 | # acl and xattr are not default features |
36 | # | 36 | # |
37 | PACKAGECONFIG_class-target ??= "\ | 37 | PACKAGECONFIG_class-target ??= "\ |
38 | ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ | 38 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \ |
39 | ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \ | ||
40 | " | 39 | " |
41 | 40 | ||
42 | # The lib/oe/path.py requires xattr | 41 | # The lib/oe/path.py requires xattr |
diff --git a/meta/recipes-core/dbus/dbus_1.10.14.bb b/meta/recipes-core/dbus/dbus_1.10.14.bb index d74560246e..6354572b84 100644 --- a/meta/recipes-core/dbus/dbus_1.10.14.bb +++ b/meta/recipes-core/dbus/dbus_1.10.14.bb | |||
@@ -100,9 +100,7 @@ EXTRA_OECONF = "--disable-tests \ | |||
100 | EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" | 100 | EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" |
101 | EXTRA_OECONF_append_class-native = " --disable-selinux" | 101 | EXTRA_OECONF_append_class-native = " --disable-selinux" |
102 | 102 | ||
103 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 103 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile systemd x11', d)}" |
104 | ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ | ||
105 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | ||
106 | PACKAGECONFIG_class-native = "" | 104 | PACKAGECONFIG_class-native = "" |
107 | PACKAGECONFIG_class-nativesdk = "" | 105 | PACKAGECONFIG_class-nativesdk = "" |
108 | 106 | ||
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index bda7eb847c..b6b436c584 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -8,7 +8,7 @@ LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" | |||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01" |
9 | 9 | ||
10 | DEPENDS = "zlib" | 10 | DEPENDS = "zlib" |
11 | RPROVIDES_${PN} = "ssh sshd" | 11 | RPROVIDES_${PN} = "ssh sshd" |
12 | 12 | ||
13 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 13 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
14 | 14 | ||
@@ -63,7 +63,7 @@ do_install() { | |||
63 | 63 | ||
64 | install -m 0755 dropbearmulti ${D}${sbindir}/ | 64 | install -m 0755 dropbearmulti ${D}${sbindir}/ |
65 | ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient | 65 | ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient |
66 | 66 | ||
67 | for i in ${SBINCOMMANDS} | 67 | for i in ${SBINCOMMANDS} |
68 | do | 68 | do |
69 | ln -s ./dropbearmulti ${D}${sbindir}/$i | 69 | ln -s ./dropbearmulti ${D}${sbindir}/$i |
@@ -74,7 +74,7 @@ do_install() { | |||
74 | -e 's,/usr/bin,${bindir},g' \ | 74 | -e 's,/usr/bin,${bindir},g' \ |
75 | -e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear | 75 | -e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear |
76 | chmod 755 ${D}${sysconfdir}/init.d/dropbear | 76 | chmod 755 ${D}${sysconfdir}/init.d/dropbear |
77 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | 77 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
78 | install -d ${D}${sysconfdir}/pam.d | 78 | install -d ${D}${sysconfdir}/pam.d |
79 | install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ | 79 | install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ |
80 | fi | 80 | fi |
diff --git a/meta/recipes-core/kbd/kbd_2.0.3.bb b/meta/recipes-core/kbd/kbd_2.0.3.bb index 54d16835fc..fbc558febd 100644 --- a/meta/recipes-core/kbd/kbd_2.0.3.bb +++ b/meta/recipes-core/kbd/kbd_2.0.3.bb | |||
@@ -18,7 +18,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ | |||
18 | SRC_URI[md5sum] = "231b46e7142eb41ea3ae06d2ded3c208" | 18 | SRC_URI[md5sum] = "231b46e7142eb41ea3ae06d2ded3c208" |
19 | SRC_URI[sha256sum] = "7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e" | 19 | SRC_URI[sha256sum] = "7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e" |
20 | 20 | ||
21 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" | 21 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
22 | PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," | 22 | PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," |
23 | 23 | ||
24 | do_compile_ptest() { | 24 | do_compile_ptest() { |
diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb index 93b9ba01da..023fe9956d 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.4.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb | |||
@@ -43,7 +43,7 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm | |||
43 | export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" | 43 | export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" |
44 | 44 | ||
45 | PACKAGECONFIG ??= "python \ | 45 | PACKAGECONFIG ??= "python \ |
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ | 46 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ |
47 | " | 47 | " |
48 | PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python" | 48 | PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python" |
49 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 49 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb index cc8781e476..9ec8378a30 100644 --- a/meta/recipes-core/systemd/systemd_232.bb +++ b/meta/recipes-core/systemd/systemd_232.bb | |||
@@ -41,11 +41,9 @@ SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-t | |||
41 | 41 | ||
42 | PACKAGECONFIG ??= "xz \ | 42 | PACKAGECONFIG ??= "xz \ |
43 | ldconfig \ | 43 | ldconfig \ |
44 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | 44 | ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux', d)} \ |
45 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ | 45 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ |
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | ||
47 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ | 46 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ |
48 | ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'efi', '', d)} \ | ||
49 | binfmt \ | 47 | binfmt \ |
50 | randomseed \ | 48 | randomseed \ |
51 | machined \ | 49 | machined \ |
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 7d948bfda6..821f7c8751 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -52,7 +52,7 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \ | |||
52 | 52 | ||
53 | EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" | 53 | EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" |
54 | 54 | ||
55 | PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" | 55 | PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
56 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," | 56 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," |
57 | 57 | ||
58 | # Respect the systemd feature for uuidd | 58 | # Respect the systemd feature for uuidd |
@@ -177,7 +177,7 @@ do_install () { | |||
177 | 177 | ||
178 | rm -f ${D}${bindir}/chkdupexe | 178 | rm -f ${D}${bindir}/chkdupexe |
179 | 179 | ||
180 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | 180 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
181 | install -d ${D}${sysconfdir}/pam.d | 181 | install -d ${D}${sysconfdir}/pam.d |
182 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser | 182 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser |
183 | install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l | 183 | install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l |