From b4315fc7b440f6d36497e8eaa05717b577a84575 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 3 Feb 2015 12:36:33 +0000 Subject: Update morph ref --- strata/cross-bootstrap.morph | 2 +- strata/morph-utils.morph | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 9687ac7e..59400940 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -74,7 +74,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: 67afd098cd297b769b1341a460d160a2902ba4e4 + ref: 954baf68b9bb7f8bc4fae2447ef16f37928ff01c unpetrify-ref: master build-depends: - cliapp diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 4e28f48a..1645bfed 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -72,7 +72,7 @@ chunks: build-depends: [] - name: morph repo: baserock:baserock/morph - ref: f0c5d4c0ef35cc43aa059cd2255e41c60c4cac77 + ref: 954baf68b9bb7f8bc4fae2447ef16f37928ff01c unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From 9afc895e3a05f81cbe30953759dbc904c01703a9 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 3 Feb 2015 18:11:23 +0000 Subject: Update gawk to 4.1.1 --- strata/build-essential.morph | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/strata/build-essential.morph b/strata/build-essential.morph index ae2d24b6..205d76bc 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: 6a0eb04c3d2ac24d80d505b42a8f67799487d133 - unpetrify-ref: baserock/build-essential + ref: dc5af665700d9b04fdf9c18930526d28eef5d5d9 + unpetrify-ref: gawk-4.1.1 build-depends: - stage1-binutils - stage1-gcc @@ -308,8 +308,8 @@ chunks: - name: gawk morph: strata/build-essential/gawk.morph repo: upstream:gawk - ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133 - unpetrify-ref: baserock/build-essential + ref: dc5af665700d9b04fdf9c18930526d28eef5d5d9 + unpetrify-ref: gawk-4.1.1 build-depends: - stage2-binutils - stage2-busybox -- cgit v1.2.1 From dd5e33890518d1292553bb9f446d703bc1b332d2 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Wed, 4 Feb 2015 11:07:51 +0000 Subject: Update to Make 4.1 --- strata/build-essential.morph | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 205d76bc..9884d29d 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -174,9 +174,9 @@ chunks: - name: stage2-make morph: strata/build-essential/stage2-make.morph - repo: upstream:make - ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba - unpetrify-ref: baserock/build-essential + repo: upstream:make-tarball + ref: f75919b038da8a28388a911303fb86ed7a70ea2c + unpetrify-ref: make-4.1 build-depends: - stage1-binutils - stage1-gcc @@ -360,9 +360,9 @@ chunks: - name: make morph: strata/build-essential/make.morph - repo: upstream:make - ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba - unpetrify-ref: baserock/build-essential + repo: upstream:make-tarball + ref: f75919b038da8a28388a911303fb86ed7a70ea2c + unpetrify-ref: make-4.1 build-depends: - stage2-binutils - stage2-busybox -- cgit v1.2.1 From 6326dbb8ed8533d216398f384bce8d9e6fc1a7ee Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 3 Feb 2015 17:22:20 +0000 Subject: Update to gdbm 1.11 --- strata/core.morph | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index d60e3baf..143975e6 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -18,9 +18,9 @@ chunks: build-depends: [] - name: gdbm morph: strata/core/gdbm.morph - repo: upstream:gdbm - ref: 51871d08a48ff781186f7a7b22ec69a1db38eb4c - unpetrify-ref: baserock/build-essential + repo: upstream:gdbm-tarball + ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48 + unpetrify-ref: gdbm-1.11 build-depends: [] - name: gettext-tarball morph: strata/core/gettext-tarball.morph -- cgit v1.2.1 From df1f993888c60aeb376c386edb5f2207728b3ed5 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Mon, 9 Feb 2015 11:53:33 +0000 Subject: Update to ncurses 5.9-20150131 The new ref points to a tarball import which contains the machinery to build on aarch64. This commit also moves the contents of the ncurses-morph-postinstall.sh script to the chunk morph to avoid having a delta. --- strata/core.morph | 4 ++-- strata/core/ncurses.morph | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 143975e6..9d60c250 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -37,8 +37,8 @@ chunks: - name: ncurses morph: strata/core/ncurses.morph repo: upstream:ncurses - ref: 0fe89dc66ec061b839bea3ab451207e2dee757b9 - unpetrify-ref: baserock/morph + ref: f67398afa6a76fbc902cc0cea963d5151fa2a953 + unpetrify-ref: ncurses-5.9-20150131 build-depends: [] - name: perl morph: strata/core/perl.morph diff --git a/strata/core/ncurses.morph b/strata/core/ncurses.morph index c75495bc..42acb481 100644 --- a/strata/core/ncurses.morph +++ b/strata/core/ncurses.morph @@ -6,4 +6,40 @@ build-commands: - make install-commands: - make DESTDIR="$DESTDIR" install -- sh ncurses-morph-postinstall.sh +post-install-commands: +- | + # lfs recommends some alterations for software that looks for + # libcurses instead of libncurses + # it's more convenient to have this in a separate file than the + # morph as less strings have to be escaped and comments are possible + + # some software expects to find libcurses in /lib + mkdir -p "$DESTDIR/lib" + mv "$DESTDIR"/"$PREFIX"/lib/libncursesw.so.5* "$DESTDIR"/lib + ln -sf ../../lib/libncursesw.so.5 "$DESTDIR"/"$PREFIX"/lib/libncursesw.so + + # some linker tricks for libraries that look for non-wide character + # versions of ncurses + for lib in ncurses form panel menu; do + # remove non-wide shared object + rm -f "$DESTDIR/${PREFIX}/lib/lib${lib}.so" + # use a linker script to find the wide character variant + echo "INPUT(-l${lib}w)" >"$DESTDIR/${PREFIX}/lib/lib${lib}.so" + # symlink the non-shared library + ln -sf "lib${lib}w.a" "$DESTDIR/${PREFIX}/lib/lib${lib}.a" + done + ln -sf libncurses++w.a "$DESTDIR/${PREFIX}/lib/libncurses++.a" + + # redirect software that looks for libcurses + rm -f "$DESTDIR/${PREFIX}/lib/libcursesw.so" + echo "INPUT(-lncursesw)" >"$DESTDIR/${PREFIX}/lib/libcursesw.so" + ln -sf libncurses.so "$DESTDIR/${PREFIX}/lib/libcurses.so" + ln -sf libncursesw.a "$DESTDIR/${PREFIX}/lib/libcursesw.a" + ln -sf libncurses.a "$DESTDIR/${PREFIX}/lib/libcurses.a" + + # install documentation + mkdir -p "$DESTDIR/${PREFIX}/share/doc/ncurses" + cp -R doc/* "$DESTDIR/${PREFIX}/share/doc/ncurses" + + # remove 'clear' and 'reset' executables, busybox provides them + rm -f "$DESTDIR/${PREFIX}/bin/clear" "$DESTDIR/${PREFIX}/bin/reset" -- cgit v1.2.1 From 9b235754effaea3b32cc34b0f74496c462fdb124 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 3 Feb 2015 17:19:40 +0000 Subject: Update to texinfo 5.2 --- strata/core.morph | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 9d60c250..ce6d5eb1 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -50,10 +50,11 @@ chunks: - name: texinfo-tarball morph: strata/core/texinfo-tarball.morph repo: upstream:texinfo-tarball - ref: 4843a7f5ff14ac802a56f1cdd49960b25c15702b - unpetrify-ref: baserock/morph + ref: 6a55f074b1f67d02149c13931eb1df9f0e539b15 + unpetrify-ref: texinfo-5.2 build-depends: - ncurses + - perl - name: autoconf-tarball morph: strata/core/autoconf-tarball.morph repo: upstream:autoconf-tarball -- cgit v1.2.1 From fd64ef32214ceb05f89c51073e3a4673fb0c32aa Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Wed, 4 Feb 2015 10:08:53 +0000 Subject: Update to libexpat 2.0.1 Also change the build system to cmake, as the autotools based one doesn't seem to work with the current automake version. --- strata/core.morph | 8 +++----- strata/core/libexpat.morph | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index ce6d5eb1..5b84f011 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -168,12 +168,10 @@ chunks: - name: libexpat morph: strata/core/libexpat.morph repo: upstream:libexpat - ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c - unpetrify-ref: baserock/morph + ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f + unpetrify-ref: R_2_1_0 build-depends: - - autoconf-tarball - - automake - - libtool-tarball + - cmake - name: XML-Parser repo: upstream:XML-Parser ref: e1a3ec157140a699e3020836475a0df622f70f1b diff --git a/strata/core/libexpat.morph b/strata/core/libexpat.morph index 1e0fe696..b36a67aa 100644 --- a/strata/core/libexpat.morph +++ b/strata/core/libexpat.morph @@ -1,9 +1,8 @@ name: libexpat kind: chunk configure-commands: -- autoreconf -i -- ./configure --prefix="${PREFIX-/usr}" +- mkdir o && cd o && cmake -DCMAKE_INSTALL_PREFIX=/usr .. build-commands: -- make +- cd o && make install-commands: -- make DESTDIR="$DESTDIR" install +- cd o && make DESTDIR="$DESTDIR" install -- cgit v1.2.1 From 8341dc6db33d80ef167f05ac3fb03545eec8cec6 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Mon, 9 Feb 2015 14:52:07 +0000 Subject: Update to groff 1.22.3 --- strata/cross-bootstrap.morph | 6 +++--- strata/cross-bootstrap/groff.morph | 2 ++ strata/foundation.morph | 6 +++--- strata/foundation/groff.morph | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 59400940..435987da 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -11,9 +11,9 @@ chunks: build-depends: [] - name: groff morph: strata/cross-bootstrap/groff.morph - repo: upstream:groff - ref: c7017a099f954bb6de60e79c876935b1bf438b9a - unpetrify-ref: baserock/morph + repo: upstream:groff-git + ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 + unpetrify-ref: 1.22.3 build-depends: [] - name: openssh morph: strata/cross-bootstrap/openssh.morph diff --git a/strata/cross-bootstrap/groff.morph b/strata/cross-bootstrap/groff.morph index fed35b7d..8380a9cc 100644 --- a/strata/cross-bootstrap/groff.morph +++ b/strata/cross-bootstrap/groff.morph @@ -4,6 +4,8 @@ max-jobs: 1 configure-commands: - PAGE=A4 ./configure --prefix="$PREFIX" build-commands: +# hack to avoid a netpbm dependency +- touch doc/gnu.eps - make install-commands: - make DESTDIR="$DESTDIR" install diff --git a/strata/foundation.morph b/strata/foundation.morph index 245f5c2c..b11c3d61 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -12,9 +12,9 @@ chunks: build-depends: [] - name: groff morph: strata/foundation/groff.morph - repo: upstream:groff - ref: c7017a099f954bb6de60e79c876935b1bf438b9a - unpetrify-ref: baserock/morph + repo: upstream:groff-git + ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 + unpetrify-ref: 1.22.3 build-depends: [] - name: kmod morph: strata/foundation/kmod.morph diff --git a/strata/foundation/groff.morph b/strata/foundation/groff.morph index fed35b7d..8380a9cc 100644 --- a/strata/foundation/groff.morph +++ b/strata/foundation/groff.morph @@ -4,6 +4,8 @@ max-jobs: 1 configure-commands: - PAGE=A4 ./configure --prefix="$PREFIX" build-commands: +# hack to avoid a netpbm dependency +- touch doc/gnu.eps - make install-commands: - make DESTDIR="$DESTDIR" install -- cgit v1.2.1 From e06fe833b9c1867092dbebd03fdfcb9c895b5c6c Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 3 Feb 2015 17:58:01 +0000 Subject: Update to lzo 2.08 --- strata/foundation.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/foundation.morph b/strata/foundation.morph index b11c3d61..39a8a2d4 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -106,8 +106,8 @@ chunks: - name: lzo morph: strata/foundation/lzo.morph repo: upstream:lzo - ref: 2cdfe9375f1145603d002c12be950062ae54da21 - unpetrify-ref: baserock/morph + ref: 5cca83e4d1b0be5825a597ab24ffa6126dc0bc95 + unpetrify-ref: lzo-2.08 build-depends: [] - name: fuse morph: strata/foundation/fuse.morph -- cgit v1.2.1 From 46556e1eee677db03ca66488b3c88cb46cf0653b Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Sat, 7 Feb 2015 17:28:37 +0000 Subject: Point fuse to a ref that builds on aarch64 --- strata/foundation.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/foundation.morph b/strata/foundation.morph index 39a8a2d4..5ba90b67 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -112,8 +112,8 @@ chunks: - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse - ref: 4163109fd5bfe67973262610dd95ae60888c92e9 - unpetrify-ref: fuse_2_9_bugfix + ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8 + unpetrify-ref: baserock/tiagogomes/armv8l64 build-depends: [] - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph -- cgit v1.2.1 From 9979c36b008d1803d90fb4dfe849233b28b03196 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 10 Feb 2015 17:51:01 +0000 Subject: Update to openssh 6.7 The ref points to a tip which also includes the commits 37a2376 and 782fe9e, cherry-picked from the commits a2e654f and 91e7ac9 in the old repo. --- strata/cross-bootstrap.morph | 6 +++--- strata/foundation.morph | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 435987da..ac6660f6 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -17,9 +17,9 @@ chunks: build-depends: [] - name: openssh morph: strata/cross-bootstrap/openssh.morph - repo: upstream:openssh - ref: 233514106dcde5ac61a70f1043de563122e2f1c9 - unpetrify-ref: baserock/morph + repo: upstream:openssh-git + ref: 782fe9e725243eeb5ad6ab9a1783b5d6bedfe0d7 + unpetrify-ref: baserock/tiagogomes/armv8l64 build-depends: - groff - name: python-ttystatus diff --git a/strata/foundation.morph b/strata/foundation.morph index 5ba90b67..dd89bac1 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -138,9 +138,9 @@ chunks: build-depends: [] - name: openssh morph: strata/foundation/openssh.morph - repo: upstream:openssh - ref: 233514106dcde5ac61a70f1043de563122e2f1c9 - unpetrify-ref: baserock/morph + repo: upstream:openssh-git + ref: 782fe9e725243eeb5ad6ab9a1783b5d6bedfe0d7 + unpetrify-ref: baserock/tiagogomes/armv8l64 build-depends: - groff - name: tbdiff -- cgit v1.2.1 From 57ce68fea03e8985888ab2a875f5efbc79d7b07a Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Wed, 4 Feb 2015 14:58:47 +0000 Subject: Update to btrfs-progs v3.18.2 acl and e2fsprogs are new dependencies of btrfs-progs. --- strata/foundation.morph | 19 +++++++++++++++++-- strata/foundation/acl.morph | 4 ++++ strata/foundation/btrfs-progs.morph | 4 ++-- strata/foundation/e2fsprogs.morph | 21 +++++++++++++++++++++ strata/tools.morph | 6 ------ strata/tools/e2fsprogs.morph | 21 --------------------- 6 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 strata/foundation/acl.morph create mode 100644 strata/foundation/e2fsprogs.morph delete mode 100644 strata/tools/e2fsprogs.morph diff --git a/strata/foundation.morph b/strata/foundation.morph index dd89bac1..55a8edd9 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -115,14 +115,29 @@ chunks: ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8 unpetrify-ref: baserock/tiagogomes/armv8l64 build-depends: [] +- name: acl + morph: strata/foundation/acl.morph + repo: upstream:acl + ref: f13e09bd54fd4a501c4952f002ed2752bdd9f93b + unpetrify-ref: v2.2.52 + build-depends: + - attr +- name: e2fsprogs + morph: strata/foundation/e2fsprogs.morph + repo: upstream:e2fsprogs + ref: 6a3741ad293031447b95b88431eafa77401a8987 + unpetrify-ref: v1.42.12 + build-depends: [] - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph repo: upstream:btrfs-progs - ref: 304f215abb836811e6d78e0a3da53d48aa0e7ca7 - unpetrify-ref: baserock/morph + ref: 563ff3b07d85517e3589a1f2e6f45a8265e3f071 + unpetrify-ref: v3.18.2 build-depends: - attr + - acl - lzo + - e2fsprogs - name: dbus morph: strata/foundation/dbus.morph repo: upstream:dbus diff --git a/strata/foundation/acl.morph b/strata/foundation/acl.morph new file mode 100644 index 00000000..4489f5d5 --- /dev/null +++ b/strata/foundation/acl.morph @@ -0,0 +1,4 @@ +name: acl +kind: chunk +install-commands: +- make DESTDIR="$DESTDIR" install-dev diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.morph index 356c3f06..d5cb83f0 100644 --- a/strata/foundation/btrfs-progs.morph +++ b/strata/foundation/btrfs-progs.morph @@ -1,6 +1,6 @@ name: btrfs-progs kind: chunk build-commands: -- make +- make DISABLE_DOCUMENTATION=1 install-commands: -- make DESTDIR="$DESTDIR" prefix="$PREFIX" install +- make DESTDIR="$DESTDIR" prefix="$PREFIX" DISABLE_DOCUMENTATION=1 install diff --git a/strata/foundation/e2fsprogs.morph b/strata/foundation/e2fsprogs.morph new file mode 100644 index 00000000..a57eb15a --- /dev/null +++ b/strata/foundation/e2fsprogs.morph @@ -0,0 +1,21 @@ +name: e2fsprogs +kind: chunk +build-system: autotools +configure-commands: +# Configure with the usual paths for binaries and config +# but also disable whatever we can that is already provided by util-linux +# Disabling e2fsprofs' libblkid does not work, but we don't have to +# install it. +- | + ./configure --prefix="$PREFIX" --sysconfdir=/etc \ + --disable-libuuid --disable-uuidd --disable-fsck --disable-libblkid +install-commands: +# e2fsprogs also includes tools that are provided by util-linux, so we +# need to selectively exclude them. Removing them directly from DESTDIR +# causes problems, so we need to remove them beforehand. +- | + td="$(mktemp -d)" + make DESTDIR="$td" install-libs + find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete + find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete + mv "$td"/* "$DESTDIR" diff --git a/strata/tools.morph b/strata/tools.morph index 4d8c3f44..1f2e9cde 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -10,12 +10,6 @@ chunks: ref: c9691a9604fdf9d6711204999787d332b7141692 unpetrify-ref: baserock/morph build-depends: [] -- name: e2fsprogs - morph: strata/tools/e2fsprogs.morph - repo: upstream:e2fsprogs - ref: 6a3741ad293031447b95b88431eafa77401a8987 - unpetrify-ref: v1.42.12 - build-depends: [] - name: file repo: upstream:file ref: 3b49db406667ee7189b9ea69b9d9e0bdcc43c5b7 diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph deleted file mode 100644 index 801f8abe..00000000 --- a/strata/tools/e2fsprogs.morph +++ /dev/null @@ -1,21 +0,0 @@ -name: e2fsprogs -kind: chunk -build-system: autotools -configure-commands: -# Configure with the usual paths for binaries and config -# but also disable whatever we can that is already provided by util-linux -# Disabling e2fsprofs' libblkid does not work, but we don't have to -# install it. -- | - ./configure --prefix="$PREFIX" --sysconfdir=/etc \ - --disable-libuuid --disable-uuidd --disable-fsck -install-commands: -# e2fsprogs also includes tools that are provided by util-linux, so we -# need to selectively exclude them. Removing them directly from DESTDIR -# causes problems, so we need to remove them beforehand. -- | - td="$(mktemp -d)" - make DESTDIR="$td" install - find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete - find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete - mv "$td"/* "$DESTDIR" -- cgit v1.2.1 From 26ab8d7b859f8a1ecb774fb531c57af57c21f45c Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 3 Feb 2015 17:55:28 +0000 Subject: Update to file 5.22 --- strata/tools.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/tools.morph b/strata/tools.morph index 1f2e9cde..d5018be0 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -12,8 +12,8 @@ chunks: build-depends: [] - name: file repo: upstream:file - ref: 3b49db406667ee7189b9ea69b9d9e0bdcc43c5b7 - unpetrify-ref: baserock/morph + ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 + unpetrify-ref: file-5.22 build-depends: [] - name: gdb morph: strata/tools/gdb.morph -- cgit v1.2.1 From 2e591065535fba7607025de9788ea3fd319a0bd3 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Thu, 5 Feb 2015 17:31:50 +0000 Subject: Update to gdb 7.8.2 --- strata/tools.morph | 6 +++--- strata/tools/gdb.morph | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/strata/tools.morph b/strata/tools.morph index d5018be0..af50662c 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -17,9 +17,9 @@ chunks: build-depends: [] - name: gdb morph: strata/tools/gdb.morph - repo: upstream:gdb - ref: c4bf5268b1a32ec475b61d2fe90e9218780c03c8 - unpetrify-ref: baserock/morph + repo: upstream:binutils-gdb + ref: 129ee12d013f4a2f09fe40a33072e6e47e949890 + unpetrify-ref: gdb-7.8-branch build-depends: [] - name: linux-user-chroot repo: upstream:linux-user-chroot diff --git a/strata/tools/gdb.morph b/strata/tools/gdb.morph index 8b82b9d9..808ff7d7 100644 --- a/strata/tools/gdb.morph +++ b/strata/tools/gdb.morph @@ -2,4 +2,4 @@ name: gdb kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --disable-werror +- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils --disable-ld --disable-gold --disable-gprof -- cgit v1.2.1 From 93d3dc2fa0f92786d5c290fa8cf5679813cafc97 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Mon, 9 Feb 2015 12:28:55 +0000 Subject: Update to rsync 3.1.1 --- strata/cross-bootstrap.morph | 4 ++-- strata/tools.morph | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index ac6660f6..3c7fabe7 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -84,6 +84,6 @@ chunks: - name: rsync morph: strata/cross-bootstrap/rsync.morph repo: upstream:rsync - ref: 9faf8e0ccff2755cd019ff64d8322226a214b013 - unpetrify-ref: baserock/morph + ref: 7cb0de6326c915a72253fd103dae93308031ec3f + unpetrify-ref: v3.1.1 build-depends: [] diff --git a/strata/tools.morph b/strata/tools.morph index af50662c..e0e45216 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -35,8 +35,8 @@ chunks: - name: rsync morph: strata/tools/rsync.morph repo: upstream:rsync - ref: 9faf8e0ccff2755cd019ff64d8322226a214b013 - unpetrify-ref: baserock/morph + ref: 7cb0de6326c915a72253fd103dae93308031ec3f + unpetrify-ref: v3.1.1 build-depends: [] - name: strace repo: upstream:strace -- cgit v1.2.1 From b8b874227cd8cfde88cf7fb34de6ea2209593cf0 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Thu, 5 Feb 2015 14:14:47 +0000 Subject: Update to strace 4.8 --- strata/tools.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/tools.morph b/strata/tools.morph index e0e45216..a1569709 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -40,8 +40,8 @@ chunks: build-depends: [] - name: strace repo: upstream:strace - ref: ad232c6aa0c2a07830d61dc4b9912478634b23b5 - unpetrify-ref: baserock/morph + ref: 6d8c0637e8dd0f65c667af33c612230552419db1 + unpetrify-ref: v4.8 build-depends: [] - name: vala-bootstrap morph: strata/tools/vala-bootstrap.morph -- cgit v1.2.1 From 61c731089f796a8607909c47e88bf89f6e52da13 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Fri, 6 Feb 2015 16:42:20 +0000 Subject: Point kexec-tools to a ref that builds on aarch64 This ref points to a tip which includes some commits written by people working at Linaro [1]. [1]: https://git.linaro.org/people/geoff.levand/kexec-tools.git --- strata/tools.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/tools.morph b/strata/tools.morph index a1569709..520e71b4 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -64,8 +64,8 @@ chunks: - name: kexec-tools morph: strata/tools/kexec-tools.morph repo: upstream:kexec-tools - ref: 9359b61ca44980d33c0bee42b9bb2e36e72835dd - unpetrify-ref: baserock/morph + ref: f4d1d2ad474e882df13418239aa3050673a844d7 + unpetrify-ref: baserock/tiagogomes/armv8l64 build-depends: [] - name: device-tree-compiler morph: strata/tools/device-tree-compiler.morph -- cgit v1.2.1 From 53af9fb64e9451d7bed88e7e97e8dc64a79af064 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Wed, 11 Feb 2015 11:08:54 +0000 Subject: Support installing the Linux headers for aarch64 systems Support installing the Linux headers for the morph armv8l64 and armb8b64 archs. --- strata/build-essential/linux-api-headers.morph | 2 ++ strata/build-essential/stage2-linux-api-headers.morph | 2 ++ 2 files changed, 4 insertions(+) diff --git a/strata/build-essential/linux-api-headers.morph b/strata/build-essential/linux-api-headers.morph index 0f7ce171..0cd61ce1 100644 --- a/strata/build-essential/linux-api-headers.morph +++ b/strata/build-essential/linux-api-headers.morph @@ -5,6 +5,8 @@ install-commands: case "$MORPH_ARCH" in armv7b|armv7l|armv7lhf) ARCH="arm" ;; + armv8l64|armv8b64) + ARCH="arm64" ;; x86_32) ARCH="i386" ;; x86_64) diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.morph index 50e1aaa5..b296408f 100644 --- a/strata/build-essential/stage2-linux-api-headers.morph +++ b/strata/build-essential/stage2-linux-api-headers.morph @@ -5,6 +5,8 @@ install-commands: case "$MORPH_ARCH" in armv7b|armv7l|armv7lhf) ARCH="arm" ;; + armv8l64|armv8b64) + ARCH="arm64" ;; x86_32) ARCH="i386" ;; x86_64) -- cgit v1.2.1 From 8f8df38eb9857710afd0b550cb863532b37a1593 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Wed, 11 Feb 2015 11:13:55 +0000 Subject: Regenerate config.{guess,sub} scripts Some packages have old config.guess and config.sub scripts which don't recognize the aarch64-linux-gnu GNU triplet. For some cases, it is enough to do a `autoreconfig -if` to update those scripts. However, this approach cannot be used because when the configure scripts are not compatible with the current automake, autoheader, aclocal and friends; or when the project doesn't use automake at all (it has Makefile.in files, but not Makefile.am files). For those cases, we copy the system config.guess and config.sub scripts installed by automake. --- strata/core.morph | 11 +++++++++-- strata/core/flex.morph | 2 ++ strata/core/nano.morph | 4 ++++ strata/core/readline.morph | 6 ++++++ strata/foundation/linux-pam.morph | 2 ++ strata/tools/distcc.morph | 6 +++++- strata/tools/vala-bootstrap.morph | 2 ++ 7 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 strata/core/nano.morph create mode 100644 strata/core/readline.morph diff --git a/strata/core.morph b/strata/core.morph index 5b84f011..0184de51 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -82,7 +82,9 @@ chunks: repo: upstream:flex ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf unpetrify-ref: baserock/build-essential - build-depends: [] + build-depends: + - automake + - gettext-tarball - name: openssl-new morph: strata/core/openssl-new.morph repo: upstream:openssl-new @@ -97,10 +99,12 @@ chunks: unpetrify-ref: baserock/morph build-depends: [] - name: readline + morph: strata/core/readline.morph repo: upstream:readline ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6 unpetrify-ref: baserock/genivi/baseline - build-depends: [] + build-depends: + - automake - name: cpython morph: strata/core/cpython.morph repo: upstream:cpython @@ -251,11 +255,14 @@ chunks: - libtool-tarball - pkg-config - name: nano + morph: strata/core/nano.morph repo: upstream:nano-tarball ref: 8b74abeb02c01ddc768c465a826360cf33cec063 unpetrify-ref: baserock/morph build-depends: - ncurses + - automake + - gettext-tarball - name: bc repo: upstream:bc-tarball ref: 0956d119432ff6a2e85bae1fa336df799cad70b0 diff --git a/strata/core/flex.morph b/strata/core/flex.morph index 7ca8f538..615bf79e 100644 --- a/strata/core/flex.morph +++ b/strata/core/flex.morph @@ -1,5 +1,7 @@ name: flex kind: chunk +pre-configure-commands: +- autoreconf -ivf configure-commands: - ./configure --prefix="$PREFIX" build-commands: diff --git a/strata/core/nano.morph b/strata/core/nano.morph new file mode 100644 index 00000000..6a55dc2d --- /dev/null +++ b/strata/core/nano.morph @@ -0,0 +1,4 @@ +name: nano +kind: chunk +pre-configure-commands: +- autoreconf -ivf diff --git a/strata/core/readline.morph b/strata/core/readline.morph new file mode 100644 index 00000000..511e124c --- /dev/null +++ b/strata/core/readline.morph @@ -0,0 +1,6 @@ +name: readline +kind: chunk +build-system: autotools +pre-configure-commands: +- cp /usr/share/automake*/config.guess support +- cp /usr/share/automake*/config.sub support diff --git a/strata/foundation/linux-pam.morph b/strata/foundation/linux-pam.morph index 27d0a8a3..0dfbe759 100644 --- a/strata/foundation/linux-pam.morph +++ b/strata/foundation/linux-pam.morph @@ -1,6 +1,8 @@ name: linux-pam kind: chunk build-system: autotools +pre-configure-commands: +- autoreconf -ivf post-install-commands: # sudo command is expecting this file. - | diff --git a/strata/tools/distcc.morph b/strata/tools/distcc.morph index 9f42b50e..82adbe50 100644 --- a/strata/tools/distcc.morph +++ b/strata/tools/distcc.morph @@ -1,6 +1,10 @@ name: distcc kind: chunk build-system: autotools -configure-commands: +pre-configure-commands: - NOCONFIGURE=1 ./autogen.sh +# distcc doesn't use automake, so we cannot autoreconf it +- cp /usr/share/automake*/config.guess . +- cp /usr/share/automake*/config.sub . +configure-commands: - ./configure --prefix="$PREFIX" --disable-Werror diff --git a/strata/tools/vala-bootstrap.morph b/strata/tools/vala-bootstrap.morph index c09299f6..e55b1887 100644 --- a/strata/tools/vala-bootstrap.morph +++ b/strata/tools/vala-bootstrap.morph @@ -1,5 +1,7 @@ name: vala-bootstrap kind: chunk build-system: autotools +pre-configure-commands: +- autoreconf -ivf configure-commands: - ./configure --prefix="$PREFIX" -- cgit v1.2.1 From 1b012d96c08bed47579dd79fc91177c566e7162a Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Wed, 4 Feb 2015 14:59:01 +0000 Subject: Add definitions to build armv8l64 systems Add definitions for building an armv8l64-based build system, and an armv8l64-based cross-bootstrap system. --- strata/bsp-armv8l64-generic.morph | 16 ++++ .../bsp-armv8l64-generic.morph | 104 +++++++++++++++++++++ systems/build-system-armv8l64.morph | 39 ++++++++ .../cross-bootstrap-system-armv8l64-generic.morph | 11 +++ 4 files changed, 170 insertions(+) create mode 100644 strata/bsp-armv8l64-generic.morph create mode 100644 strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph create mode 100644 systems/build-system-armv8l64.morph create mode 100644 systems/cross-bootstrap-system-armv8l64-generic.morph diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph new file mode 100644 index 00000000..7791fda3 --- /dev/null +++ b/strata/bsp-armv8l64-generic.morph @@ -0,0 +1,16 @@ +name: bsp-armv8l64-generic +kind: stratum +description: +- | + The set of platform specific components required for booting + armv8l64-based systems, like the 64-bit APM XGene ARM based m400 + Moonshot cartridge. +build-depends: +- morph: strata/core.morph +chunks: +- name: linux-armv8l64-generic + morph: strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph + repo: upstream:linux + ref: 5f06398ae6a04f414932243de38b5cf3d264ff84 + unpetrify-ref: baserock/danielsilverstone/m400 + build-depends: [] diff --git a/strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph new file mode 100644 index 00000000..120239b9 --- /dev/null +++ b/strata/bsp-armv8l64-generic/bsp-armv8l64-generic.morph @@ -0,0 +1,104 @@ +name: linux-armv8l64-generic +kind: chunk +configure-commands: +- make ARCH=arm64 defconfig +- scripts/config -e PACKET +- scripts/config -e SATA_AHCI +- scripts/config -e ATA_GENERIC +- scripts/config -e HAVE_IDE +- scripts/config -d BLK_DEV_IDE_SATA +- scripts/config -e BTRFS_FS +- scripts/config -e BTRFS_FS_POSIX_ACL +- scripts/config -e DEVTMPFS +- scripts/config -e DEVTMPFS_MOUNT +- scripts/config -e CONFIG_FHANDLE +- scripts/config -e CGROUPS +- scripts/config -e AUTOFS4_FS +- scripts/config --set-str UEVENT_HELPER_PATH '' +- scripts/config -e EXT2_FS +- scripts/config -e EXT2_FS_XATTR +- scripts/config -e EXT2_FS_POSIX_ACL +- scripts/config -e EXT2_FS_SECURITY +- scripts/config -e EXT2_FS_XIP +- scripts/config -e EXT3_FS +- scripts/config -d EXT3_DEFAULTS_TO_ORDERED +- scripts/config -e EXT3_FS_XATTR +- scripts/config -e EXT3_FS_POSIX_ACL +- scripts/config -e EXT3_FS_SECURITY +- scripts/config -e EXT4_FS +- scripts/config -e EXT4_FS_XATTR +- scripts/config -e EXT4_FS_POSIX_ACL +- scripts/config -e EXT4_FS_SECURITY +- scripts/config -d EXT4_DEBUG +- scripts/config -d JBD_DEBUG +- scripts/config -d JBD2_DEBUG +- scripts/config -e BLK_DEV_LOOP +- scripts/config -d BLK_DEV_CRYPTOLOOP +- scripts/config -e CEPH_FS +- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8 +- scripts/config -e VIRTIO +- scripts/config -e VIRTIO_RING +- scripts/config -e VIRTIO_PCI +- scripts/config -e VIRTIO_BALLOON +- scripts/config -e VIRTIO_BLK +- scripts/config -e VIRTIO_NET +- scripts/config -e VIRTIO_CONSOLE +- scripts/config -e HW_RANDOM_VIRTIO +- scripts/config -e 9P_FS +- scripts/config -e 9P_FSCACHE +- scripts/config -e 9P_FS_POSIX_ACL +- scripts/config -e NET_9P +- scripts/config -e NET_9P_VIRTIO +- scripts/config -e R8169 +- scripts/config -e 8139TOO +- scripts/config -e 8139CP +- scripts/config -e IKCONFIG +- scripts/config -e IKCONFIG_PROC +- scripts/config -e SECCOMP +- scripts/config -d DEBUG_STACK_TRACE +- scripts/config -e NFSD +- scripts/config -e NFSD_V3 +- scripts/config -e KVM +- scripts/config -e TUN +- scripts/config -e BRIDGE +- scripts/config -e VHOST_NET +- scripts/config -e NF_NAT +- scripts/config -e NF_NAT_IPV4 +- scripts/config -e IP_NF_TARGET_MASQUERADE +- scripts/config -e FB_VESA +- scripts/config -e HOTPLUG_PCI +- scripts/config -e HOTPLUG_PCI_ACPI +- scripts/config -e VLAN_8021Q +- scripts/config -e BRIDGE_VLAN_FILTERING +# Required for M400 +- scripts/config -e SATA_AHCI_PLATFORM +- scripts/config -e AHCI_XGENE +- scripts/config -e GENERIC_PHY +- scripts/config -e PHY_XGENE +- scripts/config -e NET_VENDOR_MELLANOX +- scripts/config -e MLX4_EN +- scripts/config -e MLX4_EN_DCB +- scripts/config -e MLX4_EN_VXLAN +- scripts/config -e MLX4_CORE +- scripts/config -e MLX5_CORE +- scripts/config -e NET_IP_TUNNEL +- scripts/config -e VXLAN +- scripts/config -e UIO +- scripts/config -e UIO_PDRV_GENIRQ +- scripts/config -e GPIO_DWAPB +- scripts/config -e KEYBOARD_GPIO +- scripts/config -e INPUT_POLLDEV +- scripts/config -e KEYBOARD_GPIO_POLLED +- scripts/config -d DMA_CMA +- scripts/config -e POWER_RESET +- scripts/config -e POWER_RESET_GPIO +- scripts/config -e POWER_RESET_SYSCON +- scripts/config -e POWER_AVS +- yes '' | make ARCH=arm64 oldconfig +build-commands: +# Only generate Image here, uImage generated in deployment +# due to availability of mkimage build systems +- make vmlinux dtbs $MAKEFLAGS +install-commands: +- mkdir -p "$DESTDIR"/boot +- make install dtbs_install INSTALL_PATH="$DESTDIR/boot" diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph new file mode 100644 index 00000000..15b0a52c --- /dev/null +++ b/systems/build-system-armv8l64.morph @@ -0,0 +1,39 @@ +name: build-system-armv8l64 +kind: system +description: +- | + The system that should be used for building all other Baserock systems + for little endian 64-bit ARMv8 computers. +arch: armv8l64 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph +- name: bsp-armv8l64-generic + morph: strata/bsp-armv8l64-generic.morph +- name: tools + morph: strata/tools.morph +- name: morph-utils + morph: strata/morph-utils.morph +- name: nfs + morph: strata/nfs.morph +- name: ansible + morph: strata/ansible.morph +- name: cloudinit-support + morph: strata/cloudinit-support.morph +- name: openstack-clients + morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph +configuration-extensions: +- set-hostname +- add-config-files +- nfsboot +- install-files +- distbuild +- fstab +- mason +- cloud-init diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph new file mode 100644 index 00000000..30094e74 --- /dev/null +++ b/systems/cross-bootstrap-system-armv8l64-generic.morph @@ -0,0 +1,11 @@ +name: cross-bootstrap-system-armv8l64-generic +kind: system +description: A system that produces the minimum needed to build a devel system +arch: armv8l64 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: cross-bootstrap + morph: strata/cross-bootstrap.morph -- cgit v1.2.1