mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
Make use of the new bb.utils.filter() function
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
b4524eb786
commit
0c31f55bcf
@@ -36,7 +36,7 @@ CFLAGS += "${LDFLAGS}"
|
||||
|
||||
PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd"
|
||||
|
||||
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
|
||||
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
|
||||
|
||||
EXTRA_OEMAKE = "DONTSTRIP=1"
|
||||
EXTRA_OECONF += "--disable-mount-locking \
|
||||
|
||||
@@ -24,10 +24,8 @@ EXTRA_OECONF += "--with-dblib=berkeley \
|
||||
andrew_cv_runpath_switch=none"
|
||||
|
||||
PACKAGECONFIG ??= "ntlm \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
|
||||
"
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 ldap pam', d)} \
|
||||
"
|
||||
PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5,"
|
||||
PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
|
||||
PACKAGECONFIG[opie] = "--with-opie,--without-opie,opie,"
|
||||
|
||||
@@ -22,7 +22,7 @@ SYSTEMD_SERVICE_${PN} = "dnrd.service"
|
||||
SYSTEMD_AUTO_ENABLE = "disable"
|
||||
|
||||
inherit autotools
|
||||
inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
|
||||
inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)}
|
||||
|
||||
do_install() {
|
||||
oe_runmake install DESTDIR=${D} INSTALL="install -p"
|
||||
|
||||
@@ -20,8 +20,7 @@ SRC_URI[sha256sum] = "afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d04
|
||||
inherit autotools-brokensep useradd update-rc.d systemd
|
||||
|
||||
PACKAGECONFIG ??= "shadow \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \
|
||||
"
|
||||
|
||||
PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses, --disable-curses --disable-ncurses, ncurses"
|
||||
|
||||
@@ -39,7 +39,7 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --she
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \
|
||||
${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \
|
||||
${@bb.utils.contains('TARGET_ARCH', 'mipsel', 'noatomics', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
|
||||
"
|
||||
PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack"
|
||||
PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,,"
|
||||
|
||||
@@ -37,7 +37,7 @@ export AR = "${HOST_PREFIX}ar cq"
|
||||
|
||||
EXTRA_OECONF += "--disable-option-checking"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
|
||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
|
||||
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
|
||||
|
||||
# configure.in has errors
|
||||
|
||||
Reference in New Issue
Block a user