diff options
Diffstat (limited to 'strata')
| -rw-r--r-- | strata/build-essential/busybox.morph | 1 | ||||
| -rw-r--r-- | strata/devtools.morph | 32 | ||||
| -rw-r--r-- | strata/devtools/screen.morph (renamed from strata/tools/screen.morph) | 0 | ||||
| -rw-r--r-- | strata/devtools/vim.morph (renamed from strata/tools/vim.morph) | 0 | ||||
| -rw-r--r-- | strata/foundation/pciutils.morph | 12 | ||||
| -rw-r--r-- | strata/tools.morph | 24 |
6 files changed, 40 insertions, 29 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/devtools.morph b/strata/devtools.morph new file mode 100644 index 00000000..73ebd783 --- /dev/null +++ b/strata/devtools.morph @@ -0,0 +1,32 @@ +name: devtools +kind: stratum +description: | + Extra development tools included in the devel system, this stratum + is here to help reduce unnecessary building, chunks added to this + stratum should not have any dependants (please don't build-depend on this + stratum) +build-depends: +- morph: strata/foundation.morph +chunks: +- name: vim + morph: strata/devtools/vim.morph + repo: upstream:vim + ref: 07c2c06799e0579e6bfb1a7d98acf38e36a98f79 + unpetrify-ref: baserock/morph + build-depends: [] +- name: pv + repo: upstream:pv + ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a + unpetrify-ref: baserock/morph + build-depends: [] +- name: screen + morph: strata/devtools/screen.morph + repo: upstream:screen + ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467 + unpetrify-ref: baserock/morph + build-depends: [] +- name: less + repo: upstream:less + ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 + unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/tools/screen.morph b/strata/devtools/screen.morph index 0b23c5d4..0b23c5d4 100644 --- a/strata/tools/screen.morph +++ b/strata/devtools/screen.morph diff --git a/strata/tools/vim.morph b/strata/devtools/vim.morph index 58e1403f..58e1403f 100644 --- a/strata/tools/vim.morph +++ b/strata/devtools/vim.morph 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 diff --git a/strata/tools.morph b/strata/tools.morph index d43ad549..fea33132 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -1,6 +1,6 @@ name: tools kind: stratum -description: Extra development tools included in the devel system +description: Various tools build-depends: - morph: strata/foundation.morph chunks: @@ -27,11 +27,6 @@ chunks: ref: c4bf5268b1a32ec475b61d2fe90e9218780c03c8 unpetrify-ref: baserock/morph build-depends: [] -- name: less - repo: upstream:less - ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 - unpetrify-ref: baserock/morph - build-depends: [] - name: linux-user-chroot repo: upstream:linux-user-chroot ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b @@ -43,11 +38,6 @@ chunks: ref: fffb8558208586338587027c265fd0eca44466be unpetrify-ref: baserock/morph build-depends: [] -- name: pv - repo: upstream:pv - ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a - unpetrify-ref: baserock/morph - build-depends: [] - name: rsync morph: strata/tools/rsync.morph repo: upstream:rsync @@ -65,18 +55,6 @@ chunks: ref: 4e4a02c03445336237b36723b23a91670ef7621b unpetrify-ref: baserock/bootstrap build-depends: [] -- name: vim - morph: strata/tools/vim.morph - repo: upstream:vim - ref: 592b8c975bf83b4dcf608769bc664a80cb1daf9e - unpetrify-ref: baserock/morph - build-depends: [] -- name: screen - morph: strata/tools/screen.morph - repo: upstream:screen - ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467 - unpetrify-ref: baserock/morph - build-depends: [] - name: u-boot morph: strata/tools/u-boot.morph repo: upstream:u-boot |