diff options
author | Jörg Sommer <joerg.sommer@navimatix.de> | 2023-10-16 12:34:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-19 13:38:57 +0100 |
commit | 16dc1bb3de810552a2ce7c52d855455bbcdd6008 (patch) | |
tree | 8b0c8c73163c3f93b2712c91e086a331b99de261 /meta | |
parent | 3aa80a54df97e52e73ccddf61213a82d261db3f0 (diff) | |
download | poky-16dc1bb3de810552a2ce7c52d855455bbcdd6008.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/libtirpc/libtirpc/ipv6.patch | 52 | ||||
-rw-r--r-- | meta/recipes-extended/libtirpc/libtirpc_1.3.3.bb | 9 |
2 files changed, 60 insertions, 1 deletions
diff --git a/meta/recipes-extended/libtirpc/libtirpc/ipv6.patch b/meta/recipes-extended/libtirpc/libtirpc/ipv6.patch new file mode 100644 index 0000000000..f746f986f4 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/ipv6.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 077bbd32e8b7474dc5f153997732e1e6aec7fad6 Mon Sep 17 00:00:00 2001 | ||
2 | Message-Id: <077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120796.git.joerg.sommer@navimatix.de> | ||
3 | From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> | ||
4 | Date: Thu, 12 Oct 2023 16:22:59 +0200 | ||
5 | Subject: [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6 | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | If the configuration for IPv6 is disabled, the netconfig should not contain | ||
11 | settings for tcp6 and udp6. | ||
12 | |||
13 | The test for the configure option didn't work, because it check the wrong | ||
14 | variable. | ||
15 | |||
16 | Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> | ||
17 | Upstream-Status: Submitted [libtirpc-devel@lists.sourceforge.net] | ||
18 | Upstream-Status: Submitted [linux-nfs@vger.kernel.org] | ||
19 | --- | ||
20 | configure.ac | 2 +- | ||
21 | doc/Makefile.am | 5 +++++ | ||
22 | 2 files changed, 6 insertions(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/configure.ac b/configure.ac | ||
25 | index fe6c517..b687f8d 100644 | ||
26 | --- a/configure.ac | ||
27 | +++ b/configure.ac | ||
28 | @@ -64,7 +64,7 @@ fi | ||
29 | AC_ARG_ENABLE(ipv6, | ||
30 | [AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])], | ||
31 | [],[enable_ipv6=yes]) | ||
32 | -AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno) | ||
33 | +AM_CONDITIONAL(INET6, test "x$enable_ipv6" != xno) | ||
34 | if test "x$enable_ipv6" != xno; then | ||
35 | AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available]) | ||
36 | fi | ||
37 | diff --git a/doc/Makefile.am b/doc/Makefile.am | ||
38 | index d42ab90..b9678f6 100644 | ||
39 | --- a/doc/Makefile.am | ||
40 | +++ b/doc/Makefile.am | ||
41 | @@ -2,3 +2,8 @@ dist_sysconf_DATA = netconfig bindresvport.blacklist | ||
42 | |||
43 | CLEANFILES = cscope.* *~ | ||
44 | DISTCLEANFILES = Makefile.in | ||
45 | + | ||
46 | +if ! INET6 | ||
47 | +install-exec-hook: | ||
48 | + $(SED) -i '/^tcp6\|^udp6/d' "$(DESTDIR)$(sysconfdir)"/netconfig | ||
49 | +endif | ||
50 | -- | ||
51 | 2.34.1 | ||
52 | |||
diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.3.3.bb b/meta/recipes-extended/libtirpc/libtirpc_1.3.3.bb index b27c302460..898a952a8b 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.3.3.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.3.3.bb | |||
@@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ | |||
9 | 9 | ||
10 | PROVIDES = "virtual/librpc" | 10 | PROVIDES = "virtual/librpc" |
11 | 11 | ||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2" | 12 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ |
13 | file://ipv6.patch \ | ||
14 | " | ||
13 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" | 15 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" |
14 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" | 16 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" |
15 | SRC_URI[sha256sum] = "6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3" | 17 | SRC_URI[sha256sum] = "6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3" |
@@ -21,6 +23,11 @@ inherit autotools pkgconfig | |||
21 | PACKAGECONFIG ??= "" | 23 | PACKAGECONFIG ??= "" |
22 | PACKAGECONFIG[gssapi] = "--enable-gssapi,--disable-gssapi,krb5" | 24 | PACKAGECONFIG[gssapi] = "--enable-gssapi,--disable-gssapi,krb5" |
23 | 25 | ||
26 | PACKAGECONFIG ??= "\ | ||
27 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ | ||
28 | " | ||
29 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" | ||
30 | |||
24 | do_install:append() { | 31 | do_install:append() { |
25 | test -e ${D}${sysconfdir}/netconfig && chown root:root ${D}${sysconfdir}/netconfig | 32 | test -e ${D}${sysconfdir}/netconfig && chown root:root ${D}${sysconfdir}/netconfig |
26 | } | 33 | } |