From fdbea24797f7559ec8edc0c34f71a8dc5e0a94dc Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Fri, 22 May 2015 14:04:28 +0000
Subject: Add `arping` to networking-utils

Because `arping` requires the libpcap library, move tcpdump and libpcap
to networking-utils.

Add also `arping`'s libnet dependency.

Change-Id: Ie459e5295bc2770856e06cb005845ee3f172e68e
---
 strata/networking-utils.morph         | 25 +++++++++++++++++++++++++
 strata/networking-utils/arping.morph  |  3 +++
 strata/networking-utils/libnet.morph  | 15 +++++++++++++++
 strata/networking-utils/libpcap.morph |  3 +++
 strata/networking-utils/tcpdump.morph |  3 +++
 strata/tools.morph                    | 12 ------------
 strata/tools/libpcap.morph            |  3 ---
 strata/tools/tcpdump.morph            |  3 ---
 8 files changed, 49 insertions(+), 18 deletions(-)
 create mode 100644 strata/networking-utils/arping.morph
 create mode 100644 strata/networking-utils/libnet.morph
 create mode 100644 strata/networking-utils/libpcap.morph
 create mode 100644 strata/networking-utils/tcpdump.morph
 delete mode 100644 strata/tools/libpcap.morph
 delete mode 100644 strata/tools/tcpdump.morph

diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph
index 689bec87..951e2d29 100644
--- a/strata/networking-utils.morph
+++ b/strata/networking-utils.morph
@@ -25,3 +25,28 @@ chunks:
   unpetrify-ref: v6.24
   build-depends:
   - libmnl
+- name: libpcap
+  morph: strata/networking-utils/libpcap.morph
+  repo: upstream:libpcap
+  ref: 098a643f817e8a9929c70dfba157e4d399398375
+  unpetrify-ref: libpcap-1.7
+- name: tcpdump
+  morph: strata/networking-utils/tcpdump.morph
+  repo: upstream:tcpdump
+  ref: 8aa5edea1b8846740514dee4158b6c707d38fc13
+  unpetrify-ref: tcpdump-4.7
+  build-depends:
+  - libpcap
+- name: libnet
+  morph: strata/networking-utils/libnet.morph
+  repo: upstream:libnet
+  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
+  build-depends:
+  - libpcap
+  - libnet
diff --git a/strata/networking-utils/arping.morph b/strata/networking-utils/arping.morph
new file mode 100644
index 00000000..d9f5bd30
--- /dev/null
+++ b/strata/networking-utils/arping.morph
@@ -0,0 +1,3 @@
+name: arping
+kind: chunk
+build-system: autotools
diff --git a/strata/networking-utils/libnet.morph b/strata/networking-utils/libnet.morph
new file mode 100644
index 00000000..c4f2b213
--- /dev/null
+++ b/strata/networking-utils/libnet.morph
@@ -0,0 +1,15 @@
+name: libnet
+kind: chunk
+build-system: manual
+pre-configure-commands:
+# Avoid building the docs as they require doxygen
+- sed -i 's@doc @@' libnet/Makefile.am
+- sed -i 's@doc/.*Makefile@@' libnet/configure.ac
+
+- cd libnet && ./autogen.sh
+configure-commands:
+- cd libnet && ./configure --prefix="$PREFIX" --disable-samples --enable-shared=yes --with-pic
+build-commands:
+- cd libnet && make
+install-commands:
+- cd libnet && make DESTDIR="$DESTDIR" install
diff --git a/strata/networking-utils/libpcap.morph b/strata/networking-utils/libpcap.morph
new file mode 100644
index 00000000..7c5ee932
--- /dev/null
+++ b/strata/networking-utils/libpcap.morph
@@ -0,0 +1,3 @@
+name: libpcap
+kind: chunk
+build-system: autotools
diff --git a/strata/networking-utils/tcpdump.morph b/strata/networking-utils/tcpdump.morph
new file mode 100644
index 00000000..7a974dab
--- /dev/null
+++ b/strata/networking-utils/tcpdump.morph
@@ -0,0 +1,3 @@
+name: tcpdump
+kind: chunk
+build-system: autotools
diff --git a/strata/tools.morph b/strata/tools.morph
index eff3a886..4d2fa2ad 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -73,18 +73,6 @@ chunks:
   unpetrify-ref: IPMITOOL_1_8_14
   build-depends:
   - file
-- name: libpcap
-  morph: strata/tools/libpcap.morph
-  repo: upstream:libpcap
-  ref: 098a643f817e8a9929c70dfba157e4d399398375
-  unpetrify-ref: libpcap-1.7
-- name: tcpdump
-  morph: strata/tools/tcpdump.morph
-  repo: upstream:tcpdump
-  ref: 8aa5edea1b8846740514dee4158b6c707d38fc13
-  unpetrify-ref: tcpdump-4.7
-  build-depends:
-  - libpcap
 - name: parted
   morph: strata/tools/parted.morph
   repo: upstream:parted
diff --git a/strata/tools/libpcap.morph b/strata/tools/libpcap.morph
deleted file mode 100644
index 7c5ee932..00000000
--- a/strata/tools/libpcap.morph
+++ /dev/null
@@ -1,3 +0,0 @@
-name: libpcap
-kind: chunk
-build-system: autotools
diff --git a/strata/tools/tcpdump.morph b/strata/tools/tcpdump.morph
deleted file mode 100644
index 7a974dab..00000000
--- a/strata/tools/tcpdump.morph
+++ /dev/null
@@ -1,3 +0,0 @@
-name: tcpdump
-kind: chunk
-build-system: autotools
-- 
cgit v1.2.1