From 52d1456864d710b211eeb5d5b4c5f7fdc7b8fc8c Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Thu, 15 Jan 2015 16:41:00 +0000
Subject: Disable busybox lspci

We will use the pciutils lspci
---
 strata/build-essential/busybox.morph | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit v1.2.1


From 44b4d49c5133b4f4131af740addcdb05e9b42534 Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Thu, 15 Jan 2015 15:57:38 +0000
Subject: Pass PREFIX to make

Makes lpsci look in the right place for the pci.ids file
---
 strata/foundation/pciutils.morph | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/strata/foundation/pciutils.morph b/strata/foundation/pciutils.morph
index 8ca13bad..8badd8b5 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
+- make PREFIX="$PREFIX" ZLIB=no lib/config.mk
 - echo PREFIX=$PREFIX >>lib/config.mk
 - echo MANDIR=$PREFIX/share/man >>lib/config.mk
 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
-- 
cgit v1.2.1


From 2b609617679ca72f33cd7ec338736ce1250c53ca Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Thu, 15 Jan 2015 15:58:21 +0000
Subject: Quote variables

---
 strata/foundation/pciutils.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strata/foundation/pciutils.morph b/strata/foundation/pciutils.morph
index 8badd8b5..eb8f11c0 100644
--- a/strata/foundation/pciutils.morph
+++ b/strata/foundation/pciutils.morph
@@ -2,8 +2,8 @@ name: pciutils
 kind: chunk
 configure-commands:
 - make PREFIX="$PREFIX" ZLIB=no lib/config.mk
-- echo PREFIX=$PREFIX >>lib/config.mk
-- echo MANDIR=$PREFIX/share/man >>lib/config.mk
+- echo PREFIX="$PREFIX" >>lib/config.mk
+- echo MANDIR="$PREFIX/share/man" >>lib/config.mk
 build-commands:
 - make PREFIX="$PREFIX"
 install-commands:
-- 
cgit v1.2.1


From 3a791948120ef630d2f5ac9861982850af4378fd Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Thu, 15 Jan 2015 15:51:28 +0000
Subject: Add comment to configure command

At first glance this might seem redundant since the makefile defaults
to share/man if the directory is already present
---
 strata/foundation/pciutils.morph | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strata/foundation/pciutils.morph b/strata/foundation/pciutils.morph
index eb8f11c0..03bd4a23 100644
--- a/strata/foundation/pciutils.morph
+++ b/strata/foundation/pciutils.morph
@@ -3,7 +3,7 @@ kind: chunk
 configure-commands:
 - make PREFIX="$PREFIX" ZLIB=no lib/config.mk
 - echo PREFIX="$PREFIX" >>lib/config.mk
-- echo MANDIR="$PREFIX/share/man" >>lib/config.mk
+- echo MANDIR="$PREFIX/share/man" >>lib/config.mk  # ensure manpages are always installed in share/man
 build-commands:
 - make PREFIX="$PREFIX"
 install-commands:
-- 
cgit v1.2.1