net-snmp: enable ipv6 support
PATCH 1/22 net-snmp: enable ipv6 support
From: Zhu Yanjun <[email protected]>
Add packageconfig for ipv6 and enable it when it's defined in distro_features.
---
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +3 -0
@@ -39,6 +39,9 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[elfutils] = "--with-elf, --without-elf, elfutils" PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," + EXTRA_OECONF = "--disable-embedded-perl \ --with-perl-modules=no \ --disable-manuals \
Signature · 1 line
2.8.2
PATCH 2/22 dovecot: fix QA issue and remove from blacklist
From: "[email protected]" <[email protected]>
Modify FILES_${PN} and FILES_${PN}-dev to fix QA issue and remove dovecot from blacklist.
---
meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb +4 -4
@@ -59,9 +59,9 @@ USERADD_PARAM_${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dove -r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovenull dovenull" GROUPADD_PARAM_${PN} = "-f -r dovecot;-f -r dovenull" +FILES_${PN} += "${libdir}/dovecot/*plugin.so \ + ${libdir}/dovecot/libfs_compress.so \ + ${libdir}/dovecot/libssl_iostream_openssl.so" FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" -FILES_${PN}-dev += "${libdir}/dovecot/*.so" +FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" - -# http://errors.yoctoproject.org/Errors/Details/35133/ -PNBLACKLIST[dovecot] ?= "BROKEN: QA Issue: -dev package contains non-symlink .so"
Signature · 1 line
2.8.2
PATCH 3/22 proftpd: CVE-2016-3125
In reply to Otavio SalvadorFrom: Catalin Enache <[email protected]>
The mod_tls module in ProFTPD before 1.3.5b and 1.3.6 before 1.3.6rc2 does not properly handle the TLSDHParamFile directive, which might cause a weaker than intended Diffie-Hellman (DH) key to be used and consequently allow attackers to have unspecified impact via unknown vectors.
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3125
---
.../proftpd/files/CVE-2016-3125.patch | 247 +++++++++++++++++++++ .../recipes-daemons/proftpd/proftpd_1.3.5a.bb | 1 + 2 files changed, 248 insertions(+) create mode 100644 meta-networking/recipes-daemons/proftpd/files/CVE-2016-3125.patch
meta-networking/recipes-daemons/proftpd/files/CVE-2016-3125.patch new file +247 -0
@@ -0,0 +1,247 @@ +From 7a8f683cedf9b0d1024a80362693c9f8b93a0f2b Mon Sep 17 00:00:00 2001 +From: TJ Saunders <[email protected]> +Date: Thu, 10 Mar 2016 15:07:58 -0800 +Subject: [PATCH] Backport of fix for Bug#4230 to 1.3.5 branch. + +Upstream-Status: Backport +CVE: CVE-2016-3125 + +Author: TJ Saunders <[email protected]> +Signed-off-by: Catalin Enache <[email protected]> +--- + contrib/mod_tls.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 147 insertions(+), 20 deletions(-) + +diff --git a/contrib/mod_tls.c b/contrib/mod_tls.c +index df92658..5883cc7 100644 +--- a/contrib/mod_tls.c ++++ b/contrib/mod_tls.c +@@ -411,6 +411,13 @@ static int tls_required_on_ctrl = 0; + static int tls_required_on_data = 0; + static unsigned char *tls_authenticated = NULL; + ++/* Define the minimum DH group length we allow (unless the AllowWeakDH ++ * TLSOption is used). Ideally this would be 2048, per https://weakdh.org, ++ * but for compatibility with older Java versions, which only support up to ++ * 1024, we'll use 1024. For now. ++ */ ++#define TLS_DH_MIN_LEN 1024 ++ + /* mod_tls session flags */ + #define TLS_SESS_ON_CTRL 0x0001 + #define TLS_SESS_ON_DATA 0x0002 +@@ -438,6 +445,7 @@ static unsigned char *tls_authenticated = NULL; + #define TLS_OPT_USE_IMPLICIT_SSL 0x0200 + #define TLS_OPT_ALLOW_CLIENT_RENEGOTIATIONS 0x0400 + #define TLS_OPT_VERIFY_CERT_CN 0x0800 ++#define TLS_OPT_ALLOW_WEAK_DH 0x1000 + + /* mod_tls SSCN modes */ + #define TLS_SSCN_MODE_SERVER 0 +@@ -2417,24 +2425,139 @@ static int tls_ctrl_renegotiate_cb(CALLBACK_FRAME) { + + static DH *tls_dh_cb(SSL *ssl, int is_export, int keylength) { + DH *dh = NULL; ++ EVP_PKEY *pkey; ++ int pkeylen = 0, use_pkeylen = FALSE; ++ ++ /* OpenSSL will only ever call us (currently) with a keylen of 512 or 1024; ++ * see the SSL_EXPORT_PKEYLENGTH macro in ssl_locl.h. Sigh. ++ * ++ * Thus we adjust the DH parameter length according to the size of the ++ * RSA/DSA private key used for the current connection. ++ * ++ * NOTE: This MAY cause interoperability issues with some clients, notably ++ * Java 7 (and earlier) clients, since Java 7 and earlier supports ++ * Diffie-Hellman only up to 1024 bits. More sighs. To deal with these ++ * clients, then, you need to configure a certificate/key of 1024 bits. ++ */ ++ pkey = SSL_get_privatekey(ssl); ++ if (pkey != NULL) { ++ if (EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA || ++ EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) { ++ pkeylen = EVP_PKEY_bits(pkey); ++ ++ if (pkeylen < TLS_DH_MIN_LEN) { ++ if (!(tls_opts & TLS_OPT_ALLOW_WEAK_DH)) { ++ pr_trace_msg(trace_channel, 11, ++ "certificate private key length %d less than %d bits, using %d " ++ "(see AllowWeakDH TLSOption)", pkeylen, TLS_DH_MIN_LEN, ++ TLS_DH_MIN_LEN); ++ pkeylen = TLS_DH_MIN_LEN; ++ } ++ } ++ ++ if (pkeylen != keylen) { ++ pr_trace_msg(trace_channel, 13, ++ "adjusted DH parameter length from %d to %d bits", keylen, pkeylen); ++ use_pkeylen = TRUE; ++ } ++ } ++ } + + if (tls_tmp_dhs != NULL && + tls_tmp_dhs->nelts > 0) { + register unsigned int i; +- DH **dhs; ++ DH *best_dh = NULL, **dhs; ++ int best_dhlen = 0; + + dhs = tls_tmp_dhs->elts; ++ ++ /* Search the configured list of DH parameters twice: once for any sizes ++ * matching the actual requested size (usually 1024), and once for any ++ * matching the certificate private key size (pkeylen). ++ * ++ * This behavior allows site admins to configure a TLSDHParamFile that ++ * contains 1024-bit parameters, for e.g. Java 7 (and earlier) clients. ++ */ ++ ++ /* Note: the keylen argument is in BITS, but DH_size() returns the number ++ * of BYTES. ++ */ + for (i = 0; i < tls_tmp_dhs->nelts; i++) { +- /* Note: the keylength argument is in BITS, but DH_size() returns +- * the number of BYTES. ++ int dhlen; ++ ++ dhlen = DH_size(dhs[i]) * 8; ++ if (dhlen == keylen) { ++ pr_trace_msg(trace_channel, 11, ++ "found matching DH parameter for key length %d", keylen); ++ return dhs[i]; ++ } ++ ++ /* Try to find the next "best" DH to use, where "best" means ++ * the smallest DH that is larger than the necessary keylen. + */ +- if (DH_size(dhs[i]) == (keylength / 8)) { ++ if (dhlen > keylen) { ++ if (best_dh != NULL) { ++ if (dhlen < best_dhlen) { ++ best_dh = dhs[i]; ++ best_dhlen = dhlen; ++ } ++ ++ } else { ++ best_dh = dhs[i]; ++ best_dhlen = dhlen; ++ } ++ } ++ } ++ ++ for (i = 0; i < tls_tmp_dhs->nelts; i++) { ++ int dhlen; ++ ++ dhlen = DH_size(dhs[i]) * 8; ++ if (dhlen == pkeylen) { ++ pr_trace_msg(trace_channel, 11, ++ "found matching DH parameter for certificate private key length %d", ++ pkeylen); + return dhs[i]; + } ++ ++ if (dhlen > pkeylen) { ++ if (best_dh != NULL) { ++ if (dhlen < best_dhlen) { ++ best_dh = dhs[i]; ++ best_dhlen = dhlen; ++ } ++ ++ } else { ++ best_dh = dhs[i]; ++ best_dhlen = dhlen; ++ } ++ } ++ } ++ ++ if (best_dh != NULL) { ++ pr_trace_msg(trace_channel, 11, ++ "using best DH parameter for key length %d (length %d)", keylen, ++ best_dhlen); ++ return best_dh; + } + } + +- switch (keylength) { ++ /* Still no DH parameters found? Use the built-in ones. */ ++ ++ if (keylen < TLS_DH_MIN_LEN) { ++ if (!(tls_opts & TLS_OPT_ALLOW_WEAK_DH)) { ++ pr_trace_msg(trace_channel, 11, ++ "requested key length %d less than %d bits, using %d " ++ "(see AllowWeakDH TLSOption)", keylen, TLS_DH_MIN_LEN, TLS_DH_MIN_LEN); ++ keylen = TLS_DH_MIN_LEN; ++ } ++ } ++ ++ if (use_pkeylen) { ++ keylen = pkeylen; ++ } ++ ++ switch (keylen) { + case 512: + dh = get_dh512(); + break; +@@ -2443,32 +2566,33 @@ static DH *tls_dh_cb(SSL *ssl, int is_export, int keylength) { + dh = get_dh768(); + break; + +- case 1024: +- dh = get_dh1024(); +- break; ++ case 1024: ++ dh = get_dh1024(); ++ break; + +- case 1536: +- dh = get_dh1536(); +- break; ++ case 1536: ++ dh = get_dh1536(); ++ break; + +- case 2048: +- dh = get_dh2048(); +- break; ++ case 2048: ++ dh = get_dh2048(); ++ break; + +- default: +- tls_log("unsupported DH key length %d requested, returning 1024 bits", +- keylength); +- dh = get_dh1024(); +- break; ++ default: ++ tls_log("unsupported DH key length %d requested, returning 1024 bits", ++ keylen); ++ dh = get_dh1024(); ++ break; + } + ++ pr_trace_msg(trace_channel, 11, "using builtin DH for %d bits", keylen); ++ + /* Add this DH to the list, so that it can be freed properly later. */ + if (tls_tmp_dhs == NULL) { + tls_tmp_dhs = make_array(session.pool, 1, sizeof(DH *)); + } + + *((DH **) push_array(tls_tmp_dhs)) = dh; +- + return dh; + } + +@@ -8445,6 +8569,9 @@ MODRET set_tlsoptions(cmd_rec *cmd) { + strcmp(cmd->argv[i], "AllowClientRenegotiations") == 0) { + opts |= TLS_OPT_ALLOW_CLIENT_RENEGOTIATIONS; + ++ } else if (strcmp(cmd->argv[i], "AllowWeakDH") == 0) { ++ opts |= TLS_OPT_ALLOW_WEAK_DH; ++ + } else if (strcmp(cmd->argv[i], "EnableDiags") == 0) { + opts |= TLS_OPT_ENABLE_DIAGS; + +-- +2.7.4 +
meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb +1 -0
@@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ file://contrib.patch \ file://build_fixup.patch \ file://proftpd.service \ + file://CVE-2016-3125.patch \ " SRC_URI[md5sum] = "b9d3092411478415b31d435f8e26d173"
Signature · 1 line
2.8.2
PATCH 4/22 openconnect: add missing dependencies
In reply to Otavio SalvadorFrom: Ioan-Adrian Ratiu <[email protected]>
They were autodetected and triggered QA warnings
---
meta-networking/recipes-connectivity/openconnect/openconnect_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/openconnect/openconnect_git.bb +1 -1
@@ -2,7 +2,7 @@ SUMMARY = "Open client for Cisco AnyConnect VPN" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" -DEPENDS = "vpnc libxml2 gnutls" +DEPENDS = "vpnc libxml2 gnutls lz4 krb5 libproxy pcsc-lite" RDEPENDS_${PN} = "vpnc" PV = "7.06"
Signature · 1 line
2.8.2
PATCH 5/22 rp-pppoe: Fix rootfs creation errors
In reply to Otavio SalvadorFrom: Li xin <[email protected]>
error: file /usr/share/doc/README from install of rp-pppoe-doc-3.11-* conflicts with file from package dmidecode-doc-2.12*
---
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb +4 -0
@@ -29,6 +29,10 @@ do_install_append() { install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service + install -d ${D}${datadir}/doc/${PN} + if [ -f ${D}${datadir}/doc/README ]; then + mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ + fi } do_install() {
Signature · 1 line
2.8.2
PATCH 6/22 meta-networking: use bb.utils.contains() instead of base_contains()
In reply to Otavio SalvadorFrom: Ross Burton <[email protected]>
base_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains().
---
.../recipes-connectivity/inetutils/inetutils_1.9.4.bb | 4 ++-- meta-networking/recipes-connectivity/samba/samba_4.4.2.bb | 6 +++--- meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb | 2 +- .../recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb | 6 +++--- meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb | 4 ++-- meta-networking/recipes-daemons/postfix/postfix.inc | 12 ++++++------ meta-networking/recipes-daemons/squid/squid_3.5.7.bb | 8 ++++---- meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 14 +++++++------- .../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 6 +++--- .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 2 +- meta-networking/recipes-protocols/openflow/openflow.inc | 2 +- meta-networking/recipes-protocols/quagga/quagga.inc | 12 ++++++------ meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 14 +++++++------- meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb | 4 ++-- meta-networking/recipes-support/fping/fping_3.5.bb | 2 +- .../recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb | 2 +- .../recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb | 2 +- meta-networking/recipes-support/netcf/netcf_git.bb | 2 +- meta-networking/recipes-support/netperf/netperf_2.6.0.bb | 4 ++-- meta-networking/recipes-support/nis/ypbind-mt_1.38.bb | 2 +- meta-networking/recipes-support/nis/ypbind-mt_2.2.bb | 2 +- meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb | 6 +++--- .../recipes-support/strongswan/strongswan_5.3.2.bb | 4 ++-- meta-networking/recipes-support/stunnel/stunnel_5.28.bb | 2 +- 24 files changed, 62 insertions(+), 62 deletions(-)
meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +2 -2
@@ -28,8 +28,8 @@ SRC_URI[sha256sum] = "be8f75eff936b8e41b112462db51adf689715658a1b09e0d6b05d11ec9 inherit autotools gettext update-alternatives texinfo -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" -noipv6="${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" +noipv6="${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}" PACKAGECONFIG ??= "ftp uucpd \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
meta-networking/recipes-connectivity/samba/samba_4.4.2.bb +3 -3
@@ -32,10 +32,10 @@ DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libld SYSVINITTYPE_linuxstdbase = "lsb" SYSVINITTYPE = "sysv" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ acl cups ldap \ "
meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb +1 -1
@@ -36,7 +36,7 @@ CFLAGS += "${LDFLAGS}" PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" EXTRA_OEMAKE = "DONTSTRIP=1" EXTRA_OECONF += "--disable-mount-locking \
meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +3 -3
@@ -24,8 +24,8 @@ EXTRA_OECONF += "--with-dblib=berkeley \ andrew_cv_runpath_switch=none" PACKAGECONFIG ??= "ntlm \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ " PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
@@ -54,7 +54,7 @@ do_compile_prepend () { } do_install_append() { - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system
meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb +2 -2
@@ -22,7 +22,7 @@ SYSTEMD_SERVICE_${PN} = "dnrd.service" SYSTEMD_AUTO_ENABLE = "disable" inherit autotools -inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} do_install() { oe_runmake install DESTDIR=${D} INSTALL="install -p"
@@ -34,7 +34,7 @@ do_install() { install -p -m 0644 ${WORKDIR}/dnrd.conf.sample ${D}${sysconfdir}/dnrd/dnrd.conf install -p -m 0755 ${WORKDIR}/dnrd.init ${D}${sysconfdir}/init.d/dnrd - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d -m 0755 ${D}${systemd_unitdir}/system install -m 644 ${WORKDIR}/dnrd.service ${D}${systemd_unitdir}/system fi
meta-networking/recipes-daemons/postfix/postfix.inc +6 -6
@@ -7,8 +7,8 @@ has a definite Sendmail-ish flavor, but the inside is completely different." HOMEPAGE= "http://www.postfix.org" SECTION = "mail" DEPENDS = "virtual/db libpcre openssl postfix-native \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ " DEPENDS_class-native = "virtual/db-native openssl-native libpcre-native"
@@ -52,9 +52,9 @@ export SYSLIBS = "${LDFLAGS}" # ldap support export CCARGS-ldap = "\ - ${@base_contains('DISTRO_FEATURES', 'ldap', '-DHAS_LDAP', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-DHAS_LDAP', '', d)}" export AUXLIBS-ldap = "\ - ${@base_contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" # no native openldap export CCARGS-ldap_class-native = ""
@@ -63,9 +63,9 @@ export AUXLIBS-ldap_class-native = "" # SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH # current openldap didn't enable SASL export CCARGS-sasl = "\ - ${@base_contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I=/usr/include/sasl', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I=/usr/include/sasl', '', d)}" export AUXLIBS-sasl = "\ - ${@base_contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" export CCARGS-sasl_class-native = "" export AUXLIBS-sasl_class-native = ""
meta-networking/recipes-daemons/squid/squid_3.5.7.bb +4 -4
@@ -34,15 +34,15 @@ inherit autotools useradd ptest USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" -PACKAGECONFIG ??= "${@base_contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ - ${@base_contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ + ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', 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,," BASIC_AUTH = "DB SASL LDAP NIS" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -BASIC_AUTH += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}'" export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +7 -7
@@ -29,13 +29,13 @@ SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" -SRC_URI +="${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" +SRC_URI +="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" -PAMLIB = "${@base_contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" -NOPAM_SRC ="${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" +PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" +NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" inherit update-rc.d useradd systemd
@@ -75,7 +75,7 @@ do_install() { sed -i "s:/lib/security:${base_libdir}/security:" ${D}${sysconfdir}/pam.d/vsftpd sed -i "s:ftpusers:vsftpd.ftpusers:" ${D}${sysconfdir}/pam.d/vsftpd fi - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /var/run/vsftpd/empty 0755 root root -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +3 -3
@@ -26,7 +26,7 @@ SRC_URI[patch15.sha256sum] = "2bc071c438e8b0ed42a0bd2db2d8b681b27a1e9b1798694d98 PAM_SRC_URI = "file://rexec.pam \ file://rlogin.pam \ file://rsh.pam" -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" inherit pkgconfig
@@ -41,7 +41,7 @@ do_configure () { ./configure --prefix=${prefix} --exec-prefix=${exec_prefix} echo "INSTALLROOT=${D}" > MCONFIG - if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then echo "USE_PAM=1" >> MCONFIG fi
@@ -63,7 +63,7 @@ do_install () { 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ 'MANDIR=${mandir}' install - if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/pam.d install -m 0644 debian/hosts.equiv ${D}/${sysconfdir} install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexec
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +1 -1
@@ -146,7 +146,7 @@ INITSCRIPT_PACKAGES = "${PN}-server" INITSCRIPT_NAME_${PN}-server = "snmpd" INITSCRIPT_PARAMS_${PN}-server = "start 90 2 3 4 5 . stop 60 0 1 6 ." -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" SYSTEMD_PACKAGES = "${PN}-server-snmpd \ ${PN}-server-snmptrapd"
meta-networking/recipes-protocols/openflow/openflow.inc +1 -1
@@ -20,7 +20,7 @@ PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl, openssl, libssl" EXTRA_OECONF += " \ KARCH=${TARGET_ARCH} \ - ${@base_contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ " S = "${WORKDIR}/git"
meta-networking/recipes-protocols/quagga/quagga.inc +6 -6
@@ -9,8 +9,8 @@ HOMEPAGE = "http://www.nongnu.org/quagga/" SECTION = "net" LICENSE = "GPL-2.0 & LGPL-2.0" DEPENDS = "readline ncurses perl-native" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" -SNMP_CONF="${@base_contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" +SNMP_CONF="${@bb.utils.contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d \ file://COPYING.LIB;md5=01ef24401ded36cd8e5d18bfe947240c"
@@ -41,7 +41,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz; \ file://zebra.service \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam"
@@ -62,7 +62,7 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ --enable-exampledir=${docdir}/quagga/examples/ \ --enable-vtysh \ --enable-isisd \ - ${@base_contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ --enable-ospf-te \ --enable-opaque-lsa \ --enable-ospfclient=yes \
@@ -125,7 +125,7 @@ do_install () { fi done - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /var/run/quagga 0755 quagga quagga -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
@@ -162,7 +162,7 @@ pkg_postinst_${PN} () { # Split into a main package and separate per-protocol packages PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-babeld ${PN}-bgpd \ ${PN}-ripd ${PN}-ripngd ${PN}-isisd \ - ${PN}-ospfclient ${@base_contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" + ${PN}-ospfclient ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" RDEPENDS_${PN} += "${PN}-babeld ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd"
meta-networking/recipes-support/dnsmasq/dnsmasq.inc +7 -7
@@ -26,10 +26,10 @@ PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack" PACKAGECONFIG[lua] = ",,lua" PACKAGECONFIG[resolvconf] = ",,,resolvconf" EXTRA_OEMAKE = "\ - 'COPTS=${@base_contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ + 'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ 'CFLAGS=${CFLAGS}' \ 'LDFLAGS=${LDFLAGS}' \ "
@@ -53,7 +53,7 @@ do_install () { install -d ${D}${systemd_unitdir}/system - if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service else install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service
@@ -61,11 +61,11 @@ do_install () { install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} - if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/dbus-1/system.d install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ fi - if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/resolvconf/update.d/ install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq
meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb +2 -2
@@ -17,8 +17,8 @@ DEPENDS = "openssl xz zlib bzip2 libcap icu" inherit autotools pkgconfig systemd useradd PACKAGECONFIG ??= " \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ " PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
meta-networking/recipes-support/fping/fping_3.5.bb +1 -1
@@ -21,5 +21,5 @@ inherit autotools EXTRA_OECONF = "--enable-ipv4" -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb +1 -1
@@ -61,7 +61,7 @@ EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \ --enable-dpd \ --enable-natt=yes \ --sysconfdir=${sysconfdir}/racoon \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}" # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527 CFLAGS += "-fno-strict-aliasing"
meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb +1 -1
@@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae #| /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 #| collect2: error: ld returned 1 exit status #| make[4]: *** [libsctp.la] Error 1 -PNBLACKLIST[lksctp-tools] ?= "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" +PNBLACKLIST[lksctp-tools] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" S = "${WORKDIR}/${BP}"
meta-networking/recipes-support/netcf/netcf_git.bb +1 -1
@@ -24,7 +24,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," do_install_append() { - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system if [ -d "${D}${libdir}/systemd/system" ]; then mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
meta-networking/recipes-support/netperf/netperf_2.6.0.bb +2 -2
@@ -24,7 +24,7 @@ CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE" # set the "_FILE_OFFSET_BITS" preprocessor symbol to 64 to support files # larger than 2GB -CFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'largefile', \ +CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \ ' -D_FILE_OFFSET_BITS=64', '', d)}" PACKAGECONFIG ??= ""
@@ -60,7 +60,7 @@ do_install() { install -m 0644 ${S}/doc/netperf_old.ps ${D}${docdir}/netperf } -RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" INITSCRIPT_NAME="netperf" INITSCRIPT_PARAMS="defaults"
meta-networking/recipes-support/nis/ypbind-mt_1.38.bb +1 -1
@@ -19,7 +19,7 @@ This is the final IPv4-only version of ypbind-mt. \ HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" DEPENDS = " \ yp-tools \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ " RDEPENDS_${PN} += "yp-tools"
meta-networking/recipes-support/nis/ypbind-mt_2.2.bb +1 -1
@@ -15,7 +15,7 @@ of known secure NIS server (/etc/yp.conf) Binds to \ the server which answered as first. \ " HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" -DEPENDS = "yp-tools ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +DEPENDS = "yp-tools ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PROVIDES += "ypbind" PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools"
meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb +3 -3
@@ -3,7 +3,7 @@ HOMEPAGE = "http://openvpn.sourceforge.net" SECTION = "net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" -DEPENDS = "lzo openssl iproute2 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" inherit autotools systemd
@@ -22,7 +22,7 @@ CFLAGS += "-fno-inline" # I want openvpn to be able to read password from file (hrw) EXTRA_OECONF += "--enable-password-save --enable-iproute2" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" # Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. EXTRA_OECONF += "IPROUTE=/sbin/ip"
@@ -38,7 +38,7 @@ do_install_append() { install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/[email protected] ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/[email protected] ${D}/${systemd_unitdir}/system/[email protected]
meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +2 -2
@@ -20,11 +20,11 @@ EXTRA_OECONF = " \ --without-lib-prefix \ " -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ " PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni," PACKAGECONFIG[charon] = "--enable-charon,--disable-charon,"
meta-networking/recipes-support/stunnel/stunnel_5.28.bb +1 -1
@@ -16,5 +16,5 @@ inherit autotools EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
Signature · 1 line
2.8.2
Re: [meta-oe backport krogoth PATCH 06/22] meta-networking: use bb.utils.contains() instead of base_contains()
Quoted 5 lines · Otavio Salvador
From: Ross Burton <[email protected]>
base_contains()is a compatibility wrapper and may warn in the future, so replace all instances withbb.utils.contains().
Krogoth does not have the utils.bbclass changes that would print this message.
utils.bbclass: note for deprecated base_contains1a0e56630c5c27d8899dd0979ae0b86bbe227881
dropping this change.
- armin
Quoted 544 lines
Signed-off-by Ross Burton <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Joe MacDonald <[email protected]>Signed-off-by Otavio Salvador <[email protected]>---
.../recipes-connectivity/inetutils/inetutils_1.9.4.bb | 4 ++-- meta-networking/recipes-connectivity/samba/samba_4.4.2.bb | 6 +++--- meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb | 2 +- .../recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb | 6 +++--- meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb | 4 ++-- meta-networking/recipes-daemons/postfix/postfix.inc | 12 ++++++------ meta-networking/recipes-daemons/squid/squid_3.5.7.bb | 8 ++++---- meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 14 +++++++------- .../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 6 +++--- .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 2 +- meta-networking/recipes-protocols/openflow/openflow.inc | 2 +- meta-networking/recipes-protocols/quagga/quagga.inc | 12 ++++++------ meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 14 +++++++------- meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb | 4 ++-- meta-networking/recipes-support/fping/fping_3.5.bb | 2 +- .../recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb | 2 +- .../recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb | 2 +- meta-networking/recipes-support/netcf/netcf_git.bb | 2 +- meta-networking/recipes-support/netperf/netperf_2.6.0.bb | 4 ++-- meta-networking/recipes-support/nis/ypbind-mt_1.38.bb | 2 +- meta-networking/recipes-support/nis/ypbind-mt_2.2.bb | 2 +- meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb | 6 +++--- .../recipes-support/strongswan/strongswan_5.3.2.bb | 4 ++-- meta-networking/recipes-support/stunnel/stunnel_5.28.bb | 2 +- 24 files changed, 62 insertions(+), 62 deletions(-)meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +2
-2@@ -28,8 +28,8 @@ SRC_URI[sha256sum] = "be8f75eff936b8e41b112462db51adf689715658a1b09e0d6b05d11ec9 inherit autotools gettext update-alternatives texinfo -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" -noipv6="${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" +noipv6="${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}" PACKAGECONFIG ??= "ftp uucpd \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \meta-networking/recipes-connectivity/samba/samba_4.4.2.bb +3
-3@@ -32,10 +32,10 @@ DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libld SYSVINITTYPE_linuxstdbase = "lsb" SYSVINITTYPE = "sysv" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ acl cups ldap \ "meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb +1
-1@@ -36,7 +36,7 @@ CFLAGS += "${LDFLAGS}" PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" EXTRA_OEMAKE = "DONTSTRIP=1" EXTRA_OECONF += "--disable-mount-locking \meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +3
-3@@ -24,8 +24,8 @@ EXTRA_OECONF += "--with-dblib=berkeley \ andrew_cv_runpath_switch=none" PACKAGECONFIG ??= "ntlm \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ " PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"@@ -54,7 +54,7 @@ do_compile_prepend () { } do_install_append() { - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/systemmeta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb +2
-2@@ -22,7 +22,7 @@ SYSTEMD_SERVICE_${PN} = "dnrd.service" SYSTEMD_AUTO_ENABLE = "disable" inherit autotools -inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} do_install() { oe_runmake install DESTDIR=${D} INSTALL="install -p"@@ -34,7 +34,7 @@ do_install() { install -p -m 0644 ${WORKDIR}/dnrd.conf.sample ${D}${sysconfdir}/dnrd/dnrd.conf install -p -m 0755 ${WORKDIR}/dnrd.init ${D}${sysconfdir}/init.d/dnrd - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d -m 0755 ${D}${systemd_unitdir}/system install -m 644 ${WORKDIR}/dnrd.service ${D}${systemd_unitdir}/system fimeta-networking/recipes-daemons/postfix/postfix.inc +6
-6@@ -7,8 +7,8 @@ has a definite Sendmail-ish flavor, but the inside is completely different." HOMEPAGE= "http://www.postfix.org" SECTION = "mail" DEPENDS = "virtual/db libpcre openssl postfix-native \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ " DEPENDS_class-native = "virtual/db-native openssl-native libpcre-native"@@ -52,9 +52,9 @@ export SYSLIBS = "${LDFLAGS}" # ldap support export CCARGS-ldap = "\ - ${@base_contains('DISTRO_FEATURES', 'ldap', '-DHAS_LDAP', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-DHAS_LDAP', '', d)}" export AUXLIBS-ldap = "\ - ${@base_contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" # no native openldap export CCARGS-ldap_class-native = ""@@ -63,9 +63,9 @@ export AUXLIBS-ldap_class-native = "" # SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH # current openldap didn't enable SASL export CCARGS-sasl = "\ - ${@base_contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I=/usr/include/sasl', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I=/usr/include/sasl', '', d)}" export AUXLIBS-sasl = "\ - ${@base_contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" export CCARGS-sasl_class-native = "" export AUXLIBS-sasl_class-native = ""meta-networking/recipes-daemons/squid/squid_3.5.7.bb +4
-4@@ -34,15 +34,15 @@ inherit autotools useradd ptest USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" -PACKAGECONFIG ??= "${@base_contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ - ${@base_contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ + ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', 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,," BASIC_AUTH = "DB SASL LDAP NIS" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -BASIC_AUTH += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}'" export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +7
-7@@ -29,13 +29,13 @@ SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" -SRC_URI +="${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" +SRC_URI +="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" -PAMLIB = "${@base_contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" -NOPAM_SRC ="${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" +PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" +NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" inherit update-rc.d useradd systemd@@ -75,7 +75,7 @@ do_install() { sed -i "s:/lib/security:${base_libdir}/security:" ${D}${sysconfdir}/pam.d/vsftpd sed -i "s:ftpusers:vsftpd.ftpusers:" ${D}${sysconfdir}/pam.d/vsftpd fi - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /var/run/vsftpd/empty 0755 root root -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.confmeta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +3
-3@@ -26,7 +26,7 @@ SRC_URI[patch15.sha256sum] = "2bc071c438e8b0ed42a0bd2db2d8b681b27a1e9b1798694d98 PAM_SRC_URI = "file://rexec.pam \ file://rlogin.pam \ file://rsh.pam" -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" inherit pkgconfig@@ -41,7 +41,7 @@ do_configure () { ./configure --prefix=${prefix} --exec-prefix=${exec_prefix} echo "INSTALLROOT=${D}" > MCONFIG - if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then echo "USE_PAM=1" >> MCONFIG fi@@ -63,7 +63,7 @@ do_install () { 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ 'MANDIR=${mandir}' install - if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/pam.d install -m 0644 debian/hosts.equiv ${D}/${sysconfdir} install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexecmeta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +1
-1@@ -146,7 +146,7 @@ INITSCRIPT_PACKAGES = "${PN}-server" INITSCRIPT_NAME_${PN}-server = "snmpd" INITSCRIPT_PARAMS_${PN}-server = "start 90 2 3 4 5 . stop 60 0 1 6 ." -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" SYSTEMD_PACKAGES = "${PN}-server-snmpd \ ${PN}-server-snmptrapd"meta-networking/recipes-protocols/openflow/openflow.inc +1
-1@@ -20,7 +20,7 @@ PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl, openssl, libssl" EXTRA_OECONF += " \ KARCH=${TARGET_ARCH} \ - ${@base_contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ " S = "${WORKDIR}/git"meta-networking/recipes-protocols/quagga/quagga.inc +6
-6@@ -9,8 +9,8 @@ HOMEPAGE = "http://www.nongnu.org/quagga/" SECTION = "net" LICENSE = "GPL-2.0 & LGPL-2.0" DEPENDS = "readline ncurses perl-native" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" -SNMP_CONF="${@base_contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" +SNMP_CONF="${@bb.utils.contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d \ file://COPYING.LIB;md5=01ef24401ded36cd8e5d18bfe947240c"@@ -41,7 +41,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz; \ file://zebra.service \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam"@@ -62,7 +62,7 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ --enable-exampledir=${docdir}/quagga/examples/ \ --enable-vtysh \ --enable-isisd \ - ${@base_contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ --enable-ospf-te \ --enable-opaque-lsa \ --enable-ospfclient=yes \@@ -125,7 +125,7 @@ do_install () { fi done - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /var/run/quagga 0755 quagga quagga -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf@@ -162,7 +162,7 @@ pkg_postinst_${PN} () { # Split into a main package and separate per-protocol packages PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-babeld ${PN}-bgpd \ ${PN}-ripd ${PN}-ripngd ${PN}-isisd \ - ${PN}-ospfclient ${@base_contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" + ${PN}-ospfclient ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" RDEPENDS_${PN} += "${PN}-babeld ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd"meta-networking/recipes-support/dnsmasq/dnsmasq.inc +7
-7@@ -26,10 +26,10 @@ PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack" PACKAGECONFIG[lua] = ",,lua" PACKAGECONFIG[resolvconf] = ",,,resolvconf" EXTRA_OEMAKE = "\ - 'COPTS=${@base_contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ + 'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ 'CFLAGS=${CFLAGS}' \ 'LDFLAGS=${LDFLAGS}' \ "@@ -53,7 +53,7 @@ do_install () { install -d ${D}${systemd_unitdir}/system - if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service else install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service@@ -61,11 +61,11 @@ do_install () { install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} - if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/dbus-1/system.d install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ fi - if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/resolvconf/update.d/ install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasqmeta-networking/recipes-support/dovecot/dovecot_2.2.21.bb +2
-2@@ -17,8 +17,8 @@ DEPENDS = "openssl xz zlib bzip2 libcap icu" inherit autotools pkgconfig systemd useradd PACKAGECONFIG ??= " \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ " PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"meta-networking/recipes-support/fping/fping_3.5.bb +1
-1@@ -21,5 +21,5 @@ inherit autotools EXTRA_OECONF = "--enable-ipv4" -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb +1
-1@@ -61,7 +61,7 @@ EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \ --enable-dpd \ --enable-natt=yes \ --sysconfdir=${sysconfdir}/racoon \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}" # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527 CFLAGS += "-fno-strict-aliasing"meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb +1
-1@@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae #| /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 #| collect2: error: ld returned 1 exit status #| make[4]: *** [libsctp.la] Error 1 -PNBLACKLIST[lksctp-tools] ?= "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" +PNBLACKLIST[lksctp-tools] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" S = "${WORKDIR}/${BP}"meta-networking/recipes-support/netcf/netcf_git.bb +1
-1@@ -24,7 +24,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," do_install_append() { - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system if [ -d "${D}${libdir}/systemd/system" ]; then mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/meta-networking/recipes-support/netperf/netperf_2.6.0.bb +2
-2@@ -24,7 +24,7 @@ CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE" # set the "_FILE_OFFSET_BITS" preprocessor symbol to 64 to support files # larger than 2GB -CFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'largefile', \ +CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \ ' -D_FILE_OFFSET_BITS=64', '', d)}" PACKAGECONFIG ??= ""@@ -60,7 +60,7 @@ do_install() { install -m 0644 ${S}/doc/netperf_old.ps ${D}${docdir}/netperf } -RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" INITSCRIPT_NAME="netperf" INITSCRIPT_PARAMS="defaults"meta-networking/recipes-support/nis/ypbind-mt_1.38.bb +1
-1@@ -19,7 +19,7 @@ This is the final IPv4-only version of ypbind-mt. \ HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" DEPENDS = " \ yp-tools \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ " RDEPENDS_${PN} += "yp-tools"meta-networking/recipes-support/nis/ypbind-mt_2.2.bb +1
-1@@ -15,7 +15,7 @@ of known secure NIS server (/etc/yp.conf) Binds to \ the server which answered as first. \ " HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" -DEPENDS = "yp-tools ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +DEPENDS = "yp-tools ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PROVIDES += "ypbind" PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools"meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb +3
-3@@ -3,7 +3,7 @@ HOMEPAGE = "http://openvpn.sourceforge.net" SECTION = "net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" -DEPENDS = "lzo openssl iproute2 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" inherit autotools systemd@@ -22,7 +22,7 @@ CFLAGS += "-fno-inline" # I want openvpn to be able to read password from file (hrw) EXTRA_OECONF += "--enable-password-save --enable-iproute2" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" # Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. EXTRA_OECONF += "IPROUTE=/sbin/ip"@@ -38,7 +38,7 @@ do_install_append() { install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/[email protected] ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/[email protected] ${D}/${systemd_unitdir}/system/[email protected]meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +2
-2@@ -20,11 +20,11 @@ EXTRA_OECONF = " \ --without-lib-prefix \ " -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ " PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni," PACKAGECONFIG[charon] = "--enable-charon,--disable-charon,"meta-networking/recipes-support/stunnel/stunnel_5.28.bb +1
-1@@ -16,5 +16,5 @@ inherit autotools EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
PATCH 7/22 squid: CVE-2016-3947
In reply to Otavio SalvadorFrom: Catalin Enache <[email protected]>
Heap-based buffer overflow in the Icmp6::Recv function in icmp/Icmp6.cc in the pinger in Squid before 3.5.16 and 4.x before 4.0.8 allows remote servers to cause a denial of service (performance degradation or transition failures) or write sensitive information to log files via an ICMPv6 packet.
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3947
---
.../squid/files/CVE-2016-3947.patch | 48 ++++++++++++++++++++++ .../recipes-daemons/squid/squid_3.5.7.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta-networking/recipes-daemons/squid/files/CVE-2016-3947.patch
meta-networking/recipes-daemons/squid/files/CVE-2016-3947.patch new file +48 -0
@@ -0,0 +1,48 @@ +From 0fe108ecb2bbdf684f159950eaa55d22f07c4008 Mon Sep 17 00:00:00 2001 +From: Catalin Enache <[email protected]> +Date: Wed, 20 Apr 2016 15:17:18 +0300 +Subject: [PATCH] pinger: Fix buffer overflow in Icmp6::Recv + +Upstream-Status: Backport +CVE: CVE-2016-3947 + +Author: Yuriy M. Kaminskiy <[email protected]> +Committer: Amos Jeffries <[email protected] +Signed-off-by: Catalin Enache <[email protected]> +--- + src/icmp/Icmp6.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/icmp/Icmp6.cc b/src/icmp/Icmp6.cc +index 794a51a..ee84b80 100644 +--- a/src/icmp/Icmp6.cc ++++ b/src/icmp/Icmp6.cc +@@ -256,7 +256,7 @@ Icmp6::Recv(void) + #define ip6_hops // HOPS!!! (can it be true??) + + ip = (struct ip6_hdr *) pkt; +- pkt += sizeof(ip6_hdr); ++ NP: echo size needs to +sizeof(ip6_hdr); + + debugs(42, DBG_CRITICAL, HERE << "ip6_nxt=" << ip->ip6_nxt << + ", ip6_plen=" << ip->ip6_plen << +@@ -267,7 +267,6 @@ Icmp6::Recv(void) + */ + + icmp6header = (struct icmp6_hdr *) pkt; +- pkt += sizeof(icmp6_hdr); + + if (icmp6header->icmp6_type != ICMP6_ECHO_REPLY) { + +@@ -292,7 +291,7 @@ Icmp6::Recv(void) + return; + } + +- echo = (icmpEchoData *) pkt; ++ echo = (icmpEchoData *) (pkt + sizeof(icmp6_hdr)); + + preply.opcode = echo->opcode; + +-- +2.7.4 +
meta-networking/recipes-daemons/squid/squid_3.5.7.bb +1 -0
@@ -19,6 +19,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://squid-use-serial-tests-config-needed-by-ptest.patch \ file://run-ptest \ file://volatiles.03_squid \ + file://CVE-2016-3947.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \
Signature · 1 line
2.8.2
PATCH 8/22 ltrace: Error Fix for ARM
In reply to Otavio SalvadorFrom: Li xin <[email protected]>
1) The error is as following:
root # ltrace ls
__libc_start_main(0xb6fbc018, 1, 0xbed8fdc4, 0xb6fd0b88PTRACE_SINGLESTEP: Input/output error
2747 couldn't continue when handling __libc_start_main (0xb6fbbde0) at 0xb6fbbde0The master branch fix it.
2) remove unused patch:
--0001-ltrace-fix-gcc-5-logical-not-parentheses.patch
--ltrace-0.7.2-unused-typedef.patch---
...-ltrace-fix-gcc-5-logical-not-parentheses.patch | 38 ----------------- .../ltrace/ltrace-0.7.2-unused-typedef.patch | 49 ---------------------- meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 6 +-- 3 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-ltrace-fix-gcc-5-logical-not-parentheses.patch delete mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patch
meta-oe/recipes-devtools/ltrace/ltrace/0001-ltrace-fix-gcc-5-logical-not-parentheses.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 876fe5680d77800426f8c4c5680a235732d722e6 Mon Sep 17 00:00:00 2001 -From: Kai Kang <[email protected]> -Date: Mon, 24 Aug 2015 17:37:54 +0800 -Subject: [PATCH] ltrace: fix gcc 5 logical not parentheses - -Upstream-Status: Pending - -Build ltrace with gcc 5.2, it fails with: - -error: logical not is only applied to the left hand side of comparison -[-Werror=logical-not-parentheses] - if (!need_data(data, offset, SIZE / 8) < 0) \ - ^ - -Function need_data just return 0 on success and -1 if fail. So it is ok -to just test if (need_data(data, offset, SIZE / 8) < 0). - -Signed-off-by: Kai Kang <[email protected]> ---- - ltrace-elf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ltrace-elf.c b/ltrace-elf.c -index c571d2a..7fe830f 100644 ---- a/ltrace-elf.c -+++ b/ltrace-elf.c -@@ -218,7 +218,7 @@ need_data(Elf_Data *data, GElf_Xword offset, GElf_Xword size) - int \ - NAME(Elf_Data *data, GElf_Xword offset, uint##SIZE##_t *retp) \ - { \ -- if (!need_data(data, offset, SIZE / 8) < 0) \ -+ if (need_data(data, offset, SIZE / 8) < 0) \ - return -1; \ - \ - if (data->d_buf == NULL) /* NODATA section */ { \ --- -1.9.1 -
meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patch deleted +0 -49
49 lines not on this page · raw message
meta-oe/recipes-devtools/ltrace/ltrace_git.bb +2 -4
@@ -11,14 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" PE = "1" PV = "7.3+git${SRCPV}" -SRCREV = "37ecc41b58be3dbdd79592a76e331b5b371e4f81" +SRCREV = "01b10e191e99d8cb147e5a2b7da8196e0ec6fb94" DEPENDS = "elfutils" RDEPENDS_${PN} = "elfutils" -SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=ltrace-0.7 \ - file://ltrace-0.7.2-unused-typedef.patch \ +SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \ file://configure-allow-to-disable-selinux-support.patch \ - file://0001-ltrace-fix-gcc-5-logical-not-parentheses.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.8.2
Re: [meta-oe backport krogoth PATCH 08/22] ltrace: Error Fix for ARM
Quoted 11 lines · Otavio Salvador
From: Li xin <[email protected]>
1) The error is as following:
root # ltrace ls __libc_start_main(0xb6fbc018, 1, 0xbed8fdc4, 0xb6fd0b88PTRACE_SINGLESTEP: Input/output error 2747 couldn't continue when handling __libc_start_main (0xb6fbbde0) at 0xb6fbbde0The master branch fix it.
2) remove unused patch:
--0001-ltrace-fix-gcc-5-logical-not-parentheses.patch --ltrace-0.7.2-unused-typedef.patch
This still has issue reported here:
http://lists.openembedded.org/pipermail/openembedded-devel/2016-April/107207.html
I would prefer not to backport it to kergoth until it's fixed.
Quoted 141 lines
Signed-off-by Li Xin <[email protected]>Signed-off-by Martin Jansa <[email protected]>Signed-off-by Otavio Salvador <[email protected]>---
...-ltrace-fix-gcc-5-logical-not-parentheses.patch | 38 ----------------- .../ltrace/ltrace-0.7.2-unused-typedef.patch | 49 ---------------------- meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 6 +-- 3 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-ltrace-fix-gcc-5-logical-not-parentheses.patch delete mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patchmeta-oe/recipes-devtools/ltrace/ltrace/0001-ltrace-fix-gcc-5-logical-not-parentheses.patch deleted +0
-38@@ -1,38 +0,0 @@ -From 876fe5680d77800426f8c4c5680a235732d722e6 Mon Sep 17 00:00:00 2001 -From: Kai Kang <[email protected]> -Date: Mon, 24 Aug 2015 17:37:54 +0800 -Subject: [PATCH] ltrace: fix gcc 5 logical not parentheses - -Upstream-Status: Pending - -Build ltrace with gcc 5.2, it fails with: - -error: logical not is only applied to the left hand side of comparison -[-Werror=logical-not-parentheses] - if (!need_data(data, offset, SIZE / 8) < 0) \ - ^ - -Function need_data just return 0 on success and -1 if fail. So it is ok -to just test if (need_data(data, offset, SIZE / 8) < 0). - -Signed-off-by: Kai Kang <[email protected]> ---- - ltrace-elf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ltrace-elf.c b/ltrace-elf.c -index c571d2a..7fe830f 100644 ---- a/ltrace-elf.c -+++ b/ltrace-elf.c -@@ -218,7 +218,7 @@ need_data(Elf_Data *data, GElf_Xword offset, GElf_Xword size) - int \ - NAME(Elf_Data *data, GElf_Xword offset, uint##SIZE##_t *retp) \ - { \ -- if (!need_data(data, offset, SIZE / 8) < 0) \ -+ if (need_data(data, offset, SIZE / 8) < 0) \ - return -1; \ - \ - if (data->d_buf == NULL) /* NODATA section */ { \ --- -1.9.1 -meta-oe/recipes-devtools/ltrace/ltrace/ltrace-0.7.2-unused-typedef.patch deleted +0
-49@@ -1,49 +0,0 @@ -diff --git a/value.c b/value.c -index d18db17..b98298e 100644 ---- a/value.c -+++ b/value.c -@@ -1,6 +1,6 @@ - /* - * This file is part of ltrace. -- * Copyright (C) 2011,2012 Petr Machata, Red Hat Inc. -+ * Copyright (C) 2011,2012,2013 Petr Machata, Red Hat Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as -@@ -282,9 +282,9 @@ value_init_deref(struct value *ret_val, struct value *valp) - if (value_extract_word(valp, &l, NULL) < 0) - return -1; - -- /* We need "long" to be long enough to hold platform -+ /* We need "long" to be long enough to hold target - * pointers. */ -- typedef char assert__long_enough_long[-(sizeof(l) < sizeof(void *))]; -+ assert(sizeof(l) >= sizeof(arch_addr_t)); - - value_common_init(ret_val, valp->inferior, valp, - valp->type->u.ptr_info.info, 0); -diff --git a/lens_default.c b/lens_default.c -index ed3d0e1..5d00814 100644 ---- a/lens_default.c -+++ b/lens_default.c -@@ -1,6 +1,6 @@ - /* - * This file is part of ltrace. -- * Copyright (C) 2011,2012 Petr Machata, Red Hat Inc. -+ * Copyright (C) 2011,2012,2013 Petr Machata, Red Hat Inc. - * Copyright (C) 1998,2004,2007,2008,2009 Juan Cespedes - * Copyright (C) 2006 Ian Wienand - * Copyright (C) 2006 Steve Fink -@@ -342,9 +342,9 @@ format_array(FILE *stream, struct value *value, struct value_dict *arguments, - struct expr_node *length, size_t maxlen, int before, - const char *open, const char *close, const char *delim) - { -- /* We need "long" to be long enough to cover the whole address -- * space. */ -- typedef char assert__long_enough_long[-(sizeof(long) < sizeof(void *))]; -+ /* We need "long" to be long enough to cover the whole target -+ * address space. */ -+ assert(sizeof(long) >= sizeof(arch_addr_t)); - long l; - if (expr_eval_word(length, value, arguments, &l) < 0) - return -1;meta-oe/recipes-devtools/ltrace/ltrace_git.bb +2
-4@@ -11,14 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" PE = "1" PV = "7.3+git${SRCPV}" -SRCREV = "37ecc41b58be3dbdd79592a76e331b5b371e4f81" +SRCREV = "01b10e191e99d8cb147e5a2b7da8196e0ec6fb94" DEPENDS = "elfutils" RDEPENDS_${PN} = "elfutils" -SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=ltrace-0.7 \ - file://ltrace-0.7.2-unused-typedef.patch \ +SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \ file://configure-allow-to-disable-selinux-support.patch \ - file://0001-ltrace-fix-gcc-5-logical-not-parentheses.patch \ " S = "${WORKDIR}/git"Signature · 7 lines
2.8.2 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-oe backport krogoth PATCH 08/22] ltrace: Error Fix for ARM
Quoted 9 lines · Martin Jansa
Quoted 8 lines · Otavio Salvador
From: Li xin <[email protected]>
1) The error is as following:
root # ltrace ls __libc_start_main(0xb6fbc018, 1, 0xbed8fdc4, 0xb6fd0b88PTRACE_SINGLESTEP: Input/output error 2747 couldn't continue when handling __libc_start_main (0xb6fbbde0) at 0xb6fbbde0The master branch fix it.
Quoted 8 lines
Quoted 3 lines
2) remove unused patch:
--0001-ltrace-fix-gcc-5-logical-not-parentheses.patch --ltrace-0.7.2-unused-typedef.patchThis still has issue reported here:
http://lists.openembedded.org/pipermail/openembedded-devel/2016-April/107207.htmlI would prefer not to backport it to kergoth until it's fixed.
Sure; makes sense. Do you want me to resend the patches with this one dropped or you drop it when queueing?
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Re: [meta-oe backport krogoth PATCH 08/22] ltrace: Error Fix for ARM
Quoted 14 lines · Otavio Salvador
Quoted 13 lines · Martin Jansa
Quoted 11 lines · Otavio Salvador
From: Li xin <[email protected]>
1) The error is as following:
root # ltrace ls __libc_start_main(0xb6fbc018, 1, 0xbed8fdc4, 0xb6fd0b88PTRACE_SINGLESTEP: Input/output error 2747 couldn't continue when handling __libc_start_main (0xb6fbbde0) at 0xb6fbbde0The master branch fix it.
2) remove unused patch:
--0001-ltrace-fix-gcc-5-logical-not-parentheses.patch --ltrace-0.7.2-unused-typedef.patch
Quoted 7 lines
Quoted 4 lines
This still has issue reported here:
http://lists.openembedded.org/pipermail/openembedded-devel/2016-April/107207.htmlI would prefer not to backport it to kergoth until it's fixed.
Sure; makes sense. Do you want me to resend the patches with this one dropped or you drop it when queueing?
I'll let Armin to consolidate pending changes and send pull-request after he tests them, so the question is for him not me :).
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-oe backport krogoth PATCH 08/22] ltrace: Error Fix for ARM
Quoted 15 lines · Martin Jansa
Quoted 14 lines · Otavio Salvador
Quoted 13 lines · Martin Jansa
Quoted 11 lines · Otavio Salvador
From: Li xin <[email protected]>
1) The error is as following:
root # ltrace ls __libc_start_main(0xb6fbc018, 1, 0xbed8fdc4, 0xb6fd0b88PTRACE_SINGLESTEP: Input/output error 2747 couldn't continue when handling __libc_start_main (0xb6fbbde0) at 0xb6fbbde0The master branch fix it.
2) remove unused patch:
--0001-ltrace-fix-gcc-5-logical-not-parentheses.patch --ltrace-0.7.2-unused-typedef.patch
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
This still has issue reported here:
http://lists.openembedded.org/pipermail/openembedded-devel/2016-April/107207.htmlI would prefer not to backport it to kergoth until it's fixed.
Sure; makes sense. Do you want me to resend the patches with this one dropped or you drop it when queueing?
no need to resend. I will drop it when I pull them in.
- armin
Quoted 6 lines
I'll let Armin to consolidate pending changes and send pull-request after he tests them, so the question is for him not me :).
PATCH 9/22 ltrace: Remove deprecated readdir_r()
In reply to Otavio SalvadorFrom: Khem Raj <[email protected]>
New glibc >= 2.24 will remove it
---
.../0001-replace-readdir_r-with-readdir.patch | 36 ++++++++++++++++++++++ meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 64f98f84fd88797e219f9dde1ca387fee4b509f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 24 Apr 2016 16:58:17 -0700 +Subject: [PATCH] replace readdir_r with readdir + +glibc 2.24 has deprecated readdir_r + +https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html + +Signed-off-by: Khem Raj <[email protected]> +--- +Upstream-Status: Submitted + + sysdeps/linux-gnu/proc.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c +index 953fd86..edb716d 100644 +--- a/sysdeps/linux-gnu/proc.c ++++ b/sysdeps/linux-gnu/proc.c +@@ -242,9 +242,10 @@ process_tasks(pid_t pid, pid_t **ret_tasks, size_t *ret_n) + size_t alloc = 0; + + while (1) { +- struct dirent entry; + struct dirent *result; +- if (readdir_r(d, &entry, &result) != 0) { ++ errno = 0; ++ result = readdir(d); ++ if (errno != 0) { + fail: + free(tasks); + closedir(d); +-- +2.8.0 +
meta-oe/recipes-devtools/ltrace/ltrace_git.bb +1 -0
@@ -17,6 +17,7 @@ DEPENDS = "elfutils" RDEPENDS_${PN} = "elfutils" SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \ file://configure-allow-to-disable-selinux-support.patch \ + file://0001-replace-readdir_r-with-readdir.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.8.2
PATCH 10/22 fbida: use separate builddir
In reply to Otavio SalvadorFrom: Christopher Larson <[email protected]>
Separate builddir from the sourcedir.
---
meta-oe/recipes-graphics/fbida/fbida_2.10.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-graphics/fbida/fbida_2.10.bb +4 -1
@@ -14,7 +14,9 @@ SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz" SRC_URI[md5sum] = "09460b964b58c2e39b665498eca29018" SRC_URI[sha256sum] = "7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6" -EXTRA_OEMAKE = "STRIP=" +B = "${WORKDIR}/build" + +EXTRA_OEMAKE = "STRIP= 'srcdir=${S}' -f ${S}/GNUmakefile" PACKAGECONFIG ??= "gif png curl" PACKAGECONFIG[curl] = ",,curl"
@@ -26,6 +28,7 @@ PACKAGECONFIG[webp] = ",,libwebp" PACKAGECONFIG[lirc] = ",,lirc" do_compile() { + sed -i -e 's# fbgs# \$(srcdir)/fbgs#; s#-Ijpeg#-I\$(srcdir)/jpeg#; s# jpeg/# \$(srcdir)/jpeg/#' ${S}/GNUmakefile sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I${STAGING_INCDIR}:' ${S}/GNUmakefile
Signature · 1 line
2.8.2
PATCH 11/22 sblim-sfcb: add missing dependency on unzip-native
In reply to Otavio SalvadorFrom: Martin Jansa <[email protected]>
* otherwise configure fails with:
| checking whether to build shared libraries... yes | checking whether to build static libraries... no | checking for unzip... no | configure: error: Could not find unzip | NOTE: The following config.log files may provide further information. | NOTE: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/sblim-sfcb/1.4.9-r0/build/config.log | ERROR: configure failed | ERROR: Function failed: do_configure (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/sblim-sfcb/1.4.9-r0/temp/log.do_configure.9838)
NOTE: recipe sblim-sfcb-1.4.9-r0: task do_configure: Failed
ERROR: Task 5 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb, do_configure) failed with exit code '1'
---
meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +1 -1
@@ -9,7 +9,7 @@ HOMEPAGE = "http://www.sblim.org" SECTION = "Applications/System" LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" -DEPENDS = "curl libpam openssl sblim-sfc-common" +DEPENDS = "curl libpam openssl sblim-sfc-common unzip-native" SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ file://sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch \
Signature · 1 line
2.8.2
PATCH 12/22 syslog-ng.inc: fix prerm script & class includes
In reply to Otavio SalvadorFrom: Ioan-Adrian Ratiu <[email protected]>
The order of class includes is very important because it's the order in which classes are evaluated. Both update-rc.d and update-alternatives write to the prerm script, so the class order decides the script code ordering. As they are now, prerm is:
#!/bin/sh
update-alternatives --remove syslog-init /etc/init.d/syslog.syslog-ng
if [ -z "$D" ]; then
/etc/init.d/syslog stop
fi
This causes errors because when syslog-ng is the only alternative it is removed and then the script tries to stop it (No such file or directory) but even if there are other alternatives, the script tries to stop something other than syslog-ng which was removed.
By reversing the include order, prerm gets generated correctly and it tries to stop syslog-ng before removing it:
if [ -z "$D" ]; then
/etc/init.d/syslog stop
fi
update-alternatives --remove syslog-init /etc/init.d/syslog.syslog-ng
---
meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/syslog-ng/syslog-ng.inc +1 -1
@@ -22,7 +22,7 @@ SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \ " -inherit autotools systemd pkgconfig update-rc.d update-alternatives +inherit autotools systemd pkgconfig update-alternatives update-rc.d EXTRA_OECONF = " \ --enable-dynamic-linking \
Signature · 1 line
2.8.2
PATCH 13/22 sox: dep on ffmpeg, not libav
In reply to Otavio SalvadorFrom: Christopher Larson <[email protected]>
The libav recipe no longer exists, in favor of ffmpeg.
---
meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb +1 -1
@@ -4,7 +4,7 @@ and can apply different effects and filters to the audio data." HOMEPAGE = "http://sox.sourceforge.net" SECTION = "audio" -DEPENDS = "libpng libav libsndfile1 libvorbis" +DEPENDS = "libpng ffmpeg libsndfile1 libvorbis" PR = "r2"
Signature · 1 line
2.8.2
PATCH 14/22 meta-xfce: add intltool-native to DEPENDS
In reply to Otavio SalvadorFrom: Andreas Müller <[email protected]>
fix tons of messages as:
| WARNING: foo do_configure: Missing DEPENDS on intltool-native
---
meta-xfce/classes/xfce.bbclass | 2 ++ meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.1.0.bb | 2 +- meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb | 2 +- meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb | 2 +- meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-)
meta-xfce/classes/xfce.bbclass +2 -0
@@ -8,6 +8,8 @@ SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@xfce_verdir("${PV}")}/${BP inherit autotools gettext gtk-icon-cache pkgconfig +DEPENDS += "intltool-native" + FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*" FILES_${PN}-doc += "${datadir}/xfce4/doc"
meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.1.0.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-app -DEPENDS = "gtk+ cairo libwnck xfce4-dev-tools-native exo-native" +DEPENDS += "gtk+ cairo libwnck xfce4-dev-tools-native exo-native" SRC_URI[md5sum] = "7da465a4798629ebd8650fef62770ab7" SRC_URI[sha256sum] = "2e1eb161f966cbfbd68bd029fb59115bc5ab0c0704cb500d20e7d73967e59ecb"
meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb +1 -1
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce-app gtk-doc mime -DEPENDS = " \ +DEPENDS += " \ glib-2.0 \ dbus-glib \ gtk+3 \
meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb +1 -1
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin -DEPENDS = "gtk+ libxfce4ui xfce4-panel xfconf libunique" +DEPENDS += "gtk+ libxfce4ui xfce4-panel xfconf libunique" SRC_URI += " \ file://0001-main-status-icon.c-remove-deprecated-g_type_init.patch \
meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce -DEPENDS = "gtk+ glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \ +DEPENDS += "gtk+ glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \ libxrandr virtual/libx11 libxext xfce4-panel upower" SRC_URI[md5sum] = "e7d00548e58bf19229e727818184c1e0"
Signature · 1 line
2.8.2
PATCH 15/22 xfce-polkit: fix warning not able to copy license
In reply to Otavio SalvadorFrom: Andreas Müller <[email protected]>
COPYING is a link on LICENSE. It seems that cause the warning so use LICENSE.
Fixes:
| WARNING: xfce-polkit-0.2-r0 do_populate_lic: Could not copy license file /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/xfce-polkit/0.2-r0/git/COPYING to /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/xfce-polkit/0.2-r0/license-destdir/xfce-polkit/COPYING: [Errno 2] No such file or directory: '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/xfce-polkit/0.2-r0/license-destdir/xfce-polkit/COPYING'
---
meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb +1 -1
@@ -1,6 +1,6 @@ SUMMARY = "A simple PolicyKit authentication agent for XFCE" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=758b03f872a88c99fc36d50c5932091c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=758b03f872a88c99fc36d50c5932091c" DEPENDS = "libxfce4ui polkit"
Signature · 1 line
2.8.2
PATCH 16/22 fluidsynth: set correct portaudio packageconfig dependency
In reply to Otavio SalvadorFrom: Andreas Müller <[email protected]>
---
meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.6.bb +1 -1
@@ -16,7 +16,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulsea PACKAGECONFIG[sndfile] = "--enable-libsndfile-support,--disable-libsndfile-support,libsndfile1" PACKAGECONFIG[jack] = "--enable-jack-support,--disable-jack-support,jack" PACKAGECONFIG[pulseaudio] = "--enable-pulse-support,--disable-pulse-support,pulseaudio" -PACKAGECONFIG[portaudio] = "--enable-portaudio-support,--disable-portaudio-support,portaudio" +PACKAGECONFIG[portaudio] = "--enable-portaudio-support,--disable-portaudio-support,portaudio-v19" do_configure_prepend () { rm -f ${S}/m4/*
Signature · 1 line
2.8.2
PATCH 17/22 glmark2: wl_surface should be destoryed after destroying wl_window
In reply to Otavio SalvadorFrom: Neena Busireddy <[email protected]>
If wl_surface is destroyed while work thread is still running, segmentation fault occurs.
---
...ace-should-be-destoryed-after-the-wl_wind.patch | 34 ++++++++++++++++++++++ meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch
meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 9c74ec83e2929b1d5ab65d5137b6ba42edeb332d Mon Sep 17 00:00:00 2001 +From: Yong Gan <[email protected]> +Date: Tue, 27 Oct 2015 18:15:20 +0800 +Subject: [PATCH] Fix: wl_surface should be destoryed after the wl_window + destroyed. + +Upstream-Status: Submitted [https://github.com/glmark2/glmark2/issues/12] + +Signed-off-by: Yong Gan <[email protected]> + +--- + src/native-state-wayland.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/native-state-wayland.cpp b/src/native-state-wayland.cpp +index 41fc743..cdcdf34 100644 +--- a/src/native-state-wayland.cpp ++++ b/src/native-state-wayland.cpp +@@ -56,10 +56,10 @@ NativeStateWayland::~NativeStateWayland() + wl_shell_surface_destroy(window_->shell_surface); + if (window_->opaque_reqion) + wl_region_destroy(window_->opaque_reqion); +- if (window_->surface) +- wl_surface_destroy(window_->surface); + if (window_->native) + wl_egl_window_destroy(window_->native); ++ if (window_->surface) ++ wl_surface_destroy(window_->surface); + delete window_; + } + +-- +1.9.1 +
meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +2 -1
@@ -13,7 +13,8 @@ DEPENDS = "libpng12 jpeg" PV = "2014.03+${SRCPV}" SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ - file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch" + file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ + file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch" SRCREV = "fa71af2dfab711fac87b9504b6fc9862f44bf72a" S = "${WORKDIR}/git"
Signature · 1 line
2.8.2
PATCH 18/22 packagegroup-tools-bluetooth.bb: Selects the tools appropriate for the version of bluez being used.
In reply to Otavio SalvadorFrom: Ann Thornton <[email protected]>
---
.../packagegroups/packagegroup-tools-bluetooth.bb | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb
meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb new file +40 -0
@@ -0,0 +1,40 @@ +# Copyright (C) 2014-2015 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SUMMARY = "Set of Bluetooh related tools for inclusion on images" +DESCRIPTION = "Add bluetooth tools based on the version of BlueZ in use.\ +The tools that have been tested and work the best are pulled in \ +automatically. The same packagegroup can be used in a recipe without \ +the need to know which version of BlueZ is in use. \ +Supports BlueZ4 and BlueZ5." + +inherit packagegroup + +BLUEZ4_INSTALL = " \ + obexftp \ +" + +BLUEZ5_INSTALL = " \ + bluez5-noinst-tools \ + bluez5-obex \ + bluez5-testtools \ + libasound-module-bluez \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', "pulseaudio-module-bluetooth-discover \ + pulseaudio-module-bluetooth-policy \ + pulseaudio-module-bluez5-discover \ + pulseaudio-module-bluez5-device \ + pulseaudio-module-switch-on-connect \ + pulseaudio-module-loopback", \ + '', d)} \ +" + +# Install either bluez4 or bluez5 if they are in distro. +# Otherwise install nothing. +RDEPENDS_${PN} = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', '${BLUEZ5_INSTALL}', "", d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluez4', '${BLUEZ4_INSTALL}', "", d)} \ +"
Signature · 1 line
2.8.2
PATCH 19/22 opencv: Fix metapkg dependencies for opencv-java and opencv-locales
In reply to Otavio SalvadorThe opencv-java is not always generated so we ought to include it, only if it is available. The opencv-locales is not available and ought to be skipped.
---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta-oe/recipes-support/opencv/opencv_3.1.bb +3 -2
@@ -79,7 +79,8 @@ export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" TARGET_CC_ARCH += "-I${S}/include " -PACKAGES += "${PN}-java-dbg ${PN}-java ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv" +PACKAGES += "${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv \ + ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)}" python populate_packages_prepend () { cv_libdir = d.expand('${libdir}')
@@ -104,7 +105,7 @@ python populate_packages_prepend () { blacklist = [ metapkg ] metapkg_rdepends = [ ] for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') : + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale'): metapkg_rdepends.append(pkg) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
Signature · 1 line
2.8.2
PATCH 20/22 python-pyparsing: modify build to correctly use setuptools rather than distutils
In reply to Otavio SalvadorFrom: Derek Straka <[email protected]>
---
meta-python/recipes-devtools/python/python-pyparsing_2.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python-pyparsing_2.1.1.bb +1 -1
@@ -7,4 +7,4 @@ SRC_URI[md5sum] = "2a1d3a63ddc2ec9a3da961d1b7f258b2" SRC_URI[sha256sum] = "4bd04badfda39b1e2fd0d77cb78b488c881d88c31734791a0ae902979ae10575" PYPI_PACKAGE_EXT = "zip" -inherit pypi distutils +inherit pypi setuptools
Signature · 1 line
2.8.2
PATCH 21/22 rrdtool: fix do_configure failure on some hosts
In reply to Otavio SalvadorFrom: "[email protected]" <[email protected]>
On some hosts, when building rrdtool, we would meet do_configure error like below.
| *** Module name IN: /usr/lib64/perl/5.22.0/POSIX.pm | *** p1: /usr/lib64/ p3: perl/5.22.0/ p5: POSIX.pm | *** Module name OUT: /path/to/builddir/tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.22.1/POSIX.pm | POSIX object version 1.53_01 does not match $POSIX::VERSION 1.53 at /usr/lib64/perl/5.22.0/XSLoader.pm line 108.
Set PERLHOSTLIB to "" to fix the above error.
---
meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb +2 -0
@@ -57,6 +57,8 @@ export STAGING_INCDIR # emulate cpan_do_configure EXTRA_OEMAKE = ' PERL5LIB="${PERL_ARCHLIB}" ' +# Avoid do_configure error on some hosts +export PERLHOSTLIB = "" do_configure() { #fix the pkglib problem with newer automake
Signature · 1 line
2.8.2
PATCH 22/22 toybox: Remove out-of-date patch
In reply to Otavio SalvadorFrom: Paul Barker <[email protected]>
---
.../toybox/0001-Match-paths-with-busybox.patch | 388 --------------------- 1 file changed, 388 deletions(-) delete mode 100644 meta-oe/recipes-core/toybox/toybox/0001-Match-paths-with-busybox.patch
meta-oe/recipes-core/toybox/toybox/0001-Match-paths-with-busybox.patch deleted +0 -388
@@ -1,388 +0,0 @@ -From 9b37b45067677563dc8daa73d73a015c20ad6222 Mon Sep 17 00:00:00 2001 -From: Paul Barker <[email protected]> -Date: Mon, 18 Aug 2014 12:18:16 +0000 -Subject: [PATCH] Match paths with busybox - -To ensure that toybox can be installed alongside busybox without confusing -update-alternatives, the paths of the links installed by toybox should match -those installed by busybox. This is accomplished by changing the flags of a few -tools within toybox. - -v3: - - Forward ported from v0.5.0 to v0.5.2 - -v2: - - Forward ported from v0.4.9 to v0.5.0 - - Move new 'mount' command - -Signed-off-by: Paul Barker <[email protected]> - -Upstream-status: Inappropriate - (specific to update-alternatives use in OpenEmbedded) - -Signed-off-by: Amarnath Valluri <[email protected]> ---- - toys/lsb/mount.c | 2 +- - toys/lsb/pidof.c | 2 +- - toys/other/chvt.c | 2 +- - toys/other/ifconfig.c | 2 +- - toys/other/insmod.c | 2 +- - toys/other/lsmod.c | 2 +- - toys/other/netcat.c | 2 +- - toys/other/pivot_root.c | 2 +- - toys/other/readlink.c | 2 +- - toys/other/reboot.c | 6 +++--- - toys/other/rfkill.c | 2 +- - toys/other/rmmod.c | 2 +- - toys/other/swapoff.c | 2 +- - toys/other/swapon.c | 2 +- - toys/other/sysctl.c | 2 +- - toys/posix/cut.c | 2 +- - toys/posix/df.c | 2 +- - toys/posix/head.c | 2 +- - toys/posix/id.c | 6 +++--- - toys/posix/mkfifo.c | 2 +- - toys/posix/renice.c | 2 +- - toys/posix/tail.c | 2 +- - toys/posix/tee.c | 2 +- - toys/posix/uniq.c | 2 +- - toys/posix/who.c | 2 +- - 25 files changed, 29 insertions(+), 29 deletions(-) - -diff --git a/toys/lsb/mount.c b/toys/lsb/mount.c -index c334681..b076ca1 100644 ---- a/toys/lsb/mount.c -+++ b/toys/lsb/mount.c -@@ -6,7 +6,7 @@ - * Note: -hV is bad spec, haven't implemented -FsLU yet - * no mtab (/proc/mounts does it) so -n is NOP. - --USE_MOUNT(NEWTOY(mount, "?O:afnrvwt:o*[-rw]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT)) -+USE_MOUNT(NEWTOY(mount, "?O:afnrvwt:o*[-rw]", TOYFLAG_BIN|TOYFLAG_STAYROOT)) - //USE_NFSMOUNT(NEWTOY(nfsmount, "?<2>2", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT)) - - config MOUNT -diff --git a/toys/lsb/pidof.c b/toys/lsb/pidof.c -index 51b742f..a8fc8ef 100644 ---- a/toys/lsb/pidof.c -+++ b/toys/lsb/pidof.c -@@ -5,7 +5,7 @@ - * - * http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/pidof.html - --USE_PIDOF(NEWTOY(pidof, "<1so:", TOYFLAG_USR|TOYFLAG_BIN)) -+USE_PIDOF(NEWTOY(pidof, "<1so:", TOYFLAG_BIN)) - - config PIDOF - bool "pidof" -diff --git a/toys/other/chvt.c b/toys/other/chvt.c -index 6544265..a93327f 100644 ---- a/toys/other/chvt.c -+++ b/toys/other/chvt.c -@@ -2,7 +2,7 @@ - * - * Copyright (C) 2008 David Anders <[email protected]> - --USE_CHVT(NEWTOY(chvt, "<1", TOYFLAG_USR|TOYFLAG_SBIN)) -+USE_CHVT(NEWTOY(chvt, "<1", TOYFLAG_USR|TOYFLAG_BIN)) - - config CHVT - bool "chvt" -diff --git a/toys/other/ifconfig.c b/toys/other/ifconfig.c -index 8db3ff0..445799d 100644 ---- a/toys/other/ifconfig.c -+++ b/toys/other/ifconfig.c -@@ -6,7 +6,7 @@ - * - * Not in SUSv4. - --USE_IFCONFIG(NEWTOY(ifconfig, "^?a", TOYFLAG_BIN)) -+USE_IFCONFIG(NEWTOY(ifconfig, "^?a", TOYFLAG_SBIN)) - - config IFCONFIG - bool "ifconfig" -diff --git a/toys/other/insmod.c b/toys/other/insmod.c -index 81721a3..cb222a5 100644 ---- a/toys/other/insmod.c -+++ b/toys/other/insmod.c -@@ -2,7 +2,7 @@ - * - * Copyright 2012 Elie De Brauwer <[email protected]> - --USE_INSMOD(NEWTOY(insmod, "<1", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) -+USE_INSMOD(NEWTOY(insmod, "<1", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) - - config INSMOD - bool "insmod" -diff --git a/toys/other/lsmod.c b/toys/other/lsmod.c -index b8f5d82..4d16048 100644 ---- a/toys/other/lsmod.c -+++ b/toys/other/lsmod.c -@@ -2,7 +2,7 @@ - * - * Copyright 2012 Elie De Brauwer <[email protected]> - --USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_BIN)) -+USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_SBIN)) - - config LSMOD - bool "lsmod" -diff --git a/toys/other/netcat.c b/toys/other/netcat.c -index d27aa88..0fd26f7 100644 ---- a/toys/other/netcat.c -+++ b/toys/other/netcat.c -@@ -4,7 +4,7 @@ - * - * TODO: udp, ipv6, genericize for telnet/microcom/tail-f - --USE_NETCAT(OLDTOY(nc, netcat, TOYFLAG_BIN)) -+USE_NETCAT(OLDTOY(nc, netcat, TOYFLAG_USR|TOYFLAG_BIN)) - USE_NETCAT(NEWTOY(netcat, USE_NETCAT_LISTEN("^tlL")"w#p#s:q#f:", TOYFLAG_BIN)) - - config NETCAT -diff --git a/toys/other/pivot_root.c b/toys/other/pivot_root.c -index 9a1f56c..7748032 100644 ---- a/toys/other/pivot_root.c -+++ b/toys/other/pivot_root.c -@@ -2,7 +2,7 @@ - * - * Copyright 2012 Rob Landley <[email protected]> - --USE_PIVOT_ROOT(NEWTOY(pivot_root, "<2>2", TOYFLAG_USR|TOYFLAG_BIN)) -+USE_PIVOT_ROOT(NEWTOY(pivot_root, "<2>2", TOYFLAG_SBIN)) - - config PIVOT_ROOT - bool "pivot_root" -diff --git a/toys/other/readlink.c b/toys/other/readlink.c -index 1c33362..fecd1ef 100644 ---- a/toys/other/readlink.c -+++ b/toys/other/readlink.c -@@ -2,7 +2,7 @@ - * - * Copyright 2007 Rob Landley <[email protected]> - --USE_READLINK(NEWTOY(readlink, "<1>1fenq[-fe]", TOYFLAG_BIN)) -+USE_READLINK(NEWTOY(readlink, "<1>1fenq[-fe]", TOYFLAG_USR|TOYFLAG_BIN)) - - config READLINK - bool "readlink" -diff --git a/toys/other/reboot.c b/toys/other/reboot.c -index 8baa4d8..a135888 100644 ---- a/toys/other/reboot.c -+++ b/toys/other/reboot.c -@@ -2,9 +2,9 @@ - * - * Copyright 2013 Elie De Brauwer <[email protected]> - --USE_REBOOT(NEWTOY(reboot, "n", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) --USE_REBOOT(OLDTOY(halt, reboot, TOYFLAG_BIN|TOYFLAG_NEEDROOT)) --USE_REBOOT(OLDTOY(poweroff, reboot, TOYFLAG_BIN|TOYFLAG_NEEDROOT)) -+USE_REBOOT(NEWTOY(reboot, "n", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) -+USE_REBOOT(OLDTOY(halt, reboot, TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) -+USE_REBOOT(OLDTOY(poweroff, reboot, TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) - - config REBOOT - bool "reboot" -diff --git a/toys/other/rfkill.c b/toys/other/rfkill.c -index af3efe1..7527ec7 100644 ---- a/toys/other/rfkill.c -+++ b/toys/other/rfkill.c -@@ -5,7 +5,7 @@ - * - * No Standard - --USE_RFKILL(NEWTOY(rfkill, "<1>2", TOYFLAG_SBIN)) -+USE_RFKILL(NEWTOY(rfkill, "<1>2", TOYFLAG_USR|TOYFLAG_SBIN)) - - config RFKILL - bool "rfkill" -diff --git a/toys/other/rmmod.c b/toys/other/rmmod.c -index b789acc..10c134c 100644 ---- a/toys/other/rmmod.c -+++ b/toys/other/rmmod.c -@@ -2,7 +2,7 @@ - * - * Copyright 2012 Elie De Brauwer <[email protected]> - --USE_RMMOD(NEWTOY(rmmod, "<1wf", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) -+USE_RMMOD(NEWTOY(rmmod, "<1wf", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) - - config RMMOD - bool "rmmod" -diff --git a/toys/other/swapoff.c b/toys/other/swapoff.c -index b89e915..fb17130 100644 ---- a/toys/other/swapoff.c -+++ b/toys/other/swapoff.c -@@ -2,7 +2,7 @@ - * - * Copyright 2012 Elie De Brauwer <[email protected]> - --USE_SWAPOFF(NEWTOY(swapoff, "<1>1", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) -+USE_SWAPOFF(NEWTOY(swapoff, "<1>1", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) - - config SWAPOFF - bool "swapoff" -diff --git a/toys/other/swapon.c b/toys/other/swapon.c -index 49f1249..838d382 100644 ---- a/toys/other/swapon.c -+++ b/toys/other/swapon.c -@@ -2,7 +2,7 @@ - * - * Copyright 2012 Elie De Brauwer <[email protected]> - --USE_SWAPON(NEWTOY(swapon, "<1>1p#<0>32767", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) -+USE_SWAPON(NEWTOY(swapon, "<1>1p#<0>32767", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) - - config SWAPON - bool "swapon" -diff --git a/toys/other/sysctl.c b/toys/other/sysctl.c -index 8e57ca1..0c6c640 100644 ---- a/toys/other/sysctl.c -+++ b/toys/other/sysctl.c -@@ -5,7 +5,7 @@ - * - * No Standard - --USE_SYSCTL(NEWTOY(sysctl, "^neNqwpaA[!ap][!aq][!aw][+aA]", TOYFLAG_USR|TOYFLAG_BIN)) -+USE_SYSCTL(NEWTOY(sysctl, "^neNqwpaA[!ap][!aq][!aw][+aA]", TOYFLAG_SBIN)) - - config SYSCTL - bool "sysctl" -diff --git a/toys/posix/cut.c b/toys/posix/cut.c -index 7f10c5e..1ab3ce8 100644 ---- a/toys/posix/cut.c -+++ b/toys/posix/cut.c -@@ -5,7 +5,7 @@ - * - * http://pubs.opengroup.org/onlinepubs/9699919799/utilities/cut.html - --USE_CUT(NEWTOY(cut, "b:|c:|f:|d:sn[!cbf]", TOYFLAG_BIN)) -+USE_CUT(NEWTOY(cut, "b:|c:|f:|d:sn[!cbf]", TOYFLAG_USR|TOYFLAG_BIN)) - - config CUT - bool "cut" -diff --git a/toys/posix/df.c b/toys/posix/df.c -index 141e8e5..5d37b45 100644 ---- a/toys/posix/df.c -+++ b/toys/posix/df.c -@@ -4,7 +4,7 @@ - * - * See http://opengroup.org/onlinepubs/9699919799/utilities/df.html - --USE_DF(NEWTOY(df, "Pkt*a[-Pk]", TOYFLAG_USR|TOYFLAG_SBIN)) -+USE_DF(NEWTOY(df, "Pkt*a[-Pk]", TOYFLAG_BIN)) - - config DF - bool "df" -diff --git a/toys/posix/head.c b/toys/posix/head.c -index e8517d4..3ac4373 100644 ---- a/toys/posix/head.c -+++ b/toys/posix/head.c -@@ -4,7 +4,7 @@ - * - * See http://opengroup.org/onlinepubs/9699919799/utilities/head.html - --USE_HEAD(NEWTOY(head, "n#<0=10", TOYFLAG_BIN)) -+USE_HEAD(NEWTOY(head, "n#<0=10", TOYFLAG_USR|TOYFLAG_BIN)) - - config HEAD - bool "head" -diff --git a/toys/posix/id.c b/toys/posix/id.c -index 353aa04..7ab489e 100644 ---- a/toys/posix/id.c -+++ b/toys/posix/id.c -@@ -6,10 +6,10 @@ - * - * See http://opengroup.org/onlinepubs/9699919799/utilities/id.html - --USE_ID(NEWTOY(id, ">1"USE_ID_SELINUX("Z")"nGgru[!"USE_ID_SELINUX("Z")"Ggu]", TOYFLAG_BIN)) -+USE_ID(NEWTOY(id, ">1"USE_ID_SELINUX("Z")"nGgru[!"USE_ID_SELINUX("Z")"Ggu]", TOYFLAG_USR|TOYFLAG_BIN)) - USE_GROUPS(NEWTOY(groups, NULL, TOYFLAG_USR|TOYFLAG_BIN)) --USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_BIN)) --USE_WHOAMI(OLDTOY(whoami, logname, TOYFLAG_BIN)) -+USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_USR|TOYFLAG_BIN)) -+USE_WHOAMI(OLDTOY(whoami, logname, TOYFLAG_USR|TOYFLAG_BIN)) - - config ID - bool "id" -diff --git a/toys/posix/mkfifo.c b/toys/posix/mkfifo.c -index 15fab70..4e0fca3 100644 ---- a/toys/posix/mkfifo.c -+++ b/toys/posix/mkfifo.c -@@ -4,7 +4,7 @@ - * - * See http://opengroup.org/onlinepubs/9699919799/utilities/mkfifo.html - --USE_MKFIFO(NEWTOY(mkfifo, "<1m:", TOYFLAG_BIN)) -+USE_MKFIFO(NEWTOY(mkfifo, "<1m:", TOYFLAG_USR|TOYFLAG_BIN)) - - config MKFIFO - bool "mkfifo" -diff --git a/toys/posix/renice.c b/toys/posix/renice.c -index 8c20644..489eb13 100644 ---- a/toys/posix/renice.c -+++ b/toys/posix/renice.c -@@ -4,7 +4,7 @@ - * - * See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/renice.html - --USE_RENICE(NEWTOY(renice, "<1gpun#|", TOYFLAG_BIN)) -+USE_RENICE(NEWTOY(renice, "<1gpun#|", TOYFLAG_USR|TOYFLAG_BIN)) - - config RENICE - bool "renice" -diff --git a/toys/posix/tail.c b/toys/posix/tail.c -index e92c044..ba1d311 100644 ---- a/toys/posix/tail.c -+++ b/toys/posix/tail.c -@@ -4,7 +4,7 @@ - * - * See http://opengroup.org/onlinepubs/9699919799/utilities/tail.html - --USE_TAIL(NEWTOY(tail, "fc-n-[-cn]", TOYFLAG_BIN)) -+USE_TAIL(NEWTOY(tail, "fc-n-[-cn]", TOYFLAG_USR|TOYFLAG_BIN)) - - config TAIL - bool "tail" -diff --git a/toys/posix/tee.c b/toys/posix/tee.c -index 0388510..5574088 100644 ---- a/toys/posix/tee.c -+++ b/toys/posix/tee.c -@@ -4,7 +4,7 @@ - * - * See http://opengroup.org/onlinepubs/9699919799/utilities/tee.html - --USE_TEE(NEWTOY(tee, "ia", TOYFLAG_BIN)) -+USE_TEE(NEWTOY(tee, "ia", TOYFLAG_USR|TOYFLAG_BIN)) - - config TEE - bool "tee" -diff --git a/toys/posix/uniq.c b/toys/posix/uniq.c -index 3cfdb94..c127cfe 100644 ---- a/toys/posix/uniq.c -+++ b/toys/posix/uniq.c -@@ -4,7 +4,7 @@ - * - * See http://opengroup.org/onlinepubs/9699919799/utilities/uniq.html - --USE_UNIQ(NEWTOY(uniq, "f#s#w#zicdu", TOYFLAG_BIN)) -+USE_UNIQ(NEWTOY(uniq, "f#s#w#zicdu", TOYFLAG_USR|TOYFLAG_BIN)) - - config UNIQ - bool "uniq" -diff --git a/toys/posix/who.c b/toys/posix/who.c -index 876a562..414cdfc 100644 ---- a/toys/posix/who.c -+++ b/toys/posix/who.c -@@ -9,7 +9,7 @@ - * Posix says to support many options (-abdHlmpqrstTu) but this - * isn't aimed at minicomputers with modem pools. - --USE_WHO(NEWTOY(who, "a", TOYFLAG_BIN)) -+USE_WHO(NEWTOY(who, "a", TOYFLAG_USR|TOYFLAG_BIN)) - - config WHO - bool "who" --- -1.8.1.2 -
Signature · 1 line
2.8.2