summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-22 14:04:28 (GMT)
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-26 13:48:57 (GMT)
commitf7d732e7ff7ed58645a960ced9ccc159b09576f0 (patch)
treeb866eaded243758774de8eb8ee038a4c5f5d05e2
parentb3f461c2c9e9868e6a7f25930a4afb1769192d25 (diff)
downloaddefinitions-baserock/tiagogomes/find-and-arping.tar.gz
Add `arping` to networking-utilsbaserock/tiagogomes/find-and-arping
Because `arping` requires the libpcap library, move tcpdump and libpcap to networking-utils. Add also `arping`'s libnet dependency. Change-Id: Ie459e5295bc2770856e06cb005845ee3f172e68e
-rw-r--r--strata/networking-utils.morph25
-rw-r--r--strata/networking-utils/arping.morph3
-rw-r--r--strata/networking-utils/libnet.morph15
-rw-r--r--strata/networking-utils/libpcap.morph (renamed from strata/tools/libpcap.morph)0
-rw-r--r--strata/networking-utils/tcpdump.morph (renamed from strata/tools/tcpdump.morph)0
-rw-r--r--strata/tools.morph12
6 files changed, 43 insertions, 12 deletions
diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph
index 689bec8..951e2d2 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 0000000..d9f5bd3
--- /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 0000000..c4f2b21
--- /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/tools/libpcap.morph b/strata/networking-utils/libpcap.morph
index 7c5ee93..7c5ee93 100644
--- a/strata/tools/libpcap.morph
+++ b/strata/networking-utils/libpcap.morph
diff --git a/strata/tools/tcpdump.morph b/strata/networking-utils/tcpdump.morph
index 7a974da..7a974da 100644
--- a/strata/tools/tcpdump.morph
+++ b/strata/networking-utils/tcpdump.morph
diff --git a/strata/tools.morph b/strata/tools.morph
index 3492718..82d2fc0 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