control ipv6 support based on DISTRO_FEATURES

PATCH In review [email protected] 1 participant 19 messages Aug 22, 2016 – Aug 31, 2016

lore

Share & tools

lore

[email protected]

author

2016-08-22 09:21 UTC #0 lore raw

cover control ipv6 support based on DISTRO_FEATURES

From: Jackie Huang <[email protected]>

There is ipv6 configure option for these packages, and we need to 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 f078ccf1ac60488169853724c35126cc056f975d:

bitbake: siggen: Fix file variable typo in compare_sigfiles (2016-08-20 16:11:29 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib.git jhuang0/r_ipv6_160822_0
http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/r_ipv6_160822_0

Jackie Huang (17):
apr: control ipv6 support based on DISTRO_FEATURES
libice: control ipv6 support based on DISTRO_FEATURES
libpcap: control ipv6 support based on DISTRO_FEATURES
libsm: control ipv6 support based on DISTRO_FEATURES
libxfont: control ipv6 support based on DISTRO_FEATURES
libxml2: control ipv6 support based on DISTRO_FEATURES
libxmu: control ipv6 support based on DISTRO_FEATURES
lighttpd: control ipv6 support based on DISTRO_FEATURES
nfs-utils: control ipv6 support based on DISTRO_FEATURES
nspr: control ipv6 support based on DISTRO_FEATURES
psmisc: control ipv6 support based on DISTRO_FEATURES
pulseaudio: control ipv6 support based on DISTRO_FEATURES
rsync: use rsync.inc to avoid duplicated codes
rsync: control ipv6 support based on DISTRO_FEATURES
wget: control ipv6 support based on DISTRO_FEATURES
xauth: control ipv6 support based on DISTRO_FEATURES
xhost: control ipv6 support based on DISTRO_FEATURES

 meta/recipes-connectivity/libpcap/libpcap.inc      |  5 ++++-
 .../nfs-utils/nfs-utils_1.3.3.bb                   |  5 ++++-
 meta/recipes-core/libxml/libxml2_2.9.4.bb          |  5 ++++-
 meta/recipes-devtools/rsync/rsync.inc              |  7 ++----
 meta/recipes-devtools/rsync/rsync_2.6.9.bb         | 25 ++++++----------------
 meta/recipes-devtools/rsync/rsync_3.1.2.bb         |  8 ++++++-
 meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb  |  5 ++++-
 meta/recipes-extended/psmisc/psmisc.inc            |  3 +++
 meta/recipes-extended/wget/wget.inc                |  5 +++--
 meta/recipes-graphics/xorg-app/xauth_1.0.9.bb      |  3 +++
 meta/recipes-graphics/xorg-app/xhost_1.0.7.bb      |  3 +++
 meta/recipes-graphics/xorg-lib/libice_1.0.9.bb     |  3 ++-
 meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb      |  3 +++
 meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb   |  3 +++
 meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb     |  3 +++
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |  2 ++
 meta/recipes-support/apr/apr_1.5.2.bb              |  3 +++
 meta/recipes-support/nspr/nspr_4.12.bb             |  3 +++
 18 files changed, 62 insertions(+), 32 deletions(-)

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #1 lore raw

PATCH 1/17 apr: control ipv6 support based on DISTRO_FEATURES

From: Jackie Huang <[email protected]>

Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-support/apr/apr_1.5.2.bb | 3 +++
 1 file changed, 3 insertions(+)

meta/recipes-support/apr/apr_1.5.2.bb +3 -0

index db15305..302c935 100644
@@ -38,6 +38,9 @@ CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sct
 # x86_64-linux-libtool:   error: specify a tag with '--tag'
 CCACHE = ""
 
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+
 do_configure_prepend() {
 	# Avoid absolute paths for grep since it causes failures
 	# when using sstate between different hosts with different

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #2 lore raw

PATCH 2/17 libice: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-graphics/xorg-lib/libice_1.0.9.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

meta/recipes-graphics/xorg-lib/libice_1.0.9.bb +2 -1

index 5049b7e..b361ad6 100644
@@ -23,5 +23,6 @@ BBCLASSEXTEND = "native"
 SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726"
 SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
 PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #3 lore raw

PATCH 3/17 libpcap: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-connectivity/libpcap/libpcap.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

meta/recipes-connectivity/libpcap/libpcap.inc +4 -1

index b7601b0..7b29a52 100644
@@ -20,12 +20,15 @@ inherit autotools binconfig-disabled pkgconfig bluetooth
 
 EXTRA_OECONF = "--with-pcap=linux"
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+"
 PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
 # Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
 PACKAGECONFIG[bluez5] = ",,"
 PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
 
 CPPFLAGS_prepend = "-I${S} "

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #4 lore raw

PATCH 4/17 libsm: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb | 3 +++
 1 file changed, 3 insertions(+)

meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +3 -0

index 1925136..da4ed92 100644
@@ -26,3 +26,6 @@ BBCLASSEXTEND = "native"
 
 SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3"
 SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #5 lore raw

PATCH 5/17 libxfont: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb | 3 +++
 1 file changed, 3 insertions(+)

meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb +3 -0

index 1b6e33c..e01f331 100644
@@ -20,3 +20,6 @@ BBCLASSEXTEND = "native"
 
 SRC_URI[md5sum] = "96f76ba94b4c909230bac1e2dcd551c4"
 SRC_URI[sha256sum] = "b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #6 lore raw

PATCH 6/17 libxml2: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-core/libxml/libxml2_2.9.4.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

meta/recipes-core/libxml/libxml2_2.9.4.bb +4 -1

index e2febf0..265d2b7 100644
@@ -38,8 +38,11 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm
 
 export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}"
 
-PACKAGECONFIG ??= "python"
+PACKAGECONFIG ??= "python \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+"
 PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 
 # WARNING: zlib is require for RPM use
 EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #7 lore raw

PATCH 7/17 libxmu: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb | 3 +++
 1 file changed, 3 insertions(+)

meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb +3 -0

index 003baec..d5935ff 100644
@@ -30,3 +30,6 @@ BBCLASSEXTEND = "native"
 
 SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4"
 SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #8 lore raw

PATCH 8/17 lighttpd: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb +4 -1

index 378accb..5d1ac58 100644
@@ -26,8 +26,11 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
 SRC_URI[md5sum] = "63c7563be1c7a7a9819a51f07f1af8b2"
 SRC_URI[sha256sum] = "7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b"
 
-PACKAGECONFIG ??= "openssl"
+PACKAGECONFIG ??= "openssl \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+"
 PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 
 EXTRA_OECONF = " \
              --without-bzip2 \

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #9 lore raw

PATCH 9/17 nfs-utils: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb +4 -1

index 285bd2c..8540503 100644
@@ -64,10 +64,13 @@ EXTRA_OECONF = "--with-statduser=rpcuser \
                 --with-statdpath=/var/lib/nfs/statd \
                "
 
-PACKAGECONFIG ??= "tcp-wrappers"
+PACKAGECONFIG ??= "tcp-wrappers \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+"
 PACKAGECONFIG_remove_libc-musl = "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
 PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 
 INHIBIT_AUTO_STAGE = "1"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #10 lore raw

PATCH 10/17 nspr: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-support/nspr/nspr_4.12.bb | 3 +++
 1 file changed, 3 insertions(+)

meta/recipes-support/nspr/nspr_4.12.bb +3 -0

index 168341b..fa6d523 100644
@@ -147,6 +147,9 @@ TESTS = " \
 
 inherit autotools
 
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+
 do_compile_prepend() {
 	oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export
 }

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #11 lore raw

PATCH 11/17 psmisc: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-extended/psmisc/psmisc.inc | 3 +++
 1 file changed, 3 insertions(+)

meta/recipes-extended/psmisc/psmisc.inc +3 -0

index 68e0656..98a8470 100644
@@ -15,6 +15,9 @@ S = "${WORKDIR}/psmisc-${PV}"
 
 inherit autotools gettext
 
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+
 ALLOW_EMPTY_${PN} = "1"
 
 PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #12 lore raw

PATCH 12/17 pulseaudio: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 ++
 1 file changed, 2 insertions(+)

meta/recipes-multimedia/pulseaudio/pulseaudio.inc +2 -0

index 299982b..6ed79ef 100644
@@ -42,6 +42,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
                    dbus \
                    "

@@ -59,6 +60,7 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
 PACKAGECONFIG[autospawn-for-root] = ",,,"
 PACKAGECONFIG[lirc] = "--enable-lirc,--disable-lirc,lirc"
 PACKAGECONFIG[webrtc] = "--enable-webrtc-aec,--disable-webrtc-aec,webrtc-audio-processing"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 
 EXTRA_OECONF_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}"
 EXTRA_OECONF_append_armeb = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #13 lore raw

PATCH 13/17 rsync: use rsync.inc to avoid duplicated codes

In reply to [email protected]

From: Jackie Huang <[email protected]>

There are two versions of rsync but the rsync.inc is only used by 3.x, there are duplicated codes in 2.x, so this commit include changes:

* remove duplicated codes in 2.x and require the inc
* move the LICENSE from inc to each bb

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-devtools/rsync/rsync.inc      |  5 -----
 meta/recipes-devtools/rsync/rsync_2.6.9.bb | 23 ++++-------------------
 meta/recipes-devtools/rsync/rsync_3.1.2.bb |  4 ++++
 3 files changed, 8 insertions(+), 24 deletions(-)

meta/recipes-devtools/rsync/rsync.inc +0 -5

index c65f270..8739c9c 100644
@@ -3,11 +3,6 @@ HOMEPAGE = "http://rsync.samba.org/"
 BUGTRACKER = "http://rsync.samba.org/bugzilla.html"
 SECTION = "console/network"
 
-# GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0)
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-# needs to add acl and attr
 DEPENDS = "popt"
 
 SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \

meta/recipes-devtools/rsync/rsync_2.6.9.bb +4 ~~-19~~

index 6854c77..5a19e21 100644
@@ -1,27 +1,12 @@
-SUMMARY = "File synchronization tool"
-HOMEPAGE = "http://rsync.samba.org/"
-BUGTRACKER = "http://rsync.samba.org/bugzilla.html"
-SECTION = "console/network"
+require rsync.inc
 
-# needs to add acl and attr
-DEPENDS = "popt"
-
-SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \
-           file://rsync-2.6.9-fname-obo.patch \
-           file://rsyncd.conf"
+SRC_URI += "file://rsync-2.6.9-fname-obo.patch \
+            file://rsyncd.conf \
+"
 
 SRC_URI[md5sum] = "996d8d8831dbca17910094e56dcb5942"
 SRC_URI[sha256sum] = "ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9"
 
-inherit autotools
-
-do_install_append() {
-	install -d ${D}${sysconfdir}
-	install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir}
-}
-
-EXTRA_OEMAKE='STRIP=""'
-
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c"

meta/recipes-devtools/rsync/rsync_3.1.2.bb +4 -0

index 9637ed4..798fecc 100644
@@ -5,6 +5,10 @@ SRC_URI += "file://makefile-no-rebuild.patch"
 SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb"
 SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2"
 
+# GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0)
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
 PACKAGECONFIG ??= "acl attr"
 PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl,"
 PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr,"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #14 lore raw

PATCH 14/17 rsync: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-devtools/rsync/rsync.inc      | 2 ++
 meta/recipes-devtools/rsync/rsync_2.6.9.bb | 2 ++
 meta/recipes-devtools/rsync/rsync_3.1.2.bb | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

meta/recipes-devtools/rsync/rsync.inc +2 -0

index 8739c9c..37897ab 100644
@@ -16,3 +16,5 @@ do_install_append() {
 }
 
 EXTRA_OEMAKE='STRIP=""'
+
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"

meta/recipes-devtools/rsync/rsync_2.6.9.bb +2 -0

index 5a19e21..efdf255 100644
@@ -11,3 +11,5 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c"
 
 PR = "r4"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"

meta/recipes-devtools/rsync/rsync_3.1.2.bb +3 -1

index 798fecc..c6cb331 100644
@@ -9,7 +9,9 @@ SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PACKAGECONFIG ??= "acl attr"
+PACKAGECONFIG ??= "acl attr \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+"
 PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl,"
 PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr,"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #15 lore raw

PATCH 15/17 wget: 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 instead of unconditionally enabled.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-extended/wget/wget.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

meta/recipes-extended/wget/wget.inc +3 -2

index dc381a6..c4abfe4 100644
@@ -9,7 +9,7 @@ INC_PR = "r16"
 
 inherit autotools gettext texinfo update-alternatives pkgconfig
 
-EXTRA_OECONF = "--enable-ipv6 --with-ssl=gnutls --disable-rpath --disable-iri \
+EXTRA_OECONF = "--with-ssl=gnutls --disable-rpath --disable-iri \
                 --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no"
 
 ALTERNATIVE_${PN} = "wget"

@@ -20,8 +20,9 @@ RRECOMMENDS_${PN} += "ca-certificates"
 
 BBCLASSEXTEND += "nativesdk"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
 PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 
 # Let aclocal use the relative path for the m4 file rather than
 # absolute, otherwise there might be an "Argument list too long" error

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #16 lore raw

PATCH 16/17 xauth: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-graphics/xorg-app/xauth_1.0.9.bb | 3 +++
 1 file changed, 3 insertions(+)

meta/recipes-graphics/xorg-app/xauth_1.0.9.bb +3 -0

index b173f4f..59b3323 100644
@@ -10,3 +10,6 @@ PE = "1"
 
 SRC_URI[md5sum] = "7d6003f32838d5b688e2c8a131083271"
 SRC_URI[sha256sum] = "56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"

Signature · 1 line

2.8.1

[email protected]

author

2016-08-22 09:21 UTC #17 lore raw

PATCH 17/17 xhost: 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.

Signed-off-by Jackie Huang <[email protected]>

---
 meta/recipes-graphics/xorg-app/xhost_1.0.7.bb | 3 +++
 1 file changed, 3 insertions(+)

meta/recipes-graphics/xorg-app/xhost_1.0.7.bb +3 -0

index 825737f..f23d258 100644
@@ -15,3 +15,6 @@ PE = "1"
 
 SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516"
 SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"

Signature · 1 line

2.8.1

Huang, Jie (Jackie)

author

2016-08-31 05:31 UTC #18 lore raw

In reply to [email protected]

Ping.

I don't see a comment or rejection on these, will these be merged soon?

Thanks,
Jackie

Quoted 71 lines

-----Original Message-----
From: [email protected] [mailto:openembedded-core- [email protected]] On Behalf Of [email protected]
Sent: Monday, August 22, 2016 5:06 PM
To: [email protected]
Subject: [OE-core] [PATCH 00/17] control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang <[email protected]>
There is ipv6 configure option for these packages, and we need to 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 f078ccf1ac60488169853724c35126cc056f975d:
bitbake: siggen: Fix file variable typo in compare_sigfiles (2016-08-20 16:11:29 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib.git jhuang0/r_ipv6_160822_0
http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/r_ipv6_160822_0
Jackie Huang (17):
apr: control ipv6 support based on DISTRO_FEATURES
libice: control ipv6 support based on DISTRO_FEATURES
libpcap: control ipv6 support based on DISTRO_FEATURES
libsm: control ipv6 support based on DISTRO_FEATURES
libxfont: control ipv6 support based on DISTRO_FEATURES
libxml2: control ipv6 support based on DISTRO_FEATURES
libxmu: control ipv6 support based on DISTRO_FEATURES
lighttpd: control ipv6 support based on DISTRO_FEATURES
nfs-utils: control ipv6 support based on DISTRO_FEATURES
nspr: control ipv6 support based on DISTRO_FEATURES
psmisc: control ipv6 support based on DISTRO_FEATURES
pulseaudio: control ipv6 support based on DISTRO_FEATURES
rsync: use rsync.inc to avoid duplicated codes
rsync: control ipv6 support based on DISTRO_FEATURES
wget: control ipv6 support based on DISTRO_FEATURES
xauth: control ipv6 support based on DISTRO_FEATURES
xhost: control ipv6 support based on DISTRO_FEATURES
 meta/recipes-connectivity/libpcap/libpcap.inc      |  5 ++++-
 .../nfs-utils/nfs-utils_1.3.3.bb                   |  5 ++++-
 meta/recipes-core/libxml/libxml2_2.9.4.bb          |  5 ++++-
 meta/recipes-devtools/rsync/rsync.inc              |  7 ++----
 meta/recipes-devtools/rsync/rsync_2.6.9.bb         | 25 ++++++----------------
 meta/recipes-devtools/rsync/rsync_3.1.2.bb         |  8 ++++++-
 meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb  |  5 ++++-
 meta/recipes-extended/psmisc/psmisc.inc            |  3 +++
 meta/recipes-extended/wget/wget.inc                |  5 +++--
 meta/recipes-graphics/xorg-app/xauth_1.0.9.bb      |  3 +++
 meta/recipes-graphics/xorg-app/xhost_1.0.7.bb      |  3 +++
 meta/recipes-graphics/xorg-lib/libice_1.0.9.bb     |  3 ++-
 meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb      |  3 +++
 meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb   |  3 +++
 meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb     |  3 +++
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |  2 ++
 meta/recipes-support/apr/apr_1.5.2.bb              |  3 +++
 meta/recipes-support/nspr/nspr_4.12.bb             |  3 +++
 18 files changed, 62 insertions(+), 32 deletions(-)
--
2.8.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core