diff --git a/internal/rosa/gnu.go b/internal/rosa/gnu.go index 8104dba..bd00d8f 100644 --- a/internal/rosa/gnu.go +++ b/internal/rosa/gnu.go @@ -31,6 +31,7 @@ func (t Toolchain) newM4() pkg.Artifact { ) return t.New("m4-"+version, false, []pkg.Artifact{ t.Load(Make), + t.Load(Coreutils), }, nil, nil, ` cd /usr/src/m4 chmod +w tests/test-c32ispunct.sh && echo '#!/bin/sh' > tests/test-c32ispunct.sh @@ -84,6 +85,7 @@ func (t Toolchain) newAutoconf() pkg.Artifact { t.Load(M4), t.Load(Perl), t.Load(Bash), + t.Load(Coreutils), }, nil, nil, ` cd "$(mktemp -d)" /usr/src/autoconf/configure \ @@ -133,6 +135,9 @@ func (t Toolchain) newGettext() pkg.Artifact { ) return t.New("gettext-"+version, false, []pkg.Artifact{ t.Load(Make), + t.Load(Coreutils), + t.Load(Gzip), + t.Load(Sed), }, nil, nil, ` cd /usr/src/gettext test_disable() { chmod +w "$2" && echo "$1" > "$2"; } @@ -147,6 +152,8 @@ test_disable '#!/bin/sh' gettext-tools/tests/format-c-5 test_disable '#!/bin/sh' gettext-tools/gnulib-tests/test-c32ispunct.sh test_disable 'int main(){return 0;}' gettext-tools/gnulib-tests/test-stdcountof-h.c +touch gettext-tools/misc/archive.dir.tar + cd "$(mktemp -d)" /usr/src/gettext/configure \ --prefix=/system \ @@ -175,6 +182,7 @@ test_disable() { chmod +w "$2" && echo "$1" > "$2"; } test_disable '#!/bin/sh' gnulib-tests/test-c32ispunct.sh test_disable 'int main(){return 0;}' gnulib-tests/test-c32ispunct.c +test_disable '#!/bin/sh' tests/cmp cd "$(mktemp -d)" /usr/src/diffutils/configure \ @@ -315,7 +323,7 @@ cd "$(mktemp -d)" --build="${ROSA_TRIPLE}" make "-j$(nproc)" make DESTDIR=/work install -`, pkg.Path(AbsUsrSrc.Append("gawk"), true, pkg.NewHTTPGetTar( +`, pkg.Path(AbsUsrSrc.Append("gawk"), false, pkg.NewHTTPGetTar( nil, "https://ftp.gnu.org/gnu/gawk/gawk-"+version+".tar.gz", mustDecode(checksum), pkg.TarGzip, @@ -333,9 +341,9 @@ func (t Toolchain) newFindutils() pkg.Artifact { t.Load(XZ), t.Load(Sed), }, nil, nil, ` -cd /usr/src -xzcat findutils.tar.xz | tar -x -mv 'findutils-`+version+`' findutils +cd /usr/src/ +tar xf findutils.tar.xz +mv findutils-`+version+` findutils cd findutils echo '#!/bin/sh' > gnulib-tests/test-c32ispunct.sh diff --git a/internal/rosa/go.go b/internal/rosa/go.go index 9b315ad..e0dc219 100644 --- a/internal/rosa/go.go +++ b/internal/rosa/go.go @@ -20,7 +20,7 @@ cp -r /usr/src/go /work cd /work/go/src chmod -R +w .. -ln -s ../system/bin/busybox /bin/pwd +ln -s ../system/bin/toybox /bin/pwd cat << EOF > /bin/hostname #!/bin/sh echo cure diff --git a/internal/rosa/hakurei.go b/internal/rosa/hakurei.go index 1ee2d0f..0372d5d 100644 --- a/internal/rosa/hakurei.go +++ b/internal/rosa/hakurei.go @@ -11,6 +11,8 @@ func (t Toolchain) newHakurei(script string) pkg.Artifact { ) return t.New("hakurei-"+version, false, []pkg.Artifact{ t.Load(Go), + + t.Load(Gzip), t.Load(PkgConfig), t.Load(KernelHeaders), diff --git a/internal/rosa/libseccomp.go b/internal/rosa/libseccomp.go index aae5626..9158fca 100644 --- a/internal/rosa/libseccomp.go +++ b/internal/rosa/libseccomp.go @@ -12,6 +12,7 @@ func (t Toolchain) newLibseccomp() pkg.Artifact { return t.New("libseccomp-"+version, false, []pkg.Artifact{ t.Load(Make), t.Load(Bash), + t.Load(Coreutils), t.Load(Gperf), t.Load(KernelHeaders), diff --git a/internal/rosa/libxml2.go b/internal/rosa/libxml2.go index e373ad9..7ba7098 100644 --- a/internal/rosa/libxml2.go +++ b/internal/rosa/libxml2.go @@ -13,6 +13,7 @@ func (t Toolchain) newLibxml2() pkg.Artifact { ) return t.New("libxml2-"+version, false, []pkg.Artifact{ t.Load(Make), + t.Load(XZ), }, nil, nil, ` cd /usr/src/ tar xf libxml2.tar.xz diff --git a/internal/rosa/musl.go b/internal/rosa/musl.go index 5b9c1e1..b863f06 100644 --- a/internal/rosa/musl.go +++ b/internal/rosa/musl.go @@ -44,6 +44,7 @@ rmdir -v /work/lib return t.New("musl-"+version, false, stage3Concat(t, attr.Extra, t.Load(Make), + t.Load(Coreutils), ), nil, slices.Concat([]string{ "ROSA_MUSL_TARGET=" + target, }, attr.Env), ` diff --git a/internal/rosa/perl.go b/internal/rosa/perl.go index 5675604..aae70e4 100644 --- a/internal/rosa/perl.go +++ b/internal/rosa/perl.go @@ -13,6 +13,7 @@ func (t Toolchain) newPerl() pkg.Artifact { chmod -R +w /usr/src/perl && cd /usr/src/perl echo 'print STDOUT "1..0 # Skip broken test\n";' > ext/Pod-Html/t/htmldir3.t +rm -f /system/bin/ps # perl does not like toybox ps ./Configure \ -des \ diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go index 9e4adcc..201699f 100644 --- a/internal/rosa/rosa.go +++ b/internal/rosa/rosa.go @@ -190,7 +190,7 @@ func (t Toolchain) New( var ( path = AbsSystem.Append("bin", "sh") - args = []string{"mksh", absCureScript.String()} + args = []string{"sh", absCureScript.String()} support []pkg.Artifact ) switch t { @@ -255,7 +255,7 @@ ln -vs ../usr/bin /work/bin runtimes, clang, boot.Load(Mksh), - boot.Load(Busybox), + boot.Load(Toybox), }) env = fixupEnviron(env, []string{ EnvTriplet + "=" + triplet(),