diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-01-22 18:27:02 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-01-22 18:27:02 +0000 |
commit | eaf31937a6c16adac30e5c8ba71d457336b5df0d (patch) | |
tree | b98f6887154cc80bdcecd50ec3d790fb148751e2 | |
parent | 904adf511bf2682bc8bef01de83191349dce2516 (diff) | |
parent | 3a791948120ef630d2f5ac9861982850af4378fd (diff) | |
download | definitions-eaf31937a6c16adac30e5c8ba71d457336b5df0d.tar.gz |
Merge branch 'baserock/richardipsum/lspci-fix-v2'
Reviewed by:
Sam Thursfield <sam.thursfield@codethink.co.uk>
Richard Maw <richard.maw@gmail.com>
-rw-r--r-- | strata/build-essential/busybox.morph | 1 | ||||
-rw-r--r-- | strata/foundation/pciutils.morph | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph index 35f57357..85327648 100644 --- a/strata/build-essential/busybox.morph +++ b/strata/build-essential/busybox.morph @@ -41,6 +41,7 @@ configure-commands: - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config - sed -e 's/CONFIG_LOSETUP=y.*/# CONFIG_LOSETUP is not set/' -i .config - sed -e 's/CONFIG_LSUSB=y.*/# CONFIG_LSUSB is not set/' -i .config +- sed -e 's/CONFIG_LSPCI=y.*/# CONFIG_LSPCI is not set/' -i .config - sed -e 's/CONFIG_LZMA=y.*/# CONFIG_LZMA is not set/' -i .config - sed -e 's/CONFIG_MKFS_EXT2=y.*/# CONFIG_MKFS_EXT2 is not set/' -i .config - sed -e 's/CONFIG_MKFS_MINIX=y.*/# CONFIG_MKFS_MINIX is not set/' -i .config diff --git a/strata/foundation/pciutils.morph b/strata/foundation/pciutils.morph index 8ca13bad..03bd4a23 100644 --- a/strata/foundation/pciutils.morph +++ b/strata/foundation/pciutils.morph @@ -1,11 +1,11 @@ name: pciutils kind: chunk configure-commands: -- make ZLIB=no lib/config.mk -- echo PREFIX=$PREFIX >>lib/config.mk -- echo MANDIR=$PREFIX/share/man >>lib/config.mk +- make PREFIX="$PREFIX" ZLIB=no lib/config.mk +- echo PREFIX="$PREFIX" >>lib/config.mk +- echo MANDIR="$PREFIX/share/man" >>lib/config.mk # ensure manpages are always installed in share/man build-commands: -- make +- make PREFIX="$PREFIX" install-commands: -- make DESTDIR="$DESTDIR" install -- make DESTDIR="$DESTDIR" install-lib +- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install +- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install-lib |