control ipv6 support based on DISTRO_FEATURES
cover control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang <[email protected]>
There is ipv6 configure option for these packages, and we need them to be controled by DISTRO_FEATURES.
Tested with and without ipv6 in DISTRO_FEATURES on qemux86-64 and qemuarm.
---
The following changes since commit dc48e768f527cbed0cc3899f6a2ebb396cd9ada8:
meta-oe: remove trailing spaces (2016-08-22 15:56:29 +0200)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib.git jhuang0/r_ipv6_160824-0
http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/r_ipv6_160824-0
Jackie Huang (16):
chrony: control ipv6 support based on DISTRO_FEATURES
cyrus-sasl: control ipv6 support based on DISTRO_FEATURES
daq: control ipv6 support based on DISTRO_FEATURES
mtr: control ipv6 support based on DISTRO_FEATURES
ntp: control ipv6 support based on DISTRO_FEATURES
squid: control ipv6 support based on DISTRO_FEATURES
stunnel: control ipv6 support based on DISTRO_FEATURES
tftp-hpa: control ipv6 support based on DISTRO_FEATURES
tnftp: control ipv6 support based on DISTRO_FEATURES
wolfssl: control ipv6 support based on DISTRO_FEATURES
znc: control ipv6 support based on DISTRO_FEATURES
iperf: control ipv6 support based on DISTRO_FEATURES
php: control ipv6 support based on DISTRO_FEATURES
cherokee: control ipv6 support based on DISTRO_FEATURES
xfce4-mailwatch-plugin: control ipv6 support based on DISTRO_FEATURES
inetutils: fixes for ipv6 feature
.../recipes-connectivity/daq/daq_2.0.6.bb | 3 ++ .../inetutils/inetutils/fix-disable-ipv6.patch | 43 +++++++++++++++++----- .../inetutils/inetutils_1.9.4.bb | 10 ++--- .../recipes-connectivity/wolfssl/wolfssl_3.9.0.bb | 2 + .../cyrus-sasl/cyrus-sasl_2.1.26.bb | 2 + .../recipes-daemons/squid/squid_3.5.20.bb | 2 + .../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 3 ++ meta-networking/recipes-irc/znc/znc_git.bb | 3 ++ .../recipes-support/chrony/chrony_2.4.bb | 5 ++- meta-networking/recipes-support/mtr/mtr_0.86.bb | 2 + meta-networking/recipes-support/ntp/ntp_4.2.8p8.bb | 5 ++- .../recipes-support/stunnel/stunnel_5.28.bb | 5 ++- .../recipes-support/tnftp/tnftp_20151004.bb | 5 ++- meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 3 ++ meta-oe/recipes-devtools/php/php.inc | 5 ++- .../recipes-httpd/cherokee/cherokee_1.2.98.bb | 3 +- .../mailwatch/xfce4-mailwatch-plugin_1.2.0.bb | 3 ++ 17 files changed, 83 insertions(+), 21 deletions(-)
Signature · 1 line
2.8.3
PATCH 1/16 chrony: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-support/chrony/chrony_2.4.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-networking/recipes-support/chrony/chrony_2.4.bb +4 -1
@@ -58,12 +58,15 @@ inherit update-rc.d systemd # chrony.conf and init script. # - 'scfilter' enables support for system call filtering, but requires the # kernel to have CONFIG_SECCOMP enabled. -PACKAGECONFIG ??= "editline scfilter" +PACKAGECONFIG ??= "editline scfilter \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[readline] = "--without-editline,--without-readline,readline" PACKAGECONFIG[editline] = ",--without-editline,libedit" PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss" PACKAGECONFIG[privdrop] = ",--disable-privdrop,libcap" PACKAGECONFIG[scfilter] = "--enable-scfilter,--without-seccomp" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # --disable-static isn't supported by chrony's configure script. DISABLE_STATIC = ""
Signature · 1 line
2.8.3
PATCH 2/16 cyrus-sasl: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +2 -0
@@ -26,6 +26,7 @@ EXTRA_OECONF += "--with-dblib=berkeley \ PACKAGECONFIG ??= "ntlm \ ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ " PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
@@ -33,6 +34,7 @@ PACKAGECONFIG[opie] = "--with-opie,--without-opie,opie," PACKAGECONFIG[des] = "--with-des,--without-des,," PACKAGECONFIG[ldap] = "--with-ldap=${STAGING_LIBDIR} --enable-ldapdb,--without-ldap --disable-ldapdb,openldap," PACKAGECONFIG[ntlm] = "--with-ntlm,--without-ntlm,," +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," CFLAGS += "-fPIC"
Signature · 1 line
2.8.3
PATCH 3/16 daq: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-connectivity/daq/daq_2.0.6.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +3 -0
@@ -20,6 +20,9 @@ SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \ --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + SRC_URI[md5sum] = "2cd6da422a72c129c685fc4bb848c24c" SRC_URI[sha256sum] = "b40e1d1273e08aaeaa86e69d4f28d535b7e53bdb3898adf539266b63137be7cb"
Signature · 1 line
2.8.3
PATCH 4/16 mtr: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-support/mtr/mtr_0.86.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-networking/recipes-support/mtr/mtr_0.86.bb +2 -0
@@ -17,3 +17,5 @@ inherit autotools EXTRA_OECONF = "--without-gtk" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
Signature · 1 line
2.8.3
PATCH 5/16 ntp: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-support/ntp/ntp_4.2.8p8.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-networking/recipes-support/ntp/ntp_4.2.8p8.bb +4 -1
@@ -46,7 +46,9 @@ USERADD_PARAM_${PN} = "--system --home-dir ${NTP_USER_HOME} \ --shell /bin/false --user-group ntp" # NB: debug is default-enabled by NTP; keep it default-enabled here. -PACKAGECONFIG ??= "cap debug refclocks" +PACKAGECONFIG ??= "cap debug refclocks \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[openssl] = "--with-openssl-libdir=${STAGING_LIBDIR} \ --with-openssl-incdir=${STAGING_INCDIR} \ --with-crypto, \
@@ -57,6 +59,7 @@ PACKAGECONFIG[readline] = "--with-lineeditlibs,--without-lineeditlibs,readline" PACKAGECONFIG[refclocks] = "--enable-all-clocks,--disable-all-clocks,pps-tools" PACKAGECONFIG[debug] = "--enable-debugging,--disable-debugging" PACKAGECONFIG[mdns] = "ac_cv_header_dns_sd_h=yes,ac_cv_header_dns_sd_h=no,mdns" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," do_install_append() { install -d ${D}${sysconfdir}/init.d
Signature · 1 line
2.8.3
PATCH 6/16 squid: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-daemons/squid/squid_3.5.20.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-networking/recipes-daemons/squid/squid_3.5.20.bb +2 -0
@@ -37,9 +37,11 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --she PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ " PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," BASIC_AUTH = "DB SASL LDAP NIS" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
Signature · 1 line
2.8.3
PATCH 7/16 stunnel: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-support/stunnel/stunnel_5.28.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-networking/recipes-support/stunnel/stunnel_5.28.bb +4 -1
@@ -16,5 +16,8 @@ inherit autotools EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
Signature · 1 line
2.8.3
PATCH 8/16 tftp-hpa: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +3 -0
@@ -37,6 +37,9 @@ export AR = "${HOST_PREFIX}ar cq" EXTRA_OECONF += "--disable-option-checking" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + # configure.in has errors do_configure() { oe_runconf
Signature · 1 line
2.8.3
PATCH 9/16 tnftp: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-support/tnftp/tnftp_20151004.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-networking/recipes-support/tnftp/tnftp_20151004.bb +4 -1
@@ -32,5 +32,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e" SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5" SRC_URI[sha256sum] = "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0" -PACKAGECONFIG ?= "openssl" +PACKAGECONFIG ?= "openssl \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[openssl] = "--enable-ssl, --disable-ssl --with-ssl=no, openssl" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
Signature · 1 line
2.8.3
PATCH 10/16 wolfssl: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb +2 -0
@@ -19,3 +19,5 @@ SRC_URI[sha256sum] = "98f50244f7b43f8683bd0cf5c599849d330e75e6cf077e96f14e83bda8 inherit autotools +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
Signature · 1 line
2.8.3
PATCH 11/16 znc: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-networking/recipes-irc/znc/znc_git.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-networking/recipes-irc/znc/znc_git.bb +3 -0
@@ -21,6 +21,9 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + # ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail do_configure_prepend() { automake --add-missing || true
Signature · 1 line
2.8.3
PATCH 12/16 iperf: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb +3 -0
@@ -18,3 +18,6 @@ S = "${WORKDIR}/${BP}" inherit autotools pkgconfig EXTRA_OECONF = "--exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
Signature · 1 line
2.8.3
PATCH 13/16 php: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-oe/recipes-devtools/php/php.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-devtools/php/php.inc +4 -1
@@ -70,7 +70,9 @@ EXTRA_OECONF_class-native = " \ " PACKAGECONFIG ??= "mysql sqlite3 imap \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG_class-native = "" PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \
@@ -91,6 +93,7 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ --with-imap-ssl=${STAGING_DIR_HOST} \ ,--without-imap --without-imap-ssl \ ,uw-imap" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
Signature · 1 line
2.8.3
PATCH 14/16 cherokee: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb +2 -1
@@ -19,10 +19,11 @@ SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a inherit autotools pkgconfig binconfig update-rc.d systemd -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," EXTRA_OECONF = "--disable-static \ --disable-nls \
Signature · 1 line
2.8.3
PATCH 15/16 xfce4-mailwatch-plugin: control ipv6 support based on DISTRO_FEATURES
In reply to [email protected]From: Jackie Huang <[email protected]>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
--- .../recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb +3 -0
@@ -9,3 +9,6 @@ DEPENDS += "gnutls libgcrypt" SRC_URI[md5sum] = "7263114ec0f2987a3aff15afeeb45577" SRC_URI[sha256sum] = "624acc8229a8593c0dfeb28f883f4958119a715cc81cecdbaf29efc8ab1edcad" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
Signature · 1 line
2.8.3
PATCH 16/16 inetutils: fixes for ipv6 feature
In reply to [email protected]From: Jackie Huang <[email protected]>
* Rebase the patch fix-disable-ipv6.patch
* Add PACKAGECONFIG for ipv6 and ping6 instead of
using noipv6 in EXTRA_OECONF
* Fix the do_install to avoid failure when ipv6
is disable
--- .../inetutils/inetutils/fix-disable-ipv6.patch | 43 +++++++++++++++++----- .../inetutils/inetutils_1.9.4.bb | 10 ++--- 2 files changed, 38 insertions(+), 15 deletions(-)
meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch +33 -10
@@ -2,9 +2,15 @@ Upstream: http://www.mail-archive.com/[email protected]/msg02103.html Upstream-Status: Pending -diff -ur inetutils-1.8.orig/ping/ping_common.h inetutils-1.8/ping/ping_common.h ---- inetutils-1.8.orig/ping/ping_common.h 2010-05-15 20:55:47.000000000 +0930 -+++ inetutils-1.8/ping/ping_common.h 2010-12-01 12:19:08.000000000 +1030 +Signed-off-by: Jackie Huang <[email protected]> +--- + ping/ping_common.h | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/ping/ping_common.h b/ping/ping_common.h +index 1dfd1b5..3bfbd12 100644 +--- a/ping/ping_common.h ++++ b/ping/ping_common.h @@ -17,10 +17,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see `http://www.gnu.org/licenses/'. */
@@ -20,18 +26,32 @@ diff -ur inetutils-1.8.orig/ping/ping_common.h inetutils-1.8/ping/ping_common.h #include <icmp.h> #include <error.h> #include <progname.h> -@@ -66,13 +70,19 @@ +@@ -62,7 +66,12 @@ struct ping_stat + want to follow the traditional behaviour of ping. */ + #define DEFAULT_PING_COUNT 0 + ++#ifdef HAVE_IPV6 + #define PING_HEADER_LEN (USE_IPV6 ? sizeof (struct icmp6_hdr) : ICMP_MINLEN) ++#else ++#define PING_HEADER_LEN (ICMP_MINLEN) ++#endif ++ + #define PING_TIMING(s) ((s) >= sizeof (struct timeval)) + #define PING_DATALEN (64 - PING_HEADER_LEN) /* default data length */ + +@@ -74,13 +83,20 @@ struct ping_stat (t).tv_usec = ((i)%PING_PRECISION)*(1000000/PING_PRECISION) ;\ } while (0) +#ifdef HAVE_IPV6 - /* Not sure about this step*/ - #define _PING_BUFLEN(p, USE_IPV6) ((USE_IPV6)? ((p)->ping_datalen + sizeof (struct icmp6_hdr)) : \ - ((p)->ping_datalen + sizeof (icmphdr_t))) + /* FIXME: Adjust IPv6 case for options and their consumption. */ + #define _PING_BUFLEN(p, u) ((u)? ((p)->ping_datalen + sizeof (struct icmp6_hdr)) : \ + (MAXIPLEN + (p)->ping_datalen + ICMP_TSLEN)) + +#else -+#define _PING_BUFLEN(p, USE_IPV6) ((p)->ping_datalen + sizeof (icmphdr_t)) ++#define _PING_BUFLEN(p, u) (MAXIPLEN + (p)->ping_datalen + ICMP_TSLEN) +#endif - ++ +#ifdef HAVE_IPV6 typedef int (*ping_efp6) (int code, void *closure, struct sockaddr_in6 * dest, struct sockaddr_in6 * from, struct icmp6_hdr * icmp,
@@ -40,7 +60,7 @@ diff -ur inetutils-1.8.orig/ping/ping_common.h inetutils-1.8/ping/ping_common.h typedef int (*ping_efp) (int code, void *closure, -@@ -81,13 +91,17 @@ +@@ -89,13 +105,17 @@ typedef int (*ping_efp) (int code, struct ip * ip, icmphdr_t * icmp, int datalen); union event {
@@ -58,3 +78,6 @@ diff -ur inetutils-1.8.orig/ping/ping_common.h inetutils-1.8/ping/ping_common.h }; typedef struct ping_data PING; +-- +2.8.3 +
meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +5 -5
@@ -29,17 +29,18 @@ SRC_URI[sha256sum] = "be8f75eff936b8e41b112462db51adf689715658a1b09e0d6b05d11ec9 inherit autotools gettext update-alternatives texinfo 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)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6 ping6', '', d)} \ " PACKAGECONFIG[ftp] = "--enable-ftp,--disable-ftp,readline" PACKAGECONFIG[uucpd] = "--enable-uucpd,--disable-uucpd,readline" PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6 gl_cv_socket_ipv6=no," +PACKAGECONFIG[ping6] = "--enable-ping6,--disable-ping6," EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ - ${noipv6} \ inetutils_cv_path_login=${base_bindir}/login \ --with-libreadline-prefix=${STAGING_LIBDIR} \ --enable-rpath=no \
@@ -56,8 +57,7 @@ do_install_append () { install -m 0755 -d ${D}${base_sbindir} install -m 0755 -d ${D}${sbindir} install -m 0755 -d ${D}${sysconfdir}/xinetd.d - mv ${D}${bindir}/ping ${D}${base_bindir}/ - mv ${D}${bindir}/ping6 ${D}${base_bindir}/ + mv ${D}${bindir}/ping* ${D}${base_bindir}/ mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ mv ${D}${libexecdir}/syslogd ${D}${base_sbindir}/ mv ${D}${bindir}/hostname ${D}${base_bindir}/
@@ -135,7 +135,7 @@ ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" ALTERNATIVE_${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -ALTERNATIVE_${PN}-ping6 = "ping6" +ALTERNATIVE_${PN}-ping6 = "${@bb.utils.contains('PACKAGECONFIG', 'ping6', 'ping6', '', d)}" ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6"
Signature · 1 line
2.8.3
Ping.
I don't see a comment or rejection on these, will these be merged soon?
Thanks,
Jackie
Quoted 69 lines
-----Original Message-----
From: [email protected] [mailto:openembedded-devel- [email protected]] On Behalf Of [email protected]
Sent: Wednesday, August 24, 2016 5:07 PM
To: [email protected]
Subject: [oe] [PATCH 00/16] control ipv6 support based onDISTRO_FEATURESFrom: Jackie Huang <[email protected]>
There is ipv6 configure option for these packages, and we need them to be controled by
DISTRO_FEATURES.Tested with and without ipv6 in
DISTRO_FEATURESon qemux86-64 and qemuarm.---
The following changes since commitdc48e768f527cbed0cc3899f6a2ebb396cd9ada8:meta-oe: remove trailing spaces (2016-08-22 15:56:29 +0200)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib.gitjhuang0/r_ipv6_160824-0
http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/r_ipv6_160824-0Jackie Huang (16):
chrony: control ipv6 support based onDISTRO_FEATURES
cyrus-sasl: control ipv6 support based onDISTRO_FEATURES
daq: control ipv6 support based onDISTRO_FEATURES
mtr: control ipv6 support based onDISTRO_FEATURES
ntp: control ipv6 support based onDISTRO_FEATURES
squid: control ipv6 support based onDISTRO_FEATURES
stunnel: control ipv6 support based onDISTRO_FEATURES
tftp-hpa: control ipv6 support based onDISTRO_FEATURES
tnftp: control ipv6 support based onDISTRO_FEATURES
wolfssl: control ipv6 support based onDISTRO_FEATURES
znc: control ipv6 support based onDISTRO_FEATURES
iperf: control ipv6 support based onDISTRO_FEATURES
php: control ipv6 support based onDISTRO_FEATURES
cherokee: control ipv6 support based onDISTRO_FEATURES
xfce4-mailwatch-plugin: control ipv6 support based onDISTRO_FEATURES
inetutils: fixes for ipv6 feature.../recipes-connectivity/daq/daq_2.0.6.bb | 3 ++ .../inetutils/inetutils/fix-disable-ipv6.patch | 43 +++++++++++++++++----- .../inetutils/inetutils_1.9.4.bb | 10 ++--- .../recipes-connectivity/wolfssl/wolfssl_3.9.0.bb | 2 + .../cyrus-sasl/cyrus-sasl_2.1.26.bb | 2 + .../recipes-daemons/squid/squid_3.5.20.bb | 2 + .../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 3 ++ meta-networking/recipes-irc/znc/znc_git.bb | 3 ++ .../recipes-support/chrony/chrony_2.4.bb | 5 ++- meta-networking/recipes-support/mtr/mtr_0.86.bb | 2 + meta-networking/recipes-support/ntp/ntp_4.2.8p8.bb | 5 ++- .../recipes-support/stunnel/stunnel_5.28.bb | 5 ++- .../recipes-support/tnftp/tnftp_20151004.bb | 5 ++- meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 3 ++ meta-oe/recipes-devtools/php/php.inc | 5 ++- .../recipes-httpd/cherokee/cherokee_1.2.98.bb | 3 +- .../mailwatch/xfce4-mailwatch-plugin_1.2.0.bb | 3 ++ 17 files changed, 83 insertions(+), 21 deletions(-)--
2.8.3--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel