diff options
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -5,7 +5,7 @@ # Purpose : Bootstraps Adélie from source for any architecture. # Authors : Zach van Rijn <me@zv.io> # License : MIT -# Revision : 20221209 +# Revision : 20221220 #=============================================================== #=============================================================== @@ -405,7 +405,7 @@ if ! test -d "${MTOOLS}"/sys/emus/bin; then # FIXME: no hard code test -d bootstrap \ || git clone ${CHAINS}/bootstrap.git; cd bootstrap; - git checkout 371f5e2624acd89dd05a9bd8c68f369b16dfdde6; + git checkout 6834829d499e823e776368ce02691be2caac1727; ## seed rootfs # @@ -630,6 +630,7 @@ CXX=g++ \ AR=ar \ LD=ld \ CPP=cpp \ +RANLIB=ranlib \ ${MTOOLS}/sys/emus/bin/proot \ -S "${BASE}"/mcmtools-${TARGET}/sys \ -q "${MTOOLS}"/sys/emus/bin/qemu-${q} \ @@ -663,12 +664,16 @@ fi # cd "${BASE}"; if ! test -f rootfs-${TARGET}-patched.tgz; then + rm -f rootfs-${TARGET}.tar; gzip -dk rootfs-${TARGET}.tgz; ## # Build 'binsub', a string patch tool. # - "${MTOOLS}"/musl/bin/gcc -static -o binsub binsub.c -O3; + "${MTOOLS}"/musl/bin/gcc -static -O3 \ + -o binsub \ + "${HERE}"/binsub.c \ + ; ## # Replace with explicit '/' ('/foo/bar/baz' --> '/' instead @@ -681,7 +686,6 @@ if ! test -f rootfs-${TARGET}-patched.tgz; then ; gzip -c9 rootfs-${TARGET}.tar > rootfs-${TARGET}-patched.tgz; - rm -f rootfs-${TARGET}.tar; fi |