summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb4
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.4.2.bb6
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb2
-rw-r--r--meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb6
-rw-r--r--meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb4
-rw-r--r--meta-networking/recipes-daemons/postfix/postfix.inc12
-rw-r--r--meta-networking/recipes-daemons/squid/squid_3.5.7.bb8
-rw-r--r--meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb14
-rw-r--r--meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb6
-rw-r--r--meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb2
-rw-r--r--meta-networking/recipes-protocols/openflow/openflow.inc2
-rw-r--r--meta-networking/recipes-protocols/quagga/quagga.inc12
-rw-r--r--meta-networking/recipes-support/dnsmasq/dnsmasq.inc14
-rw-r--r--meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb4
-rw-r--r--meta-networking/recipes-support/fping/fping_3.5.bb2
-rw-r--r--meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb2
-rw-r--r--meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb2
-rw-r--r--meta-networking/recipes-support/netcf/netcf_git.bb2
-rw-r--r--meta-networking/recipes-support/netperf/netperf_2.6.0.bb4
-rw-r--r--meta-networking/recipes-support/nis/ypbind-mt_1.38.bb2
-rw-r--r--meta-networking/recipes-support/nis/ypbind-mt_2.2.bb2
-rw-r--r--meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb6
-rw-r--r--meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb4
-rw-r--r--meta-networking/recipes-support/stunnel/stunnel_5.28.bb2
24 files changed, 62 insertions, 62 deletions
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index 68487eab7..58e760bcb 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
@@ -28,8 +28,8 @@ SRC_URI[sha256sum] = "be8f75eff936b8e41b112462db51adf689715658a1b09e0d6b05d11ec9
28 28
29inherit autotools gettext update-alternatives texinfo 29inherit autotools gettext update-alternatives texinfo
30 30
31SRC_URI += "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" 31SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}"
32noipv6="${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}" 32noipv6="${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}"
33 33
34PACKAGECONFIG ??= "ftp uucpd \ 34PACKAGECONFIG ??= "ftp uucpd \
35 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
index 6a2220ac1..50c100e41 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
@@ -32,10 +32,10 @@ DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libld
32SYSVINITTYPE_linuxstdbase = "lsb" 32SYSVINITTYPE_linuxstdbase = "lsb"
33SYSVINITTYPE = "sysv" 33SYSVINITTYPE = "sysv"
34 34
35PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 35PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
36 ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ 36 ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \
37 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 37 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
38 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ 38 ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \
39 acl cups ldap \ 39 acl cups ldap \
40" 40"
41 41
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 0f4c2478e..3b52ed475 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
37PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" 37PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd"
38 38
39PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 39PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
40 40
41EXTRA_OEMAKE = "DONTSTRIP=1" 41EXTRA_OEMAKE = "DONTSTRIP=1"
42EXTRA_OECONF += "--disable-mount-locking \ 42EXTRA_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 5da3d965b..50468184b 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,8 +24,8 @@ EXTRA_OECONF += "--with-dblib=berkeley \
24 andrew_cv_runpath_switch=none" 24 andrew_cv_runpath_switch=none"
25 25
26PACKAGECONFIG ??= "ntlm \ 26PACKAGECONFIG ??= "ntlm \
27 ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \
28 ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 28 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
29 " 29 "
30PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," 30PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5,"
31PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," 31PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
@@ -54,7 +54,7 @@ do_compile_prepend () {
54} 54}
55 55
56do_install_append() { 56do_install_append() {
57 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 57 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
58 install -d ${D}${systemd_unitdir}/system 58 install -d ${D}${systemd_unitdir}/system
59 install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system 59 install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system
60 60
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 8769e5294..b5851a959 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"
22SYSTEMD_AUTO_ENABLE = "disable" 22SYSTEMD_AUTO_ENABLE = "disable"
23 23
24inherit autotools 24inherit autotools
25inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} 25inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
26 26
27do_install() { 27do_install() {
28 oe_runmake install DESTDIR=${D} INSTALL="install -p" 28 oe_runmake install DESTDIR=${D} INSTALL="install -p"
@@ -34,7 +34,7 @@ do_install() {
34 install -p -m 0644 ${WORKDIR}/dnrd.conf.sample ${D}${sysconfdir}/dnrd/dnrd.conf 34 install -p -m 0644 ${WORKDIR}/dnrd.conf.sample ${D}${sysconfdir}/dnrd/dnrd.conf
35 install -p -m 0755 ${WORKDIR}/dnrd.init ${D}${sysconfdir}/init.d/dnrd 35 install -p -m 0755 ${WORKDIR}/dnrd.init ${D}${sysconfdir}/init.d/dnrd
36 36
37 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 37 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
38 install -d -m 0755 ${D}${systemd_unitdir}/system 38 install -d -m 0755 ${D}${systemd_unitdir}/system
39 install -m 644 ${WORKDIR}/dnrd.service ${D}${systemd_unitdir}/system 39 install -m 644 ${WORKDIR}/dnrd.service ${D}${systemd_unitdir}/system
40 fi 40 fi
diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
index 17dbf76ce..228a81564 100644
--- a/meta-networking/recipes-daemons/postfix/postfix.inc
+++ b/meta-networking/recipes-daemons/postfix/postfix.inc
@@ -7,8 +7,8 @@ has a definite Sendmail-ish flavor, but the inside is completely different."
7HOMEPAGE= "http://www.postfix.org" 7HOMEPAGE= "http://www.postfix.org"
8SECTION = "mail" 8SECTION = "mail"
9DEPENDS = "virtual/db libpcre openssl postfix-native \ 9DEPENDS = "virtual/db libpcre openssl postfix-native \
10 ${@base_contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ 10 ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \
11 ${@base_contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ 11 ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \
12" 12"
13DEPENDS_class-native = "virtual/db-native openssl-native libpcre-native" 13DEPENDS_class-native = "virtual/db-native openssl-native libpcre-native"
14 14
@@ -52,9 +52,9 @@ export SYSLIBS = "${LDFLAGS}"
52 52
53# ldap support 53# ldap support
54export CCARGS-ldap = "\ 54export CCARGS-ldap = "\
55 ${@base_contains('DISTRO_FEATURES', 'ldap', '-DHAS_LDAP', '', d)}" 55 ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-DHAS_LDAP', '', d)}"
56export AUXLIBS-ldap = "\ 56export AUXLIBS-ldap = "\
57 ${@base_contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" 57 ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}"
58 58
59# no native openldap 59# no native openldap
60export CCARGS-ldap_class-native = "" 60export CCARGS-ldap_class-native = ""
@@ -63,9 +63,9 @@ export AUXLIBS-ldap_class-native = ""
63# SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH 63# SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH
64# current openldap didn't enable SASL 64# current openldap didn't enable SASL
65export CCARGS-sasl = "\ 65export CCARGS-sasl = "\
66 ${@base_contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I=/usr/include/sasl', '', d)}" 66 ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I=/usr/include/sasl', '', d)}"
67export AUXLIBS-sasl = "\ 67export AUXLIBS-sasl = "\
68 ${@base_contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" 68 ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}"
69export CCARGS-sasl_class-native = "" 69export CCARGS-sasl_class-native = ""
70export AUXLIBS-sasl_class-native = "" 70export AUXLIBS-sasl_class-native = ""
71 71
diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.7.bb b/meta-networking/recipes-daemons/squid/squid_3.5.7.bb
index a94fed7e5..c3eabcdb3 100644
--- a/meta-networking/recipes-daemons/squid/squid_3.5.7.bb
+++ b/meta-networking/recipes-daemons/squid/squid_3.5.7.bb
@@ -34,15 +34,15 @@ inherit autotools useradd ptest
34USERADD_PACKAGES = "${PN}" 34USERADD_PACKAGES = "${PN}"
35USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" 35USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid"
36 36
37PACKAGECONFIG ??= "${@base_contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ 37PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \
38 ${@base_contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ 38 ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \
39 " 39 "
40PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" 40PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack"
41PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," 41PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,,"
42 42
43BASIC_AUTH = "DB SASL LDAP NIS" 43BASIC_AUTH = "DB SASL LDAP NIS"
44DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 44DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
45BASIC_AUTH += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" 45BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}"
46 46
47EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}'" 47EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}'"
48export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" 48export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb
index 4ee881ddd..6c8ba9164 100644
--- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb
+++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb
@@ -29,13 +29,13 @@ SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c
29 29
30PACKAGECONFIG ??= "tcp-wrappers" 30PACKAGECONFIG ??= "tcp-wrappers"
31PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" 31PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers"
32SRC_URI +="${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" 32SRC_URI +="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}"
33 33
34DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 34DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
35RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" 35RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}"
36PAMLIB = "${@base_contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" 36PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}"
37NOPAM_SRC ="${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" 37NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}"
38SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" 38SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}"
39 39
40inherit update-rc.d useradd systemd 40inherit update-rc.d useradd systemd
41 41
@@ -75,7 +75,7 @@ do_install() {
75 sed -i "s:/lib/security:${base_libdir}/security:" ${D}${sysconfdir}/pam.d/vsftpd 75 sed -i "s:/lib/security:${base_libdir}/security:" ${D}${sysconfdir}/pam.d/vsftpd
76 sed -i "s:ftpusers:vsftpd.ftpusers:" ${D}${sysconfdir}/pam.d/vsftpd 76 sed -i "s:ftpusers:vsftpd.ftpusers:" ${D}${sysconfdir}/pam.d/vsftpd
77 fi 77 fi
78 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 78 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
79 install -d ${D}${sysconfdir}/tmpfiles.d 79 install -d ${D}${sysconfdir}/tmpfiles.d
80 echo "d /var/run/vsftpd/empty 0755 root root -" \ 80 echo "d /var/run/vsftpd/empty 0755 root root -" \
81 > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf 81 > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
index e29369c49..66bb4cce3 100644
--- a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
+++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
@@ -26,7 +26,7 @@ SRC_URI[patch15.sha256sum] = "2bc071c438e8b0ed42a0bd2db2d8b681b27a1e9b1798694d98
26PAM_SRC_URI = "file://rexec.pam \ 26PAM_SRC_URI = "file://rexec.pam \
27 file://rlogin.pam \ 27 file://rlogin.pam \
28 file://rsh.pam" 28 file://rsh.pam"
29SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" 29SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
30 30
31inherit pkgconfig 31inherit pkgconfig
32 32
@@ -41,7 +41,7 @@ do_configure () {
41 ./configure --prefix=${prefix} --exec-prefix=${exec_prefix} 41 ./configure --prefix=${prefix} --exec-prefix=${exec_prefix}
42 echo "INSTALLROOT=${D}" > MCONFIG 42 echo "INSTALLROOT=${D}" > MCONFIG
43 43
44 if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then 44 if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then
45 echo "USE_PAM=1" >> MCONFIG 45 echo "USE_PAM=1" >> MCONFIG
46 fi 46 fi
47 47
@@ -63,7 +63,7 @@ do_install () {
63 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ 63 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \
64 'MANDIR=${mandir}' install 64 'MANDIR=${mandir}' install
65 65
66 if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then 66 if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then
67 install -d ${D}${sysconfdir}/pam.d 67 install -d ${D}${sysconfdir}/pam.d
68 install -m 0644 debian/hosts.equiv ${D}/${sysconfdir} 68 install -m 0644 debian/hosts.equiv ${D}/${sysconfdir}
69 install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexec 69 install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexec
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
index ee8878f9d..79892a120 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
@@ -146,7 +146,7 @@ INITSCRIPT_PACKAGES = "${PN}-server"
146INITSCRIPT_NAME_${PN}-server = "snmpd" 146INITSCRIPT_NAME_${PN}-server = "snmpd"
147INITSCRIPT_PARAMS_${PN}-server = "start 90 2 3 4 5 . stop 60 0 1 6 ." 147INITSCRIPT_PARAMS_${PN}-server = "start 90 2 3 4 5 . stop 60 0 1 6 ."
148 148
149EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" 149EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}"
150 150
151SYSTEMD_PACKAGES = "${PN}-server-snmpd \ 151SYSTEMD_PACKAGES = "${PN}-server-snmpd \
152 ${PN}-server-snmptrapd" 152 ${PN}-server-snmptrapd"
diff --git a/meta-networking/recipes-protocols/openflow/openflow.inc b/meta-networking/recipes-protocols/openflow/openflow.inc
index 5f465cea6..d309ae1a8 100644
--- a/meta-networking/recipes-protocols/openflow/openflow.inc
+++ b/meta-networking/recipes-protocols/openflow/openflow.inc
@@ -20,7 +20,7 @@ PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl, openssl, libssl"
20 20
21EXTRA_OECONF += " \ 21EXTRA_OECONF += " \
22 KARCH=${TARGET_ARCH} \ 22 KARCH=${TARGET_ARCH} \
23 ${@base_contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ 23 ${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \
24 " 24 "
25 25
26S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"
diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
index de78e2679..4244fdf9e 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -9,8 +9,8 @@ HOMEPAGE = "http://www.nongnu.org/quagga/"
9SECTION = "net" 9SECTION = "net"
10LICENSE = "GPL-2.0 & LGPL-2.0" 10LICENSE = "GPL-2.0 & LGPL-2.0"
11DEPENDS = "readline ncurses perl-native" 11DEPENDS = "readline ncurses perl-native"
12DEPENDS += "${@base_contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" 12DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}"
13SNMP_CONF="${@base_contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" 13SNMP_CONF="${@bb.utils.contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}"
14 14
15LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d \ 15LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d \
16 file://COPYING.LIB;md5=01ef24401ded36cd8e5d18bfe947240c" 16 file://COPYING.LIB;md5=01ef24401ded36cd8e5d18bfe947240c"
@@ -41,7 +41,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz; \
41 file://zebra.service \ 41 file://zebra.service \
42" 42"
43 43
44PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 44PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
45PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" 45PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap"
46PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" 46PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam"
47 47
@@ -62,7 +62,7 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \
62 --enable-exampledir=${docdir}/quagga/examples/ \ 62 --enable-exampledir=${docdir}/quagga/examples/ \
63 --enable-vtysh \ 63 --enable-vtysh \
64 --enable-isisd \ 64 --enable-isisd \
65 ${@base_contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ 65 ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \
66 --enable-ospf-te \ 66 --enable-ospf-te \
67 --enable-opaque-lsa \ 67 --enable-opaque-lsa \
68 --enable-ospfclient=yes \ 68 --enable-ospfclient=yes \
@@ -125,7 +125,7 @@ do_install () {
125 fi 125 fi
126 done 126 done
127 127
128 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 128 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
129 install -d ${D}${sysconfdir}/tmpfiles.d 129 install -d ${D}${sysconfdir}/tmpfiles.d
130 echo "d /var/run/quagga 0755 quagga quagga -" \ 130 echo "d /var/run/quagga 0755 quagga quagga -" \
131 > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf 131 > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
@@ -162,7 +162,7 @@ pkg_postinst_${PN} () {
162# Split into a main package and separate per-protocol packages 162# Split into a main package and separate per-protocol packages
163PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-babeld ${PN}-bgpd \ 163PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-babeld ${PN}-bgpd \
164 ${PN}-ripd ${PN}-ripngd ${PN}-isisd \ 164 ${PN}-ripd ${PN}-ripngd ${PN}-isisd \
165 ${PN}-ospfclient ${@base_contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" 165 ${PN}-ospfclient ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}"
166 166
167RDEPENDS_${PN} += "${PN}-babeld ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" 167RDEPENDS_${PN} += "${PN}-babeld ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd"
168 168
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index cc7f9e3be..793c106aa 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -26,10 +26,10 @@ PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack"
26PACKAGECONFIG[lua] = ",,lua" 26PACKAGECONFIG[lua] = ",,lua"
27PACKAGECONFIG[resolvconf] = ",,,resolvconf" 27PACKAGECONFIG[resolvconf] = ",,,resolvconf"
28EXTRA_OEMAKE = "\ 28EXTRA_OEMAKE = "\
29 'COPTS=${@base_contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ 29 'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \
30 ${@base_contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ 30 ${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \
31 ${@base_contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ 31 ${@bb.utils.contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \
32 ${@base_contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ 32 ${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \
33 'CFLAGS=${CFLAGS}' \ 33 'CFLAGS=${CFLAGS}' \
34 'LDFLAGS=${LDFLAGS}' \ 34 'LDFLAGS=${LDFLAGS}' \
35" 35"
@@ -53,7 +53,7 @@ do_install () {
53 53
54 install -d ${D}${systemd_unitdir}/system 54 install -d ${D}${systemd_unitdir}/system
55 55
56 if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then 56 if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then
57 install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service 57 install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service
58 else 58 else
59 install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service 59 install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service
@@ -61,11 +61,11 @@ do_install () {
61 61
62 install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} 62 install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir}
63 63
64 if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then 64 if [ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then
65 install -d ${D}${sysconfdir}/dbus-1/system.d 65 install -d ${D}${sysconfdir}/dbus-1/system.d
66 install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ 66 install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/
67 fi 67 fi
68 if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then 68 if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then
69 install -d ${D}${sysconfdir}/resolvconf/update.d/ 69 install -d ${D}${sysconfdir}/resolvconf/update.d/
70 install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq 70 install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq
71 71
diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb b/meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb
index d7a7cc5e6..c1980effd 100644
--- a/meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb
+++ b/meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb
@@ -17,8 +17,8 @@ DEPENDS = "openssl xz zlib bzip2 libcap icu"
17inherit autotools pkgconfig systemd useradd 17inherit autotools pkgconfig systemd useradd
18 18
19PACKAGECONFIG ??= " \ 19PACKAGECONFIG ??= " \
20 ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ 20 ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \
21 ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 21 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
22 " 22 "
23 23
24PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," 24PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
diff --git a/meta-networking/recipes-support/fping/fping_3.5.bb b/meta-networking/recipes-support/fping/fping_3.5.bb
index b6b17b70c..2f5f2b6c6 100644
--- a/meta-networking/recipes-support/fping/fping_3.5.bb
+++ b/meta-networking/recipes-support/fping/fping_3.5.bb
@@ -21,5 +21,5 @@ inherit autotools
21 21
22EXTRA_OECONF = "--enable-ipv4" 22EXTRA_OECONF = "--enable-ipv4"
23 23
24PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 24PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
25PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 25PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
index d9f121273..446697447 100644
--- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
+++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
@@ -61,7 +61,7 @@ EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \
61 --enable-dpd \ 61 --enable-dpd \
62 --enable-natt=yes \ 62 --enable-natt=yes \
63 --sysconfdir=${sysconfdir}/racoon \ 63 --sysconfdir=${sysconfdir}/racoon \
64 ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}" 64 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}"
65 65
66# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527 66# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527
67CFLAGS += "-fno-strict-aliasing" 67CFLAGS += "-fno-strict-aliasing"
diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb
index d3e6a5dda..f69e71ce1 100644
--- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb
+++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb
@@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae
21#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: error: symbol sctp_connectx has undefined version 21#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: error: symbol sctp_connectx has undefined version
22#| collect2: error: ld returned 1 exit status 22#| collect2: error: ld returned 1 exit status
23#| make[4]: *** [libsctp.la] Error 1 23#| make[4]: *** [libsctp.la] Error 1
24PNBLACKLIST[lksctp-tools] ?= "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" 24PNBLACKLIST[lksctp-tools] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}"
25 25
26S = "${WORKDIR}/${BP}" 26S = "${WORKDIR}/${BP}"
27 27
diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb b/meta-networking/recipes-support/netcf/netcf_git.bb
index 26c738b2c..1bc6baef0 100644
--- a/meta-networking/recipes-support/netcf/netcf_git.bb
+++ b/meta-networking/recipes-support/netcf/netcf_git.bb
@@ -24,7 +24,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd",
24PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," 24PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts,"
25 25
26do_install_append() { 26do_install_append() {
27 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 27 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
28 install -d ${D}${systemd_unitdir}/system 28 install -d ${D}${systemd_unitdir}/system
29 if [ -d "${D}${libdir}/systemd/system" ]; then 29 if [ -d "${D}${libdir}/systemd/system" ]; then
30 mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ 30 mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
diff --git a/meta-networking/recipes-support/netperf/netperf_2.6.0.bb b/meta-networking/recipes-support/netperf/netperf_2.6.0.bb
index 760bab0f3..650fdaeed 100644
--- a/meta-networking/recipes-support/netperf/netperf_2.6.0.bb
+++ b/meta-networking/recipes-support/netperf/netperf_2.6.0.bb
@@ -24,7 +24,7 @@ CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE"
24 24
25# set the "_FILE_OFFSET_BITS" preprocessor symbol to 64 to support files 25# set the "_FILE_OFFSET_BITS" preprocessor symbol to 64 to support files
26# larger than 2GB 26# larger than 2GB
27CFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'largefile', \ 27CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \
28 ' -D_FILE_OFFSET_BITS=64', '', d)}" 28 ' -D_FILE_OFFSET_BITS=64', '', d)}"
29 29
30PACKAGECONFIG ??= "" 30PACKAGECONFIG ??= ""
@@ -60,7 +60,7 @@ do_install() {
60 install -m 0644 ${S}/doc/netperf_old.ps ${D}${docdir}/netperf 60 install -m 0644 ${S}/doc/netperf_old.ps ${D}${docdir}/netperf
61} 61}
62 62
63RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" 63RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}"
64 64
65INITSCRIPT_NAME="netperf" 65INITSCRIPT_NAME="netperf"
66INITSCRIPT_PARAMS="defaults" 66INITSCRIPT_PARAMS="defaults"
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
index d113b82e8..9fc6406b7 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
@@ -19,7 +19,7 @@ This is the final IPv4-only version of ypbind-mt. \
19HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" 19HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html"
20DEPENDS = " \ 20DEPENDS = " \
21 yp-tools \ 21 yp-tools \
22 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
23 " 23 "
24RDEPENDS_${PN} += "yp-tools" 24RDEPENDS_${PN} += "yp-tools"
25 25
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
index cee5880f7..82544e759 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
@@ -15,7 +15,7 @@ of known secure NIS server (/etc/yp.conf) Binds to \
15the server which answered as first. \ 15the server which answered as first. \
16" 16"
17HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" 17HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html"
18DEPENDS = "yp-tools ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 18DEPENDS = "yp-tools ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
19PROVIDES += "ypbind" 19PROVIDES += "ypbind"
20 20
21PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools" 21PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools"
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb b/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb
index f0109069c..de2348e8e 100644
--- a/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb
+++ b/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://openvpn.sourceforge.net"
3SECTION = "net" 3SECTION = "net"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" 5LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c"
6DEPENDS = "lzo openssl iproute2 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 6DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
7 7
8inherit autotools systemd 8inherit autotools systemd
9 9
@@ -22,7 +22,7 @@ CFLAGS += "-fno-inline"
22 22
23# I want openvpn to be able to read password from file (hrw) 23# I want openvpn to be able to read password from file (hrw)
24EXTRA_OECONF += "--enable-password-save --enable-iproute2" 24EXTRA_OECONF += "--enable-password-save --enable-iproute2"
25EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" 25EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}"
26 26
27# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. 27# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host.
28EXTRA_OECONF += "IPROUTE=/sbin/ip" 28EXTRA_OECONF += "IPROUTE=/sbin/ip"
@@ -38,7 +38,7 @@ do_install_append() {
38 install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys 38 install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys
39 install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys 39 install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys
40 40
41 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 41 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
42 install -d ${D}/${systemd_unitdir}/system 42 install -d ${D}/${systemd_unitdir}/system
43 install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system 43 install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system
44 install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-server.service 44 install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-server.service
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
index 7ec1a8ee1..9dc4878c6 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
@@ -20,11 +20,11 @@ EXTRA_OECONF = " \
20 --without-lib-prefix \ 20 --without-lib-prefix \
21" 21"
22 22
23EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" 23EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
24 24
25 25
26PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ 26PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \
27 ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \
28" 28"
29PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni," 29PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,"
30PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," 30PACKAGECONFIG[charon] = "--enable-charon,--disable-charon,"
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.28.bb b/meta-networking/recipes-support/stunnel/stunnel_5.28.bb
index 0a8bcd8bc..61be932fa 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.28.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.28.bb
@@ -16,5 +16,5 @@ inherit autotools
16 16
17EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" 17EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips"
18 18
19PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}" 19PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
20PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" 20PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 19:19:47 +0000