From aae104b29605f4b19a04869da228313b51d92742 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 31 Mar 2015 14:20:16 +0000
Subject: 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
---
 strata/tools.morph           |  2 +-
 strata/tools/procps-ng.morph | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 strata/tools/procps-ng.morph

diff --git a/strata/tools.morph b/strata/tools.morph
index a3e7740b..5b3288ec 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 00000000..69df3d4a
--- /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
-- 
cgit v1.2.1