diff options
Diffstat (limited to 'meta-oe')
44 files changed, 59 insertions, 75 deletions
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 72553cfd6..823e07c18 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | |||
@@ -38,7 +38,7 @@ TARGET_CC_ARCH += "${LDFLAGS}" | |||
38 | #The CUSTOM_LDSCRIPTS doesn't work with the gold linker | 38 | #The CUSTOM_LDSCRIPTS doesn't work with the gold linker |
39 | inherit cpan-base | 39 | inherit cpan-base |
40 | do_configure() { | 40 | do_configure() { |
41 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then | 41 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then |
42 | sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile | 42 | sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile |
43 | fi | 43 | fi |
44 | 44 | ||
diff --git a/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb b/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb index fdf54e3b1..708c71f4f 100644 --- a/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb +++ b/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/${BPN}_${PV}.ori | |||
13 | SRC_URI[md5sum] = "3a6d54fdd3fe002328e4458206392b9d" | 13 | SRC_URI[md5sum] = "3a6d54fdd3fe002328e4458206392b9d" |
14 | SRC_URI[sha256sum] = "83fa7464193e012c91254e595a89894d8e35b4a38324b52a5974777e3823ea9e" | 14 | SRC_URI[sha256sum] = "83fa7464193e012c91254e595a89894d8e35b4a38324b52a5974777e3823ea9e" |
15 | 15 | ||
16 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)}" | 16 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)}" |
17 | PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," | 17 | PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," |
18 | PACKAGECONFIG[aio] = "--enable-aio,--disable-aio,libaio," | 18 | PACKAGECONFIG[aio] = "--enable-aio,--disable-aio,libaio," |
19 | PACKAGECONFIG[mysql] = "--with-mysql \ | 19 | PACKAGECONFIG[mysql] = "--with-mysql \ |
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4.inc b/meta-oe/recipes-connectivity/bluez/bluez4.inc index 59c35e473..5240ccfd8 100644 --- a/meta-oe/recipes-connectivity/bluez/bluez4.inc +++ b/meta-oe/recipes-connectivity/bluez/bluez4.inc | |||
@@ -15,11 +15,7 @@ RCONFLICTS_${PN} += "${PN}-systemd" | |||
15 | DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1" | 15 | DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1" |
16 | RDEPENDS_${PN}-dev = "bluez-hcidump" | 16 | RDEPENDS_${PN}-dev = "bluez-hcidump" |
17 | 17 | ||
18 | PACKAGECONFIG ??= "\ | 18 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pie systemd', d)}" |
19 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ | ||
20 | ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ | ||
21 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \ | ||
22 | " | ||
23 | PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" | 19 | PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" |
24 | PACKAGECONFIG[pie] = "--enable-pie,--disable-pie," | 20 | PACKAGECONFIG[pie] = "--enable-pie,--disable-pie," |
25 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" | 21 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" |
diff --git a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb index 1d367ada2..b22f820d5 100644 --- a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb +++ b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2" | |||
8 | DEPENDS = "glib-2.0 intltool-native" | 8 | DEPENDS = "glib-2.0 intltool-native" |
9 | X11DEPENDS = " libxpm gtk+" | 9 | X11DEPENDS = " libxpm gtk+" |
10 | 10 | ||
11 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 11 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
12 | PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" | 12 | PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" |
13 | PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical" | 13 | PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical" |
14 | PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite" | 14 | PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite" |
diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb index 5e4e22082..e60cd4b74 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb | |||
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf79261 | |||
20 | S = "${WORKDIR}/ModemManager-${PV}" | 20 | S = "${WORKDIR}/ModemManager-${PV}" |
21 | 21 | ||
22 | PACKAGECONFIG ??= "mbim qmi polkit \ | 22 | PACKAGECONFIG ??= "mbim qmi polkit \ |
23 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 23 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ |
24 | " | 24 | " |
25 | 25 | ||
26 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," | 26 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," |
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb index 90d023292..064c58b52 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb | |||
@@ -48,9 +48,9 @@ do_compile_prepend() { | |||
48 | } | 48 | } |
49 | 49 | ||
50 | PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ | 50 | PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ |
51 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \ | 51 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ |
52 | ${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \ | 52 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ |
53 | ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \ | 53 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ |
54 | " | 54 | " |
55 | PACKAGECONFIG[systemd] = " \ | 55 | PACKAGECONFIG[systemd] = " \ |
56 | --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ | 56 | --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ |
@@ -95,7 +95,7 @@ FILES_${PN} += " \ | |||
95 | " | 95 | " |
96 | 96 | ||
97 | RRECOMMENDS_${PN} += "iptables \ | 97 | RRECOMMENDS_${PN} += "iptables \ |
98 | ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \ | 98 | ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ |
99 | " | 99 | " |
100 | RCONFLICTS_${PN} = "connman" | 100 | RCONFLICTS_${PN} = "connman" |
101 | 101 | ||
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 8ae018503..8f4e5b1e6 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb | |||
@@ -23,7 +23,7 @@ S = "${WORKDIR}/git" | |||
23 | 23 | ||
24 | inherit autotools | 24 | inherit autotools |
25 | 25 | ||
26 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | 26 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" |
27 | PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind" | 27 | PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind" |
28 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" | 28 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" |
29 | 29 | ||
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index c4fb1d90b..f882e3231 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc | |||
@@ -69,8 +69,7 @@ EXTRA_OECONF_class-native = " \ | |||
69 | " | 69 | " |
70 | 70 | ||
71 | PACKAGECONFIG ??= "mysql sqlite3 imap \ | 71 | PACKAGECONFIG ??= "mysql sqlite3 imap \ |
72 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | 72 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ |
73 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ | ||
74 | " | 73 | " |
75 | PACKAGECONFIG_class-native = "" | 74 | PACKAGECONFIG_class-native = "" |
76 | 75 | ||
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index 402c42e41..0849e8856 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | |||
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520 | |||
17 | 17 | ||
18 | S = "${WORKDIR}/imap-${PV}" | 18 | S = "${WORKDIR}/imap-${PV}" |
19 | 19 | ||
20 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" | 20 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
21 | PACKAGECONFIG[pam] = ",,libpam" | 21 | PACKAGECONFIG[pam] = ",,libpam" |
22 | 22 | ||
23 | EXTRA_OEMAKE = "CC='${CC}' ARRC='${AR} -rc' RANLIB='${RANLIB}'" | 23 | EXTRA_OEMAKE = "CC='${CC}' ARRC='${AR} -rc' RANLIB='${RANLIB}'" |
diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb index 68a15f897..4aa8dedc4 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb | |||
@@ -31,8 +31,7 @@ SYSTEMD_SERVICE_${PN} = "cfengine3.service cfengine3-web.service" | |||
31 | SYSTEMD_AUTO_ENABLE_${PN} = "disable" | 31 | SYSTEMD_AUTO_ENABLE_${PN} = "disable" |
32 | 32 | ||
33 | PACKAGECONFIG ??= "libpcre openssl \ | 33 | PACKAGECONFIG ??= "libpcre openssl \ |
34 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | 34 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \ |
35 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | ||
36 | " | 35 | " |
37 | PACKAGECONFIG[libxml2] = "--with-libxml2=yes,--with-libxml2=no,libxml2," | 36 | PACKAGECONFIG[libxml2] = "--with-libxml2=yes,--with-libxml2=no,libxml2," |
38 | PACKAGECONFIG[mysql] = "--with-mysql=yes,--with-mysql=no,mysql," | 37 | PACKAGECONFIG[mysql] = "--with-mysql=yes,--with-mysql=no,mysql," |
diff --git a/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb b/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb index a213a2726..c168e0c88 100644 --- a/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb +++ b/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb | |||
@@ -21,7 +21,7 @@ SYSTEMD_AUTO_ENABLE = "enable" | |||
21 | 21 | ||
22 | INITSCRIPT_NAME = "corosync-daemon" | 22 | INITSCRIPT_NAME = "corosync-daemon" |
23 | 23 | ||
24 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 24 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
25 | 25 | ||
26 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_unitdir}/system/,--with-systemddir=" | 26 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_unitdir}/system/,--with-systemddir=" |
27 | 27 | ||
diff --git a/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb b/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb index 3488b19a3..64a258b01 100644 --- a/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb +++ b/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb | |||
@@ -19,5 +19,5 @@ inherit autotools pkgconfig | |||
19 | 19 | ||
20 | EXTRA_OECONF = "--disable-man-pages" | 20 | EXTRA_OECONF = "--disable-man-pages" |
21 | 21 | ||
22 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)}" | 22 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
23 | PACKAGECONFIG[systemd] = "--enable-journal, --disable-journal, systemd" | 23 | PACKAGECONFIG[systemd] = "--enable-journal, --disable-journal, systemd" |
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb b/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb index 24631e4ea..3424669b8 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb | |||
@@ -42,7 +42,7 @@ EXTRA_OECONF_append_armv4 = " \ | |||
42 | --disable-methodjit \ | 42 | --disable-methodjit \ |
43 | " | 43 | " |
44 | 44 | ||
45 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 45 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
46 | PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" | 46 | PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" |
47 | 47 | ||
48 | # mozjs requires autoreconf 2.13 | 48 | # mozjs requires autoreconf 2.13 |
diff --git a/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/meta-oe/recipes-extended/polkit/polkit_0.113.bb index daafaf5c8..326c9340e 100644 --- a/meta-oe/recipes-extended/polkit/polkit_0.113.bb +++ b/meta-oe/recipes-extended/polkit/polkit_0.113.bb | |||
@@ -9,8 +9,8 @@ DEPENDS = "expat glib-2.0 intltool-native mozjs" | |||
9 | 9 | ||
10 | inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection | 10 | inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection |
11 | 11 | ||
12 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | 12 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ |
13 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" | 13 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)}" |
14 | 14 | ||
15 | PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" | 15 | PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" |
16 | PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd" | 16 | PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd" |
diff --git a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb index a1121686c..4025b8087 100644 --- a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb +++ b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb | |||
@@ -44,7 +44,7 @@ do_install() { | |||
44 | fi | 44 | fi |
45 | } | 45 | } |
46 | 46 | ||
47 | inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','',d)} | 47 | inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} |
48 | 48 | ||
49 | SYSTEMD_PACKAGES = "${PN}" | 49 | SYSTEMD_PACKAGES = "${PN}" |
50 | SYSTEMD_SERVICE_${PN} = "rarpd.service" | 50 | SYSTEMD_SERVICE_${PN} = "rarpd.service" |
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb index f168c169f..a3aac45dd 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb | |||
@@ -24,7 +24,7 @@ SYSTEMD_SERVICE_rrdcached = "rrdcached.socket rrdcached.service" | |||
24 | 24 | ||
25 | EXTRA_AUTORECONF = "-I m4" | 25 | EXTRA_AUTORECONF = "-I m4" |
26 | 26 | ||
27 | PACKAGECONFIG ??= "python perl ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 27 | PACKAGECONFIG ??= "python perl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
28 | 28 | ||
29 | PACKAGECONFIG[python] = "--enable-python=yes \ | 29 | PACKAGECONFIG[python] = "--enable-python=yes \ |
30 | am_cv_python_pythondir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages \ | 30 | am_cv_python_pythondir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages \ |
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb index 62126f8fb..70abb18dd 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb | |||
@@ -37,8 +37,7 @@ EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" | |||
37 | PACKAGECONFIG ??= " \ | 37 | PACKAGECONFIG ??= " \ |
38 | rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ | 38 | rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ |
39 | imdiag gnutls imfile \ | 39 | imdiag gnutls imfile \ |
40 | ${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'snmp', '', d)} \ | 40 | ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ |
41 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | ||
42 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ | 41 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ |
43 | " | 42 | " |
44 | 43 | ||
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 84e465d85..fa75fcc16 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | |||
@@ -25,7 +25,7 @@ SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30" | |||
25 | SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd" | 25 | SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd" |
26 | 26 | ||
27 | inherit autotools | 27 | inherit autotools |
28 | inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} | 28 | inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} |
29 | 29 | ||
30 | SYSTEMD_PACKAGES = "${PN}" | 30 | SYSTEMD_PACKAGES = "${PN}" |
31 | SYSTEMD_SERVICE_${PN} = "sblim-sfcb.service" | 31 | SYSTEMD_SERVICE_${PN} = "sblim-sfcb.service" |
diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.5.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_6.5.bb index 55d366e2e..0970d2a30 100644 --- a/meta-oe/recipes-extended/smartmontools/smartmontools_6.5.bb +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_6.5.bb | |||
@@ -18,9 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ | |||
18 | file://smartd.service \ | 18 | file://smartd.service \ |
19 | " | 19 | " |
20 | 20 | ||
21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \ | 21 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d)}" |
22 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | ||
23 | " | ||
24 | PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" | 22 | PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" |
25 | PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" | 23 | PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" |
26 | 24 | ||
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.10.bb b/meta-oe/recipes-graphics/fbida/fbida_2.10.bb index 6e786f28c..e0f8128ed 100644 --- a/meta-oe/recipes-graphics/fbida/fbida_2.10.bb +++ b/meta-oe/recipes-graphics/fbida/fbida_2.10.bb | |||
@@ -34,25 +34,25 @@ do_compile() { | |||
34 | 34 | ||
35 | # Be sure to respect preferences (force to "no") | 35 | # Be sure to respect preferences (force to "no") |
36 | # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH} | 36 | # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH} |
37 | if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'curl', 'curl', '', d)}" ]; then | 37 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'curl', d)}" ]; then |
38 | sed -i -e '/^HAVE_LIBCURL/s/:=.*$/:= no/' ${S}/GNUmakefile | 38 | sed -i -e '/^HAVE_LIBCURL/s/:=.*$/:= no/' ${S}/GNUmakefile |
39 | fi | 39 | fi |
40 | if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'gif', 'gif', '', d)}" ]; then | 40 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'gif', d)}" ]; then |
41 | sed -i -e '/^HAVE_LIBGIF/s/:=.*$/:= no/' ${S}/GNUmakefile | 41 | sed -i -e '/^HAVE_LIBGIF/s/:=.*$/:= no/' ${S}/GNUmakefile |
42 | fi | 42 | fi |
43 | if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'png', 'png', '', d)}" ]; then | 43 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'png', d)}" ]; then |
44 | sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile | 44 | sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile |
45 | fi | 45 | fi |
46 | if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)}" ]; then | 46 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'tiff', d)}" ]; then |
47 | sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile | 47 | sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile |
48 | fi | 48 | fi |
49 | if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'motif', 'motif', '', d)}" ]; then | 49 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'motif', d)}" ]; then |
50 | sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile | 50 | sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile |
51 | fi | 51 | fi |
52 | if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'webp', 'webp', '', d)}" ]; then | 52 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'webp', d)}" ]; then |
53 | sed -i -e '/^HAVE_LIBWEBP/s/:=.*$/:= no/' ${S}/GNUmakefile | 53 | sed -i -e '/^HAVE_LIBWEBP/s/:=.*$/:= no/' ${S}/GNUmakefile |
54 | fi | 54 | fi |
55 | if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'lirc', 'lirc', '', d)}" ]; then | 55 | if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'lirc', d)}" ]; then |
56 | sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile | 56 | sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile |
57 | fi | 57 | fi |
58 | 58 | ||
diff --git a/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb b/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb index de8038a2d..b4b16416b 100644 --- a/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb +++ b/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb | |||
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5e | |||
16 | 16 | ||
17 | inherit allarch fontcache | 17 | inherit allarch fontcache |
18 | 18 | ||
19 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 19 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
20 | PACKAGECONFIG[x11] = "" | 20 | PACKAGECONFIG[x11] = "" |
21 | 21 | ||
22 | # Don't use font cache mecanism for console packages | 22 | # Don't use font cache mecanism for console packages |
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb index 9d31c92ec..d53dff6a0 100644 --- a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb +++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb | |||
@@ -24,5 +24,5 @@ EXTRA_OECONF = "\ | |||
24 | --enable-threads \ | 24 | --enable-threads \ |
25 | " | 25 | " |
26 | 26 | ||
27 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | 27 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" |
28 | PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" | 28 | PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" |
diff --git a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb index 0ad10a4ca..d5a73384d 100644 --- a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb +++ b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar. | |||
15 | SRC_URI[md5sum] = "02baa941091c5d198cd1623b3ad36e68" | 15 | SRC_URI[md5sum] = "02baa941091c5d198cd1623b3ad36e68" |
16 | SRC_URI[sha256sum] = "cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f" | 16 | SRC_URI[sha256sum] = "cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f" |
17 | 17 | ||
18 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 18 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
19 | PACKAGECONFIG[x11] = "--enable-x11, --disable-x11, libxi xext virtual/xserver" | 19 | PACKAGECONFIG[x11] = "--enable-x11, --disable-x11, libxi xext virtual/xserver" |
20 | 20 | ||
21 | PACKAGE_BEFORE_PN += "${PN}-test" | 21 | PACKAGE_BEFORE_PN += "${PN}-test" |
diff --git a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb index 3026744a0..e654a4048 100644 --- a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb +++ b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb | |||
@@ -16,7 +16,7 @@ SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.b | |||
16 | SRC_URI[md5sum] = "0df1b3ec6167920f310e2effe6e2ad44" | 16 | SRC_URI[md5sum] = "0df1b3ec6167920f310e2effe6e2ad44" |
17 | SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3" | 17 | SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3" |
18 | 18 | ||
19 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 19 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
20 | PACKAGECONFIG[x11] = "--with-x11, --without-x11, libxi" | 20 | PACKAGECONFIG[x11] = "--with-x11, --without-x11, libxi" |
21 | 21 | ||
22 | PACKAGE_BEFORE_PN += "${PN}-test" | 22 | PACKAGE_BEFORE_PN += "${PN}-test" |
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc index 012895e85..5b905f93f 100644 --- a/meta-oe/recipes-support/emacs/emacs.inc +++ b/meta-oe/recipes-support/emacs/emacs.inc | |||
@@ -18,7 +18,7 @@ X11DEPENDS = " \ | |||
18 | 18 | ||
19 | EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " | 19 | EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " |
20 | 20 | ||
21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 21 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
22 | PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}" | 22 | PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}" |
23 | 23 | ||
24 | 24 | ||
@@ -86,7 +86,7 @@ do_compile_prepend() { | |||
86 | ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ | 86 | ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ |
87 | ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ | 87 | ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ |
88 | 88 | ||
89 | if [ ! -z "${@bb.utils.contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then | 89 | if [ ! -z "${@bb.utils.filter('PACKAGECONFIG', 'x11', d)}" ]; then |
90 | echo "X11 build enabled" | 90 | echo "X11 build enabled" |
91 | # copy only as much stuff as we need | 91 | # copy only as much stuff as we need |
92 | # before: 5.5G ../../qemu-treedir/ | 92 | # before: 5.5G ../../qemu-treedir/ |
diff --git a/meta-oe/recipes-support/fltk/fltk_1.3.4-1.bb b/meta-oe/recipes-support/fltk/fltk_1.3.4-1.bb index f08d54790..801c8e7aa 100644 --- a/meta-oe/recipes-support/fltk/fltk_1.3.4-1.bb +++ b/meta-oe/recipes-support/fltk/fltk_1.3.4-1.bb | |||
@@ -27,7 +27,7 @@ EXTRA_OECONF = "--enable-shared \ | |||
27 | --enable-xft \ | 27 | --enable-xft \ |
28 | " | 28 | " |
29 | 29 | ||
30 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}" | 30 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" |
31 | 31 | ||
32 | PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" | 32 | PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" |
33 | PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" | 33 | PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" |
diff --git a/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-oe/recipes-support/freerdp/freerdp_git.bb index 339a053ca..f2d0a4dad 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_git.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_git.bb | |||
@@ -32,14 +32,10 @@ EXTRA_OECMAKE += " \ | |||
32 | -DWITH_MANPAGES=OFF \ | 32 | -DWITH_MANPAGES=OFF \ |
33 | " | 33 | " |
34 | 34 | ||
35 | PACKAGECONFIG ??= " \ | 35 | PACKAGECONFIG ??= " \ |
36 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ | 36 | ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ |
37 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ | 37 | gstreamer cups \ |
38 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}\ | 38 | " |
39 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}\ | ||
40 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}\ | ||
41 | gstreamer cups \ | ||
42 | " | ||
43 | 39 | ||
44 | X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" | 40 | X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" |
45 | PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}" | 41 | PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}" |
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb index cfaa7c3c6..960cb00ef 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb | |||
@@ -23,7 +23,7 @@ inherit autotools pkgconfig update-alternatives | |||
23 | EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl" | 23 | EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl" |
24 | 24 | ||
25 | CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" | 25 | CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" |
26 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 26 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
27 | PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz" | 27 | PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz" |
28 | PACKAGECONFIG[jp2] = "--with-jp2,,jasper" | 28 | PACKAGECONFIG[jp2] = "--with-jp2,,jasper" |
29 | PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" | 29 | PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" |
diff --git a/meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb b/meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb index aa3700d7f..ee0766ea7 100644 --- a/meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb +++ b/meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb | |||
@@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "884c1f3d8bfb0b33c303973d286c3166f5a537976451a0312e3524af54 | |||
28 | inherit autotools-brokensep pkgconfig systemd | 28 | inherit autotools-brokensep pkgconfig systemd |
29 | 29 | ||
30 | PACKAGECONFIG ?= "lanplus gpl" | 30 | PACKAGECONFIG ?= "lanplus gpl" |
31 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 31 | PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
32 | PACKAGECONFIG[systemd] = "--enable-systemd=${datadir}/${BPN}, --enable-systemd=no" | 32 | PACKAGECONFIG[systemd] = "--enable-systemd=${datadir}/${BPN}, --enable-systemd=no" |
33 | PACKAGECONFIG[sha256] = "--enable-sha256, --enable-sha256=no, openssl-native, openssl" | 33 | PACKAGECONFIG[sha256] = "--enable-sha256, --enable-sha256=no, openssl-native, openssl" |
34 | PACKAGECONFIG[lanplus] = "--enable-lanplus, --enable-lanplus=no, openssl-native, openssl" | 34 | PACKAGECONFIG[lanplus] = "--enable-lanplus, --enable-lanplus=no, openssl-native, openssl" |
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb index f47377500..72c93abe1 100644 --- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb +++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb | |||
@@ -22,9 +22,8 @@ EXTRA_OECONF = "\ | |||
22 | --disable-lynx \ | 22 | --disable-lynx \ |
23 | " | 23 | " |
24 | 24 | ||
25 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','alsa','alsa','',d)} \ | 25 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \ |
26 | ${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','pulseaudio','',d)} \ | 26 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk gtk3', '', d)} \ |
27 | ${@bb.utils.contains('DISTRO_FEATURES','x11','gtk gtk3','',d)} \ | ||
28 | " | 27 | " |
29 | PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib" | 28 | PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib" |
30 | PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio" | 29 | PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio" |
diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.52.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.52.bb index 2a006b5eb..b22cc7352 100644 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.52.bb +++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.52.bb | |||
@@ -15,7 +15,7 @@ EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" | |||
15 | 15 | ||
16 | PACKAGECONFIG ?= "curl" | 16 | PACKAGECONFIG ?= "curl" |
17 | PACKAGECONFIG_append_class-target = "\ | 17 | PACKAGECONFIG_append_class-target = "\ |
18 | ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ | 18 | ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ |
19 | " | 19 | " |
20 | PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," | 20 | PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," |
21 | PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," | 21 | PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," |
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 2bb013417..b25d775f1 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -19,7 +19,7 @@ inherit autotools-brokensep pkgconfig systemd | |||
19 | 19 | ||
20 | LVM2_PACKAGECONFIG = "dmeventd lvmetad" | 20 | LVM2_PACKAGECONFIG = "dmeventd lvmetad" |
21 | LVM2_PACKAGECONFIG_append_class-target = " \ | 21 | LVM2_PACKAGECONFIG_append_class-target = " \ |
22 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | 22 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ |
23 | thin-provisioning-tools \ | 23 | thin-provisioning-tools \ |
24 | udev \ | 24 | udev \ |
25 | " | 25 | " |
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 689b8abf3..0a0caa3f0 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc | |||
@@ -48,7 +48,7 @@ FILES_${PN}-setupdb = "${sysconfdir}/init.d/install_db" | |||
48 | 48 | ||
49 | EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" | 49 | EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" |
50 | 50 | ||
51 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} setupdb" | 51 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} setupdb" |
52 | PACKAGECONFIG_class-native = "" | 52 | PACKAGECONFIG_class-native = "" |
53 | PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" | 53 | PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" |
54 | PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" | 54 | PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" |
diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index 85ca851c0..0f5568c31 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb | |||
@@ -24,7 +24,7 @@ SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d | |||
24 | LICENSE = "LGPLv2+" | 24 | LICENSE = "LGPLv2+" |
25 | LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" | 25 | LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" |
26 | 26 | ||
27 | inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} | 27 | inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} |
28 | SYSTEMD_SERVICE_${PN} += "openct.service " | 28 | SYSTEMD_SERVICE_${PN} += "openct.service " |
29 | SYSTEMD_AUTO_ENABLE = "enable" | 29 | SYSTEMD_AUTO_ENABLE = "enable" |
30 | 30 | ||
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb b/meta-oe/recipes-support/openldap/openldap_2.4.44.bb index e8e0c857b..4b7ed3597 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.44.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.44.bb | |||
@@ -54,7 +54,7 @@ EXTRA_OECONF += "--enable-dynamic" | |||
54 | 54 | ||
55 | PACKAGECONFIG ??= "gnutls modules \ | 55 | PACKAGECONFIG ??= "gnutls modules \ |
56 | mdb ldap meta monitor null passwd shell proxycache dnssrv \ | 56 | mdb ldap meta monitor null passwd shell proxycache dnssrv \ |
57 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ | 57 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ |
58 | " | 58 | " |
59 | #--with-tls with TLS/SSL support auto|openssl|gnutls [auto] | 59 | #--with-tls with TLS/SSL support auto|openssl|gnutls [auto] |
60 | PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt" | 60 | PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt" |
diff --git a/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb b/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb index f5896e6e1..542627db5 100644 --- a/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb +++ b/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb | |||
@@ -93,7 +93,7 @@ do_install() { | |||
93 | touch ${D}/var/lib/openwbem/{classassociation,instances,instassociation,namespaces,schema}.{dat,ndx,lock} | 93 | touch ${D}/var/lib/openwbem/{classassociation,instances,instassociation,namespaces,schema}.{dat,ndx,lock} |
94 | } | 94 | } |
95 | 95 | ||
96 | inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} | 96 | inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} |
97 | SYSTEMD_SERVICE_${PN} = "owcimomd.service" | 97 | SYSTEMD_SERVICE_${PN} = "owcimomd.service" |
98 | SYSTEMD_AUTO_ENABLE = "disable" | 98 | SYSTEMD_AUTO_ENABLE = "disable" |
99 | FILES_${PN} += " \ | 99 | FILES_${PN} += " \ |
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc index dd4118806..812c2aed4 100644 --- a/meta-oe/recipes-support/postgresql/postgresql.inc +++ b/meta-oe/recipes-support/postgresql/postgresql.inc | |||
@@ -54,7 +54,7 @@ pkg_postinst_${PN} () { | |||
54 | fi | 54 | fi |
55 | } | 55 | } |
56 | 56 | ||
57 | enable_pam = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" | 57 | enable_pam = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
58 | PACKAGECONFIG ??= "${enable_pam} openssl python uuid libxml tcl nls libxml perl" | 58 | PACKAGECONFIG ??= "${enable_pam} openssl python uuid libxml tcl nls libxml perl" |
59 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," | 59 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," |
60 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," | 60 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," |
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index e13c57be9..0977f7e86 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc | |||
@@ -43,8 +43,7 @@ CONFIG_TLS = "--enable-thread-tls" | |||
43 | CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" | 43 | CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" |
44 | 44 | ||
45 | PACKAGECONFIG ??= " \ | 45 | PACKAGECONFIG ??= " \ |
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ | 46 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ |
47 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | ||
48 | " | 47 | " |
49 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," | 48 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," |
50 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd," | 49 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd," |
diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb index 976d36a2b..d8f7eaa68 100644 --- a/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "GPLv2+ & LGPLv2+" | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" |
4 | 4 | ||
5 | DEPENDS = "acl libatasmart polkit libgudev dbus-glib glib-2.0 intltool-native gnome-common-native libxslt-native" | 5 | DEPENDS = "acl libatasmart polkit libgudev dbus-glib glib-2.0 intltool-native gnome-common-native libxslt-native" |
6 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 6 | DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
7 | 7 | ||
8 | RDEPENDS_${PN} = "acl" | 8 | RDEPENDS_${PN} = "acl" |
9 | 9 | ||
diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb index 7df49a394..ffe2c2674 100644 --- a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb +++ b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb | |||
@@ -7,7 +7,7 @@ DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-nat | |||
7 | " | 7 | " |
8 | # optional dependencies: device-mapper parted | 8 | # optional dependencies: device-mapper parted |
9 | 9 | ||
10 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 10 | DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ |
11 | dbus-glib-native \ | 11 | dbus-glib-native \ |
12 | " | 12 | " |
13 | 13 | ||
diff --git a/meta-oe/recipes-support/upower/upower_0.99.4.bb b/meta-oe/recipes-support/upower/upower_0.99.4.bb index 44a04deaa..3651e1885 100644 --- a/meta-oe/recipes-support/upower/upower_0.99.4.bb +++ b/meta-oe/recipes-support/upower/upower_0.99.4.bb | |||
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "9ca325a6ccef505529b268ebbbd9becd0ce65a65f6ac7ee31e2e5b1764 | |||
10 | 10 | ||
11 | inherit autotools pkgconfig gettext gobject-introspection systemd | 11 | inherit autotools pkgconfig gettext gobject-introspection systemd |
12 | 12 | ||
13 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 13 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
14 | PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" | 14 | PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" |
15 | PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-systemdsystemunitdir=${systemd_system_unitdir}, \ | 15 | PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-systemdsystemunitdir=${systemd_system_unitdir}, \ |
16 | --without-systemdutildir --without-systemdsystemunitdir,systemd" | 16 | --without-systemdutildir --without-systemdsystemunitdir,systemd" |
diff --git a/meta-oe/recipes-support/vim/vim_8.0.0022.bb b/meta-oe/recipes-support/vim/vim_8.0.0022.bb index 126fe6162..1ccc52cd9 100644 --- a/meta-oe/recipes-support/vim/vim_8.0.0022.bb +++ b/meta-oe/recipes-support/vim/vim_8.0.0022.bb | |||
@@ -32,8 +32,7 @@ do_configure () { | |||
32 | 32 | ||
33 | #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny | 33 | #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny |
34 | PACKAGECONFIG ??= "" | 34 | PACKAGECONFIG ??= "" |
35 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" | 35 | PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" |
36 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | ||
37 | 36 | ||
38 | PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+," | 37 | PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+," |
39 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," | 38 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," |
diff --git a/meta-oe/recipes-support/zbar/zbar_0.10.bb b/meta-oe/recipes-support/zbar/zbar_0.10.bb index 77733aae4..6b6e50111 100644 --- a/meta-oe/recipes-support/zbar/zbar_0.10.bb +++ b/meta-oe/recipes-support/zbar/zbar_0.10.bb | |||
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318b | |||
16 | 16 | ||
17 | inherit autotools pkgconfig | 17 | inherit autotools pkgconfig |
18 | 18 | ||
19 | PACKAGECONFIG = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" | 19 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
20 | 20 | ||
21 | PACKAGECONFIG[x11] = "--with-x,-without-x,libxcb libx11 libsm libxau libxext libxv libice libxdmcp" | 21 | PACKAGECONFIG[x11] = "--with-x,-without-x,libxcb libx11 libsm libxau libxext libxv libice libxdmcp" |
22 | 22 | ||
diff --git a/meta-oe/recipes-support/zile/zile_2.4.11.bb b/meta-oe/recipes-support/zile/zile_2.4.11.bb index b3f191861..ff0517c8a 100644 --- a/meta-oe/recipes-support/zile/zile_2.4.11.bb +++ b/meta-oe/recipes-support/zile/zile_2.4.11.bb | |||
@@ -15,6 +15,6 @@ SRC_URI[sha256sum] = "1fd27bbddc61491b1fbb29a345d0d344734aa9e80cfa07b02892eedf83 | |||
15 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
16 | 16 | ||
17 | PACKAGECONFIG ??= "" | 17 | PACKAGECONFIG ??= "" |
18 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" | 18 | PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" |
19 | 19 | ||
20 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," | 20 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," |