diff options
-rw-r--r-- | strata/bsp-openwrt/nasm.morph (renamed from strata/bsp-openwrt/nasm-wrt.morph) | 2 | ||||
-rw-r--r-- | strata/bsp-openwrt/syslinux.morph (renamed from strata/bsp-openwrt/syslinux-wrt.morph) | 2 | ||||
-rw-r--r-- | strata/bsp-x86_64-openwrt.morph | 18 | ||||
-rw-r--r-- | strata/bsp-x86_64-openwrt/kmod-no-python.morph (renamed from strata/bsp-x86_64-openwrt/kmod-wrt.morph) | 2 | ||||
-rw-r--r-- | strata/core-wrt.morph | 2 | ||||
-rw-r--r-- | strata/core/bison-wrt.morph | 6 | ||||
-rw-r--r-- | strata/coreutils-common-wrt.morph (renamed from strata/coreutils-common-musl.morph) | 8 | ||||
-rw-r--r-- | strata/coreutils-common-wrt/coreutils.morph (renamed from strata/coreutils-common/coreutils-musl.morph) | 2 | ||||
-rw-r--r-- | strata/coreutils-common-wrt/diff.morph (renamed from strata/coreutils-common/diff-musl.morph) | 0 | ||||
-rw-r--r-- | strata/coreutils-common-wrt/sed.morph (renamed from strata/coreutils-common/sed-musl.morph) | 0 | ||||
-rw-r--r-- | strata/coreutils-common-wrt/tar.morph | 18 |
11 files changed, 36 insertions, 24 deletions
diff --git a/strata/bsp-openwrt/nasm-wrt.morph b/strata/bsp-openwrt/nasm.morph index f7b92066..0ab1a629 100644 --- a/strata/bsp-openwrt/nasm-wrt.morph +++ b/strata/bsp-openwrt/nasm.morph @@ -1,4 +1,4 @@ -name: nasm-wrt +name: nasm kind: chunk build-system: autotools install-commands: diff --git a/strata/bsp-openwrt/syslinux-wrt.morph b/strata/bsp-openwrt/syslinux.morph index 18539f28..4570865b 100644 --- a/strata/bsp-openwrt/syslinux-wrt.morph +++ b/strata/bsp-openwrt/syslinux.morph @@ -1,4 +1,4 @@ -name: syslinux-wrt +name: syslinux kind: chunk products: - artifact: syslinux-devel diff --git a/strata/bsp-x86_64-openwrt.morph b/strata/bsp-x86_64-openwrt.morph index 04a60e3a..6a48d2d3 100644 --- a/strata/bsp-x86_64-openwrt.morph +++ b/strata/bsp-x86_64-openwrt.morph @@ -3,10 +3,10 @@ kind: stratum description: The set of platform specific components required for booting a 64-bit x86 based system. build-depends: -- morph: strata/coreutils-common-musl.morph +- morph: strata/coreutils-common-wrt.morph chunks: -- name: kmod-wrt - morph: strata/bsp-x86_64-openwrt/kmod-wrt.morph +- name: kmod-no-python + morph: strata/bsp-x86_64-openwrt/kmod-no-python.morph repo: upstream:kmod ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 unpetrify-ref: v18 @@ -16,16 +16,16 @@ chunks: ref: 39a8804455fb23f09157341d3ba7db6d7ae6ee76 unpetrify-ref: v4.0 build-depends: - - kmod-wrt -- name: nasm-wrt - morph: strata/bsp-openwrt/nasm-wrt.morph + - kmod-no-python +- name: nasm + morph: strata/bsp-openwrt/nasm.morph repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph -- name: syslinux-wrt - morph: strata/bsp-openwrt/syslinux-wrt.morph +- name: syslinux + morph: strata/bsp-openwrt/syslinux.morph repo: upstream:syslinux ref: de528dd1d9e1aa53cb484fe32706f9c8e4c2763c unpetrify-ref: baserock/4.06-musl build-depends: - - nasm-wrt + - nasm diff --git a/strata/bsp-x86_64-openwrt/kmod-wrt.morph b/strata/bsp-x86_64-openwrt/kmod-no-python.morph index 522a7a7b..df01158a 100644 --- a/strata/bsp-x86_64-openwrt/kmod-wrt.morph +++ b/strata/bsp-x86_64-openwrt/kmod-no-python.morph @@ -1,4 +1,4 @@ -name: kmod-wrt +name: kmod-no-python kind: chunk configure-commands: - rm -rf libkmod/docs diff --git a/strata/core-wrt.morph b/strata/core-wrt.morph index 1fa18616..dcda1633 100644 --- a/strata/core-wrt.morph +++ b/strata/core-wrt.morph @@ -138,7 +138,7 @@ chunks: - autoconf-tarball - automake - name: bison - morph: strata/core/bison-wrt.morph + morph: strata/core/bison.morph repo: upstream:bison ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308 unpetrify-ref: baserock/v3.0.2 diff --git a/strata/core/bison-wrt.morph b/strata/core/bison-wrt.morph deleted file mode 100644 index fb73c15d..00000000 --- a/strata/core/bison-wrt.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: bison-wrt -kind: chunk -build-system: autotools -pre-configure-commands: -- echo "3.0.2" > .tarball-version -- sh bootstrap --skip-po --no-git --gnulib-srcdir=gnulib diff --git a/strata/coreutils-common-musl.morph b/strata/coreutils-common-wrt.morph index 4e325284..7e9ae6a5 100644 --- a/strata/coreutils-common-musl.morph +++ b/strata/coreutils-common-wrt.morph @@ -1,4 +1,4 @@ -name: coreutils-common-musl +name: coreutils-common-wrt kind: stratum description: | We need to split this so we can build stuff using coreutils but we can not @@ -20,7 +20,7 @@ chunks: unpetrify-ref: baserock/v2.7.1 build-depends: [] - name: coreutils - morph: strata/coreutils-common/coreutils-musl.morph + morph: strata/coreutils-common-wrt/coreutils.morph repo: upstream:coreutils ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 @@ -28,14 +28,14 @@ chunks: - gperf - patch - name: sed - morph: strata/coreutils-common/sed-musl.morph + morph: strata/coreutils-common-wrt/sed.morph repo: upstream:sed ref: ed4b1d7c04f92b330b940d4f0d02cd51d2473ce9 unpetrify-ref: baserock/morph build-depends: - coreutils - name: diff - morph: strata/coreutils-common/diff-musl.morph + morph: strata/coreutils-common-wrt/diff.morph repo: upstream:diffutils ref: bd86eb1a1e87ab85a7c8dbb658fa829ce69c252e unpetrify-ref: baserock/v3.3 diff --git a/strata/coreutils-common/coreutils-musl.morph b/strata/coreutils-common-wrt/coreutils.morph index 5f624650..a7147bda 100644 --- a/strata/coreutils-common/coreutils-musl.morph +++ b/strata/coreutils-common-wrt/coreutils.morph @@ -1,4 +1,4 @@ -name: coreutils-musl +name: coreutils kind: chunk build-system: autotools configure-commands: diff --git a/strata/coreutils-common/diff-musl.morph b/strata/coreutils-common-wrt/diff.morph index 1fc46dc2..1fc46dc2 100644 --- a/strata/coreutils-common/diff-musl.morph +++ b/strata/coreutils-common-wrt/diff.morph diff --git a/strata/coreutils-common/sed-musl.morph b/strata/coreutils-common-wrt/sed.morph index 8565b0cf..8565b0cf 100644 --- a/strata/coreutils-common/sed-musl.morph +++ b/strata/coreutils-common-wrt/sed.morph diff --git a/strata/coreutils-common-wrt/tar.morph b/strata/coreutils-common-wrt/tar.morph new file mode 100644 index 00000000..17d6a597 --- /dev/null +++ b/strata/coreutils-common-wrt/tar.morph @@ -0,0 +1,18 @@ +name: tar +kind: chunk +build-system: autotools +pre-configure-commands: +- rm .gitmodules +- bash bootstrap --skip-po --gnulib-srcdir="$(pwd)/gnulib" --paxutils-srcdir="$(pwd)/paxutils" +configure-commands: +# Configure flag notes: +# 1. Needed to run configure as root +# 2. Disable some warning that cause the build to fail +# 3. To use GNU tar instead the busybox one. +# This will dissappear when we merge /usr/bin and /bin + +- | + `# [1]` env FORCE_UNSAFE_CONFIGURE=1 \ + ./configure --prefix="$PREFIX" \ + `# [2]` --disable-gcc-warnings \ + `# [3]` --bindir=/bin |