diff options
Diffstat (limited to 'meta-networking/recipes-daemons')
6 files changed, 7 insertions, 10 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb index 4a888c84f..8d5559657 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb | |||
@@ -36,7 +36,7 @@ CFLAGS += "${LDFLAGS}" | |||
36 | 36 | ||
37 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" | 37 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" |
38 | 38 | ||
39 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 39 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
40 | 40 | ||
41 | EXTRA_OEMAKE = "DONTSTRIP=1" | 41 | EXTRA_OEMAKE = "DONTSTRIP=1" |
42 | EXTRA_OECONF += "--disable-mount-locking \ | 42 | EXTRA_OECONF += "--disable-mount-locking \ |
diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb index 69df274fe..61b7ad47d 100644 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb | |||
@@ -24,10 +24,8 @@ EXTRA_OECONF += "--with-dblib=berkeley \ | |||
24 | andrew_cv_runpath_switch=none" | 24 | andrew_cv_runpath_switch=none" |
25 | 25 | ||
26 | PACKAGECONFIG ??= "ntlm \ | 26 | PACKAGECONFIG ??= "ntlm \ |
27 | ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ | 27 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 ldap pam', d)} \ |
28 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | 28 | " |
29 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ | ||
30 | " | ||
31 | PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," | 29 | PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," |
32 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," | 30 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," |
33 | PACKAGECONFIG[opie] = "--with-opie,--without-opie,opie," | 31 | PACKAGECONFIG[opie] = "--with-opie,--without-opie,opie," |
diff --git a/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb b/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb index b5851a959..126878f77 100644 --- a/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb +++ b/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb | |||
@@ -22,7 +22,7 @@ SYSTEMD_SERVICE_${PN} = "dnrd.service" | |||
22 | SYSTEMD_AUTO_ENABLE = "disable" | 22 | SYSTEMD_AUTO_ENABLE = "disable" |
23 | 23 | ||
24 | inherit autotools | 24 | inherit autotools |
25 | inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} | 25 | inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} |
26 | 26 | ||
27 | do_install() { | 27 | do_install() { |
28 | oe_runmake install DESTDIR=${D} INSTALL="install -p" | 28 | oe_runmake install DESTDIR=${D} INSTALL="install -p" |
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb index c27a1cc9b..73efac2fb 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb | |||
@@ -20,8 +20,7 @@ SRC_URI[sha256sum] = "afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d04 | |||
20 | inherit autotools-brokensep useradd update-rc.d systemd | 20 | inherit autotools-brokensep useradd update-rc.d systemd |
21 | 21 | ||
22 | PACKAGECONFIG ??= "shadow \ | 22 | PACKAGECONFIG ??= "shadow \ |
23 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ | 23 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ |
24 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | ||
25 | " | 24 | " |
26 | 25 | ||
27 | PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses, --disable-curses --disable-ncurses, ncurses" | 26 | PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses, --disable-curses --disable-ncurses, ncurses" |
diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb b/meta-networking/recipes-daemons/squid/squid_3.5.20.bb index fc7f7689b..2e9e1f116 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.20.bb | |||
@@ -39,7 +39,7 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --she | |||
39 | PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ | 39 | PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ |
40 | ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ | 40 | ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ |
41 | ${@bb.utils.contains('TARGET_ARCH', 'mipsel', 'noatomics', '', d)} \ | 41 | ${@bb.utils.contains('TARGET_ARCH', 'mipsel', 'noatomics', '', d)} \ |
42 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ | 42 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ |
43 | " | 43 | " |
44 | PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" | 44 | PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" |
45 | PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," | 45 | PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," |
diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 5932f85ca..7f567133b 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | |||
@@ -37,7 +37,7 @@ export AR = "${HOST_PREFIX}ar cq" | |||
37 | 37 | ||
38 | EXTRA_OECONF += "--disable-option-checking" | 38 | EXTRA_OECONF += "--disable-option-checking" |
39 | 39 | ||
40 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 40 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
41 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 41 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
42 | 42 | ||
43 | # configure.in has errors | 43 | # configure.in has errors |