diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-07-31 10:13:45 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-07-31 11:22:47 +0100 |
| commit | 9e361f0efc08948718c49aee2488fa9210a3c9b7 (patch) | |
| tree | 9c41dd72a61bdf45adc5b01d7d3f8e55b0de43d6 | |
| parent | 12ed1c6aa9f5c2563095af434cb036259d4cc419 (diff) | |
| download | util-linux-baserock/jonathan/fix-util-linux.tar.gz | |
Stop util-linux install removing files from DESTDIRbaserock/jonathan/fix-util-linux
When building baserock with cross-bootstrap, util-linux can
cause problems because it deletes files from DESTDIR, since
in cross-bootstrap builds, it does not build in a staging area.
This fixes that problem by having it install to a temporary directory,
delete the files as desired, then installs the remaining files to
DESTDIR
| -rw-r--r-- | util-linux.morph | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/util-linux.morph b/util-linux.morph index 034b2beea..2a17a79e2 100644 --- a/util-linux.morph +++ b/util-linux.morph @@ -7,7 +7,8 @@ "./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" + "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\"" ] } |