summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-04 14:27:46 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-06-11 17:08:58 (GMT)
commit46faf5eb0764f5f29abd02176027a7b492c751bd (patch)
tree9c427659f79f0faf04f5e425fd8212fe335167a8
parentb2d93d136b7d16be374a8a21fccf0555e41eb86a (diff)
downloaddefinitions-baserock/update-openstack-to-kilo.tar.gz
iputils: Install all the iputils utilitiesbaserock/update-openstack-to-kilo
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
-rw-r--r--strata/networking-utils.morph8
-rw-r--r--strata/networking-utils/arping.morph3
-rw-r--r--strata/networking-utils/iputils.morph24
3 files changed, 28 insertions, 7 deletions
diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph
index 951e2d2..e9ba3cd 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 d9f5bd3..0000000
--- 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 0000000..c9736cc
--- /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