mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
libtirpc: Support ipv6 in DISTRO_FEATURES
If the ipv6 feature for the distribution is not set, the package should not contain settings for ipv6. This makes rpcbind doesn't try to bind to a IPv6 socket, and complain that this fails. (From OE-Core rev: f1109380a4fec02dba0b5bd50c77b4825faa20a2) Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3aa80a54df
commit
16dc1bb3de
@@ -0,0 +1,52 @@
|
|||||||
|
From 077bbd32e8b7474dc5f153997732e1e6aec7fad6 Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120796.git.joerg.sommer@navimatix.de>
|
||||||
|
From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de>
|
||||||
|
Date: Thu, 12 Oct 2023 16:22:59 +0200
|
||||||
|
Subject: [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
If the configuration for IPv6 is disabled, the netconfig should not contain
|
||||||
|
settings for tcp6 and udp6.
|
||||||
|
|
||||||
|
The test for the configure option didn't work, because it check the wrong
|
||||||
|
variable.
|
||||||
|
|
||||||
|
Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
|
||||||
|
Upstream-Status: Submitted [libtirpc-devel@lists.sourceforge.net]
|
||||||
|
Upstream-Status: Submitted [linux-nfs@vger.kernel.org]
|
||||||
|
---
|
||||||
|
configure.ac | 2 +-
|
||||||
|
doc/Makefile.am | 5 +++++
|
||||||
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index fe6c517..b687f8d 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -64,7 +64,7 @@ fi
|
||||||
|
AC_ARG_ENABLE(ipv6,
|
||||||
|
[AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
|
||||||
|
[],[enable_ipv6=yes])
|
||||||
|
-AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno)
|
||||||
|
+AM_CONDITIONAL(INET6, test "x$enable_ipv6" != xno)
|
||||||
|
if test "x$enable_ipv6" != xno; then
|
||||||
|
AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available])
|
||||||
|
fi
|
||||||
|
diff --git a/doc/Makefile.am b/doc/Makefile.am
|
||||||
|
index d42ab90..b9678f6 100644
|
||||||
|
--- a/doc/Makefile.am
|
||||||
|
+++ b/doc/Makefile.am
|
||||||
|
@@ -2,3 +2,8 @@ dist_sysconf_DATA = netconfig bindresvport.blacklist
|
||||||
|
|
||||||
|
CLEANFILES = cscope.* *~
|
||||||
|
DISTCLEANFILES = Makefile.in
|
||||||
|
+
|
||||||
|
+if ! INET6
|
||||||
|
+install-exec-hook:
|
||||||
|
+ $(SED) -i '/^tcp6\|^udp6/d' "$(DESTDIR)$(sysconfdir)"/netconfig
|
||||||
|
+endif
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
@@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
|
|||||||
|
|
||||||
PROVIDES = "virtual/librpc"
|
PROVIDES = "virtual/librpc"
|
||||||
|
|
||||||
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2"
|
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
|
||||||
|
file://ipv6.patch \
|
||||||
|
"
|
||||||
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
|
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
|
||||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
|
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
|
||||||
SRC_URI[sha256sum] = "6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3"
|
SRC_URI[sha256sum] = "6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3"
|
||||||
@@ -21,6 +23,11 @@ inherit autotools pkgconfig
|
|||||||
PACKAGECONFIG ??= ""
|
PACKAGECONFIG ??= ""
|
||||||
PACKAGECONFIG[gssapi] = "--enable-gssapi,--disable-gssapi,krb5"
|
PACKAGECONFIG[gssapi] = "--enable-gssapi,--disable-gssapi,krb5"
|
||||||
|
|
||||||
|
PACKAGECONFIG ??= "\
|
||||||
|
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
|
||||||
|
"
|
||||||
|
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
|
||||||
|
|
||||||
do_install:append() {
|
do_install:append() {
|
||||||
test -e ${D}${sysconfdir}/netconfig && chown root:root ${D}${sysconfdir}/netconfig
|
test -e ${D}${sysconfdir}/netconfig && chown root:root ${D}${sysconfdir}/netconfig
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user