summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2013-07-31 12:44:43 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2013-07-31 12:44:43 +0000
commit462008f79be9e195670b202cb43827b8aeb1e60b (patch)
treeb27c98f49068bf18f4b7dac54892e835a0341608
parent12ed1c6aa9f5c2563095af434cb036259d4cc419 (diff)
parent3f1b3743a4c1066c0c5f15da08174c512e4b3495 (diff)
downloadutil-linux-462008f79be9e195670b202cb43827b8aeb1e60b.tar.gz
Merge branch 'baserock/jonathan/fix-util-linux' into baserock/morph
Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
-rw-r--r--util-linux.morph23
1 files changed, 10 insertions, 13 deletions
diff --git a/util-linux.morph b/util-linux.morph
index 034b2beea..1a41064c7 100644
--- a/util-linux.morph
+++ b/util-linux.morph
@@ -1,13 +1,10 @@
-{
- "name": "util-linux",
- "kind": "chunk",
- "build-system": "autotools",
- "configure-commands": [
- "./autogen.sh",
- "./configure --prefix=\"$PREFIX\" --disable-use-tty-group"
- ],
- "install-commands": [
- "make DESTDIR=\"$DESTDIR\" install",
- "for prog in blkid blockdev cal chrt dmesg fdisk findfs flock fsck hexdump hwclock ipcrm ipcs logger mkswap more mount mountpoint pivot_root readprofile renice script setsid swapoff swapon switch_root umount; do find \"$DESTDIR\" -name \"$prog\" -delete; done"
- ]
-}
+name: util-linux
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh
+- ./configure --prefix="$PREFIX" --disable-use-tty-group
+install-commands:
+- make DESTDIR="$(pwd)/util-linux-tmpdir" install
+- for prog in blkid blockdev cal chrt dmesg fdisk findfs flock fsck hexdump hwclock ipcrm ipcs logger mkswap more mount mountpoint pivot_root readprofile renice script setsid swapoff swapon switch_root umount; do find "$(pwd)/util-linux-tmpdir" -name "$prog" -delete; done
+- cp -a "$(pwd)"/util-linux-tmpdir/* "$DESTDIR"