package/iputils: Reenable traceroute6
PATCH v2 1/3 package/iputils: Reenable traceroute6
Bump to s20190515 removed traceroute6 build (it's not built by default since this version in upstream). Reenable it again.
This requires fix similar to one in 0003-meson.build-fix-build-with-NLS.patch [1]
traceroute6 is in /usr/sbin, so no need to handle busybox problem (6e18892733 "package/iputils: move binaries to the location also used by Busybox").
[1] http://autobuild.buildroot.org/results/0a8a3efe734ac7fb3a68ba505277681857dc0a3d
---
Changes v1->v2:
* Fix traceroute6 path in IPUTILS_PERMISSIONS, it must be /usr/bin/traceroute6
Kind regards,
Petr
.../0005-traceroute6-fix-build-with-NLS.patch | 30 +++++++++++++++++++ package/iputils/iputils.mk | 3 ++ 2 files changed, 33 insertions(+) create mode 100644 package/iputils/0005-traceroute6-fix-build-with-NLS.patch
package/iputils/0005-traceroute6-fix-build-with-NLS.patch new file +30 -0
@@ -0,0 +1,30 @@ +From b18c6c48e4dabaf8bf9b178b3deca631fc79c96e Mon Sep 17 00:00:00 2001 +From: Petr Vorel <[email protected]> +Date: Tue, 11 Jun 2019 21:51:58 +0200 +Subject: [PATCH] traceroute6: fix build with NLS + +commit 418d8be ("build-sys: fix build with NLS") fixed problems for +default packages using libintl. Fix also traceroute6 (build it must be +enabled with -DBUILD_TRACEROUTE6=true) + +Signed-off-by: Petr Vorel <[email protected]> +Upstream status: 81bfb31a714641b70c2a7c7d9ce12cf08f98a372 +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2b545b6..85db8a6 100644 +--- a/meson.build ++++ b/meson.build +@@ -266,7 +266,7 @@ endif + + if build_traceroute6 == true + executable('traceroute6', ['traceroute6.c', git_version_h], +- dependencies : [cap_dep, idn_dep], ++ dependencies : [cap_dep, intl_dep, idn_dep], + link_with : [libcommon], + install: true) + meson.add_install_script('build-aux/setcap-setuid.sh', +-- +2.21.0
package/iputils/iputils.mk +3 -0
@@ -49,6 +49,8 @@ IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false endif +IPUTILS_CONF_OPTS += -DBUILD_TRACEROUTE6=true + # XSL Stylesheets for DocBook 5 not packaged for buildroot IPUTILS_CONF_OPTS += -DBUILD_MANS=false -DBUILD_HTML_MANS=false
@@ -69,6 +71,7 @@ define IPUTILS_PERMISSIONS /usr/sbin/arping f 4755 0 0 - - - - - /usr/bin/clockdiff f 4755 0 0 - - - - - /bin/ping f 4755 0 0 - - - - - + /usr/bin/traceroute6 f 4755 0 0 - - - - - endef $(eval $(meson-package))
Signature · 1 line
2.21.0
PATCH v2 2/3 iputils: Update upstream status on patches
Patch 0002-meson.build-fix-static-build-with-gcrypt.patch replaced with 0002-build-sys-fix-static-build-gcrypt-dependency-gpg-err.patch
--- ...-ninfod_name.c-fix-build-with-nettle.patch | 4 +- ...atic-build-gcrypt-dependency-gpg-err.patch | 51 ++++++++++++++++ ...n.build-fix-static-build-with-gcrypt.patch | 58 ------------------- .../0003-meson.build-fix-build-with-NLS.patch | 45 ++++++++------ ...uild-sys-Make-setcap-really-optional.patch | 3 +- 5 files changed, 80 insertions(+), 81 deletions(-) create mode 100644 package/iputils/0002-build-sys-fix-static-build-gcrypt-dependency-gpg-err.patch delete mode 100644 package/iputils/0002-meson.build-fix-static-build-with-gcrypt.patch
package/iputils/0001-ninfod-ninfod_name.c-fix-build-with-nettle.patch +2 -2
@@ -15,7 +15,7 @@ Fixes: - http://autobuild.buildroot.org/results/e86555090e27b631ba35214ef100aa9331844684 Signed-off-by: Fabrice Fontaine <[email protected]> -[Upstream status: https://github.com/iputils/iputils/pull/181] +Upstream status: commit f209ebb91e65980bcdddce8cc12b00ec11623f76 --- ninfod/ninfod_name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -34,5 +34,5 @@ index daf606d..525c93d 100644 #elif defined(HAVE_GNUTLS_OPENSSL_H) # include <gnutls/openssl.h> -- -2.20.1 +2.21.0
package/iputils/0002-build-sys-fix-static-build-gcrypt-dependency-gpg-err.patch new file +51 -0
51 lines not on this page · raw message
package/iputils/0002-meson.build-fix-static-build-with-gcrypt.patch deleted +0 -58
58 lines not on this page · raw message
package/iputils/0003-meson.build-fix-build-with-NLS.patch +26 -19
89 lines not on this page · raw message
package/iputils/0004-build-sys-Make-setcap-really-optional.patch +1 -2
@@ -8,9 +8,8 @@ setcap.path(): meson.build:246:7: ERROR: add_install_script args must be strings -[Retrieved from: -https://github.com/iputils/iputils/commit/473be6467f995865244e7e68b2fa587a4ee79551] Signed-off-by: Fabrice Fontaine <[email protected]> +Upstream status: commit 473be6467f995865244e7e68b2fa587a4ee79551 --- meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
Signature · 1 line
2.21.0
PATCH v2 2/3 iputils: Update upstream status on patches
Quoted 4 lines · On Wed, 19 Jun 2019 23:30:07 +0200 Petr Vorel <[email protected]> wrote:
Patch 0002-meson.build-fix-static-build-with-gcrypt.patch replaced with 0002-build-sys-fix-static-build-gcrypt-dependency-gpg-err.patch
Signed-off-by Petr Vorel <[email protected]>
Quoted 9 lines
--- ...-ninfod_name.c-fix-build-with-nettle.patch | 4 +- ...atic-build-gcrypt-dependency-gpg-err.patch | 51 ++++++++++++++++ ...n.build-fix-static-build-with-gcrypt.patch | 58 ------------------- .../0003-meson.build-fix-build-with-NLS.patch | 45 ++++++++------ ...uild-sys-Make-setcap-really-optional.patch | 3 +- 5 files changed, 80 insertions(+), 81 deletions(-) create mode 100644 package/iputils/0002-build-sys-fix-static-build-gcrypt-dependency-gpg-err.patch delete mode 100644 package/iputils/0002-meson.build-fix-static-build-with-gcrypt.patch
Fixed the commit title prefix to be "package/iputils" not just "iputils". Also, I prefer when the part after the ":" doesn't start with an upper-case letter. Applied with those minor nits fixed. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 3/3 package/iputils: create ping6 symlink in post install target hook
In reply to Petr VorelUpstream expect distros will do it, see
https://github.com/iputils/iputils/commit/ebad35fee3de851b809c7b72ccc654a72b6af61d
---
Changes v1->v2:
* Use IPUTILS_POST_INSTALL_TARGET_HOOKS (previously it IPUTILS_POST_INSTALL_HOOKS was used). IPUTILS_POST_INSTALL_TARGET_HOOKS works, but not really sure which one is correct/more suitable.
Kind regards,
Petr
package/iputils/iputils.mk | 6 ++++++ 1 file changed, 6 insertions(+)
package/iputils/iputils.mk +6 -0
@@ -65,6 +65,12 @@ define IPUTILS_MOVE_BINARIES endef IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_BINARIES +# upstream requires distros to create symlink +define IPUTILS_CREATE_PING6_SYMLINK +ln -sv $(TARGET_DIR)/bin/ping $(TARGET_DIR)/bin/ping6 +endef +IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_CREATE_PING6_SYMLINK + # handle permissions ourselves IPUTILS_CONF_OPTS += -DNO_SETCAP_OR_SUID=true define IPUTILS_PERMISSIONS
Signature · 1 line
2.21.0
Thomas Petazzoni
AppliedPATCH v2 3/3 package/iputils: create ping6 symlink in post install target hook
package/iputils/iputils.mk define IPUTILS_MOVE_BINARIES · line 70
Quoted 3 lines · On Wed, 19 Jun 2019 23:30:08 +0200 Petr Vorel <[email protected]> wrote:
package/iputils/iputils.mk +3
-0+# upstream requires distros to create symlink +define IPUTILS_CREATE_PING6_SYMLINK +ln -sv $(TARGET_DIR)/bin/ping $(TARGET_DIR)/bin/ping6
Such commands are normally indented. Also instead of -sv, you should have used -sf. The verbosity is not needed, but the -f is needed so that reinstallation of the package works properly.
I've applied after fixing this. Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH v2 1/3 package/iputils: Reenable traceroute6
In reply to Petr VorelQuoted 11 lines · On Wed, 19 Jun 2019 23:30:06 +0200 Petr Vorel <[email protected]> wrote:
Bump to s20190515 removed traceroute6 build (it's not built by default since this version in upstream). Reenable it again.
Fixes 9ffcd9279e ("package/iputils: bump to version s20190515")This requires fix similar to one in 0003-meson.build-fix-build-with-NLS.patch [1]
traceroute6 is in
/usr/sbin, so no need to handle busybox problem (6e18892733"package/iputils: move binaries to the location also used by Busybox").
Quoted 7 lines
[1] http://autobuild.buildroot.org/results/0a8a3efe734ac7fb3a68ba505277681857dc0a3d
Signed-off-by Petr Vorel <[email protected]>---
Changesv1->v2:
* Fix traceroute6 path inIPUTILS_PERMISSIONS, it must be/usr/bin/traceroute6
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com