summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-31 14:20:16 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-04-01 11:01:32 (GMT)
commitaae104b29605f4b19a04869da228313b51d92742 (patch)
tree14ee527af6c2ba644d72f564f1c3d8255b40bc47
parent7e11a6928946b4b105db4b0ce8ea400df82f8f1b (diff)
downloaddefinitions-aae104b29605f4b19a04869da228313b51d92742.tar.gz
Fix procps-ng chunk installing files into /
Currently this chunk is creating /include/ and /share/ directories, but these should be in /usr. We do still need to install the binaries in /bin to override the Busybox versions. Change-Id: Idaf0b59a42e186b4efb5396e49ee5a14d3bf02e2
-rw-r--r--strata/tools.morph2
-rw-r--r--strata/tools/procps-ng.morph27
2 files changed, 28 insertions, 1 deletions
diff --git a/strata/tools.morph b/strata/tools.morph
index a3e7740..5b3288e 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -62,10 +62,10 @@ chunks:
ref: a4769dc7999b53260325fb89945bef85714fb338
unpetrify-ref: baserock/morph
- name: procps-ng
+ morph: strata/tools/procps-ng.morph
repo: upstream:procps-ng
ref: 85fff468fa263cdd2ff1c0144579527c32333695
unpetrify-ref: v3.3.9
- prefix: /
- name: ipmitool
morph: strata/tools/ipmitool.morph
repo: upstream:ipmitool
diff --git a/strata/tools/procps-ng.morph b/strata/tools/procps-ng.morph
new file mode 100644
index 0000000..69df3d4
--- /dev/null
+++ b/strata/tools/procps-ng.morph
@@ -0,0 +1,27 @@
+name: procps-ng
+kind: chunk
+
+description: |
+ Process management tools.
+
+ procps-ng is a fork of the original procps project.
+
+build-system: autotools
+
+configure-commands:
+ - NOCONFIGURE=1 ./autogen.sh
+ # Setting exec-prefix to /usr causes a bunch of stuff to go in /usr/usr/bin
+ # Setting prefix to / causes files to go in /include and /share
+ # So don't do either of those things!
+ - ./configure --prefix="$PREFIX" --exec-prefix=/
+
+post-install-commands:
+# We need to link the binaries into /bin so that they override the Busybox
+# versions of these tools. This will not be necessary once /bin is merged
+# into /usr/bin. It's not possible to get the Makefile to install the binaries
+# in /bin -- a bunch of them are hardcoded to live in ${exec_prefix}/usr/bin.
+ - |
+ usr_binaries="free pidof pmap slabtop top vmstat watch pgrep pkill pwdx tload uptime w"
+ for file in $usr_binaries; do
+ ln -sf "$PREFIX"/bin/$file "$DESTDIR"/bin/$file
+ done