From 46faf5eb0764f5f29abd02176027a7b492c751bd Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 4 Jun 2015 14:27:46 +0000
Subject: iputils: Install all the iputils utilities

Utilities added are:
 - clockdiff
 - rdisc
 - tracepath
 - tracepath6
 - ninfod
 - rarpd.

Also it overwrites the following busybox network utilities:
 - traceroute6
 - arping
 - tftpd
 - ping
 - ping6

Signed-off-by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>

Change-Id: Ie925709677c2a83d7e512911fc4cfa7de749e967
---
 strata/networking-utils.morph         |  8 ++++----
 strata/networking-utils/arping.morph  |  3 ---
 strata/networking-utils/iputils.morph | 24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 7 deletions(-)
 delete mode 100644 strata/networking-utils/arping.morph
 create mode 100644 strata/networking-utils/iputils.morph

diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph
index 951e2d29..e9ba3cde 100644
--- a/strata/networking-utils.morph
+++ b/strata/networking-utils.morph
@@ -43,10 +43,10 @@ chunks:
   ref: 05df365769597e1d64d02af931d6127762ff2658
   unpetrify-ref: libnet-1.2
 - name: arping
-  morph: strata/networking-utils/arping.morph
-  repo: upstream:arping
-  ref: a416764b03f4d5960b61372e27d84606899bfe2c
-  unpetrify-ref: arping-2.15
+  morph: strata/networking-utils/iputils.morph
+  repo: upstream:iputils
+  ref: d25e54e25107bc7c5d14737ed65f5f52b54f1472
+  unpetrify-ref: s20140519
   build-depends:
   - libpcap
   - libnet
diff --git a/strata/networking-utils/arping.morph b/strata/networking-utils/arping.morph
deleted file mode 100644
index d9f5bd30..00000000
--- a/strata/networking-utils/arping.morph
+++ /dev/null
@@ -1,3 +0,0 @@
-name: arping
-kind: chunk
-build-system: autotools
diff --git a/strata/networking-utils/iputils.morph b/strata/networking-utils/iputils.morph
new file mode 100644
index 00000000..c9736cc8
--- /dev/null
+++ b/strata/networking-utils/iputils.morph
@@ -0,0 +1,24 @@
+name: iputils
+kind: chunk
+build-system: manual
+pre-configure-commands:
+# gnutls is not currently integrated in definitions so, disabling this
+# is required in order to build ping6. If this is not disabled, it will try
+# to find gnutls/openssl.h header failing to compile ping6.
+- sed -i "s/USE_GNUTLS=yes/USE_GNUTLS=no/" Makefile
+build-commands:
+- make
+- make ninfod
+install-commands:
+- install -D -m 755 clockdiff "$DESTDIR$PREFIX"/bin/clockdiff
+- install -D -m 755 rdisc "$DESTDIR$PREFIX"/bin/rdisc
+- install -D -m 755 tracepath "$DESTDIR$PREFIX"/bin/tracepath
+- install -D -m 755 tracepath6 "$DESTDIR$PREFIX"/bin/tracepath6
+- install -D -m 755 ninfod/ninfod "$DESTDIR$PREFIX"/bin/ninfod
+- install -D -m 755 rarpd "$DESTDIR$PREFIX"/bin/rarpd
+# The following binaries are installed to overwrite busybox binaries.
+- install -D -m 755 traceroute6 "$DESTDIR$PREFIX"/bin/traceroute6
+- install -D -m 755 arping "$DESTDIR$PREFIX"/sbin/arping
+- install -D -m 755 tftpd "$DESTDIR$PREFIX"/sbin/tftpd
+- install -D -m 755 ping "$DESTDIR"/bin/ping
+- install -D -m 755 ping6 "$DESTDIR"/bin/ping6
-- 
cgit v1.2.1