diff options
| -rw-r--r-- | clusters/release.morph | 2 | ||||
| -rw-r--r-- | strata/build-essential.morph | 4 | ||||
| -rw-r--r-- | strata/coreutils-common/tar.morph | 21 | ||||
| -rw-r--r-- | strata/tools/lsof.morph | 2 |
4 files changed, 18 insertions, 11 deletions
diff --git a/clusters/release.morph b/clusters/release.morph index f161d0df..8daf90b8 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -31,7 +31,7 @@ systems: DISK_SIZE: 6G - morph: systems/build-system-armv7lhf-jetson.morph deploy: - devel-system-armv7lhf-jetson: + build-system-armv7lhf-jetson: type: rawdisk location: build-system-armv7lhf-jetson.img DISK_SIZE: 2G diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 0758fee8..a4758a7f 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -163,8 +163,8 @@ chunks: - name: stage2-gawk morph: strata/build-essential/stage2-gawk.morph repo: upstream:gawk - ref: dc5af665700d9b04fdf9c18930526d28eef5d5d9 - unpetrify-ref: gawk-4.1.1 + ref: 925f9363c4b0a5bb9375298afcdcf404efb32587 + unpetrify-ref: gawk-4.1-stable build-depends: - stage1-binutils - stage1-gcc diff --git a/strata/coreutils-common/tar.morph b/strata/coreutils-common/tar.morph index 9219abeb..d9ee3a36 100644 --- a/strata/coreutils-common/tar.morph +++ b/strata/coreutils-common/tar.morph @@ -1,10 +1,17 @@ name: tar kind: chunk -configure-commands: +build-system: autotools +pre-configure-commands: - bash bootstrap --skip-po -- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin - --disable-nls --disable-gcc-warnings -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install +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 diff --git a/strata/tools/lsof.morph b/strata/tools/lsof.morph index 5fabcd64..38183ae6 100644 --- a/strata/tools/lsof.morph +++ b/strata/tools/lsof.morph @@ -1,7 +1,7 @@ name: lsof kind: chunk configure-commands: -- tar xf lsof_*_src.tar +- tar xf lsof_*_src.tar --no-same-owner - cd lsof_*_src/ && ./Configure -n linux build-commands: - cd lsof_*_src/ && make |