[oe-commits] Jussi Kukkonen : nfs-utils: Upgrade 1.3.1 -> 1.3.2

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: d291e68c23c23d8634b158ded8faee43bcfb00bd
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d291e68c23c23d8634b158ded8faee43bcfb00bd

Author: Jussi Kukkonen <jussi.kukkonen at intel.com>
Date:   Thu Aug 13 16:40:01 2015 +0300

nfs-utils: Upgrade 1.3.1 -> 1.3.2

Add PACKAGECONFIG[ipv6] that is enabled based on ipv6 distro feature.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 .../nfs-utils/{nfs-utils_1.3.1.bb => nfs-utils_1.3.2.bb}       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.2.bb
similarity index 92%
rename from meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
rename to meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.2.bb
index 6da8509..0953850 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.2.bb
@@ -33,8 +33,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
            file://nfs-utils-debianize-start-statd.patch \
 "
 
-SRC_URI[md5sum] = "8de676b9ff34b8f9addc1d0800fabdf8"
-SRC_URI[sha256sum] = "ff79d70b7b58b2c8f9b798c58721127e82bb96022adc04a5c4cb251630e696b8"
+SRC_URI[md5sum] = "4cdffb2c7f7fd2bdceaba55ab1b881da"
+SRC_URI[sha256sum] = "2966bb431c06e9ba35a54f48f89db03a5132bc2d8ed8084ac8ccb34e25a9b739"
 
 # Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
 # pull in the remainder of the dependencies.
@@ -58,14 +58,16 @@ EXTRA_OECONF = "--with-statduser=rpcuser \
                 --disable-nfsv41 \
                 --enable-uuid \
                 --disable-gss \
-                --disable-tirpc \
                 --disable-nfsdcltrack \
                 --with-statdpath=/var/lib/nfs/statd \
                "
 
-PACKAGECONFIG ??= "tcp-wrappers"
+PACKAGECONFIG ??= "tcp-wrappers \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
+                   "
 PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
 PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils"
+PACKAGECONFIG[ipv6] = "--enable-ipv6 --enable-tirpc,--disable-ipv6 --disable-tirpc,libtirpc"
 
 INHIBIT_AUTO_STAGE = "1"