internal/rosa: bzip2 artifact

For creating the stage0 tarball. Might be replaced by a custom artifact at some point.

Signed-off-by: Ophestra <cat@gensokyo.uk>

internal/rosa/all.go

@@ -16,6 +16,7 @@ const (
 	Automake
 	Bash
 	Binutils
+	Bzip2
 	CMake
 	Coreutils
 	Curl
@@ -113,6 +114,7 @@ func ResolveName(name string) (p PArtifact, ok bool) {
 		"automake":          Automake,
 		"bash":              Bash,
 		"binutils":          Binutils,
+		"bzip2":             Bzip2,
 		"cmake":             CMake,
 		"coreutils":         Coreutils,
 		"curl":              Curl,

internal/rosa/bzip2.go

@@ -0,0 +1,22 @@
+package rosa
+
+import "hakurei.app/internal/pkg"
+
+func (t Toolchain) newBzip2() pkg.Artifact {
+	const (
+		version  = "1.0.8"
+		checksum = "cTLykcco7boom-s05H1JVsQi1AtChYL84nXkg_92Dm1Xt94Ob_qlMg_-NSguIK-c"
+	)
+	return t.New("bzip2-"+version, 0, []pkg.Artifact{
+		t.Load(Make),
+	}, nil, nil, `
+cd /usr/src/bzip2
+make CC=cc
+make PREFIX=/work/system install
+`, pkg.Path(AbsUsrSrc.Append("bzip2"), true, pkg.NewHTTPGetTar(
+		nil, "https://sourceware.org/pub/bzip2/bzip2-"+version+".tar.gz",
+		mustDecode(checksum),
+		pkg.TarGzip,
+	)))
+}
+func init() { artifactsF[Bzip2] = Toolchain.newBzip2 }

internal/rosa/cmake.go

@@ -97,7 +97,7 @@ func (t Toolchain) NewViaCMake(
 	}
 
 	sourcePath := AbsUsrSrc.Append(name)
-	return t.New(name+"-"+variant+"-"+version, attr.Flag, stage3Concat(t, extra,
+	return t.New(name+"-"+variant+"-"+version, attr.Flag, stage0Concat(t, extra,
 		t.Load(CMake),
 		t.Load(Ninja),
 	), nil, slices.Concat([]string{

internal/rosa/hakurei.go

@@ -6,8 +6,8 @@ import (
 
 func (t Toolchain) newHakurei(suffix, script string) pkg.Artifact {
 	const (
-		version  = "0.3.4"
-		checksum = "wVwSLo75a2OnH5tgxNWXR_YhiOJUFnYM_9-sJtxAEOKhcPE0BJafs6PU8o5JzyCT"
+		version  = "0.3.5"
+		checksum = "6Tn38NLezRD2d3aGdFg5qFfqn8_KvC6HwMKwJMPvaHmVw8xRgxn8B0PObswl2mOk"
 	)
 	return t.New("hakurei"+suffix+"-"+version, 0, []pkg.Artifact{
 		t.Load(Go),
@@ -44,213 +44,12 @@ chmod -R +w /usr/src/hakurei
 cd /usr/src/hakurei
 
 HAKUREI_VERSION='v`+version+`'
-`+script, pkg.Path(AbsUsrSrc.Append("hakurei"), true, t.NewPatchedSource("hakurei", version, pkg.NewHTTPGetTar(
+`+script, pkg.Path(AbsUsrSrc.Append("hakurei"), true, pkg.NewHTTPGetTar(
 		nil, "https://git.gensokyo.uk/security/hakurei/archive/"+
 			"v"+version+".tar.gz",
 		mustDecode(checksum),
 		pkg.TarGzip,
-	), true, [2]string{"dist-00-tests", `From 67e453f5c4de915de23ecbe5980e595758f0f2fb Mon Sep 17 00:00:00 2001
-From: Ophestra <cat@gensokyo.uk>
-Date: Tue, 27 Jan 2026 06:49:48 +0900
-Subject: [PATCH] dist: run tests
-
-This used to be impossible due to nix jank which has been addressed.
-
-Signed-off-by: Ophestra <cat@gensokyo.uk>
----
- dist/release.sh          | 21 ++++++++++++++++-----
- flake.nix                | 32 ++++++++++++++++++++------------
- internal/acl/acl_test.go |  2 +-
- package.nix              |  2 +-
- 4 files changed, 38 insertions(+), 19 deletions(-)
-
-diff --git a/dist/release.sh b/dist/release.sh
-index 4dcb278..0ba9104 100755
---- a/dist/release.sh
-+++ b/dist/release.sh
-@@ -2,19 +2,30 @@
- cd "$(dirname -- "$0")/.."
- VERSION="${HAKUREI_VERSION:-untagged}"
- pname="hakurei-${VERSION}"
--out="dist/${pname}"
-+out="${DESTDIR:-dist}/${pname}"
- 
-+echo '# Preparing distribution files.'
- mkdir -p "${out}"
- cp -v "README.md" "dist/hsurc.default" "dist/install.sh" "${out}"
- cp -rv "dist/comp" "${out}"
-+echo
- 
-+echo '# Building hakurei.'
- go generate ./...
--go build -trimpath -v -o "${out}/bin/" -ldflags "-s -w -buildid= -extldflags '-static'
-+go build -trimpath -v -o "${out}/bin/" -ldflags "-s -w
-+  -buildid= -extldflags '-static'
-   -X hakurei.app/internal/info.buildVersion=${VERSION}
-   -X hakurei.app/internal/info.hakureiPath=/usr/bin/hakurei
-   -X hakurei.app/internal/info.hsuPath=/usr/bin/hsu
-   -X main.hakureiPath=/usr/bin/hakurei" ./...
-+echo
- 
--rm -f "./${out}.tar.gz" && tar -C dist -czf "${out}.tar.gz" "${pname}"
--rm -rf "./${out}"
--(cd dist && sha512sum "${pname}.tar.gz" > "${pname}.tar.gz.sha512")
-+echo '# Testing hakurei.'
-+go test -ldflags='-buildid= -extldflags=-static' ./...
-+echo
-+
-+echo '# Creating distribution.'
-+rm -f "${out}.tar.gz" && tar -C "${out}/.." -vczf "${out}.tar.gz" "${pname}"
-+rm -rf "${out}"
-+(cd "${out}/.." && sha512sum "${pname}.tar.gz" > "${pname}.tar.gz.sha512")
-+echo
-diff --git a/flake.nix b/flake.nix
-index 9e09c61..2340b92 100644
---- a/flake.nix
-+++ b/flake.nix
-@@ -143,19 +143,27 @@
-             "bin/mount.fuse.sharefs" = "${hakurei}/libexec/sharefs";
-           };
- 
--          dist = pkgs.runCommand "${hakurei.name}-dist" { buildInputs = hakurei.targetPkgs ++ [ pkgs.pkgsStatic.musl ]; } ''
--            # go requires XDG_CACHE_HOME for the build cache
--            export XDG_CACHE_HOME="$(mktemp -d)"
-+          dist =
-+            pkgs.runCommand "${hakurei.name}-dist"
-+              {
-+                buildInputs = hakurei.targetPkgs ++ [
-+                  pkgs.pkgsStatic.musl
-+                ];
-+              }
-+              ''
-+                cd $(mktemp -d) \
-+                    && cp -r ${hakurei.src}/. . \
-+                    && chmod +w cmd && cp -r ${hsu.src}/. cmd/hsu/ \
-+                    && chmod -R +w .
- 
--            # get a different workdir as go does not like /build
--            cd $(mktemp -d) \
--                && cp -r ${hakurei.src}/. . \
--                && chmod +w cmd && cp -r ${hsu.src}/. cmd/hsu/ \
--                && chmod -R +w .
--
--            export HAKUREI_VERSION="v${hakurei.version}"
--            CC="clang -O3 -Werror" ./dist/release.sh && mkdir $out && cp -v "dist/hakurei-$HAKUREI_VERSION.tar.gz"* $out
--          '';
-+                CC="musl-clang -O3 -Werror -Qunused-arguments" \
-+                GOCACHE="$(mktemp -d)" \
-+                HAKUREI_TEST_SKIP_ACL=1 \
-+                PATH="${pkgs.pkgsStatic.musl.bin}/bin:$PATH" \
-+                DESTDIR="$out" \
-+                HAKUREI_VERSION="v${hakurei.version}" \
-+                  ./dist/release.sh
-+              '';
-         }
-       );
- 
-diff --git a/internal/acl/acl_test.go b/internal/acl/acl_test.go
-index af6da55..19ce45a 100644
---- a/internal/acl/acl_test.go
-+++ b/internal/acl/acl_test.go
-@@ -24,7 +24,7 @@ var (
- )
- 
- func TestUpdate(t *testing.T) {
--	if os.Getenv("GO_TEST_SKIP_ACL") == "1" {
-+	if os.Getenv("HAKUREI_TEST_SKIP_ACL") == "1" {
- 		t.Skip("acl test skipped")
- 	}
- 
-diff --git a/package.nix b/package.nix
-index 00c4401..2eaa2ec 100644
---- a/package.nix
-+++ b/package.nix
-@@ -89,7 +89,7 @@ buildGoModule rec {
-     CC = "clang -O3 -Werror";
- 
-     # nix build environment does not allow acls
--    GO_TEST_SKIP_ACL = 1;
-+    HAKUREI_TEST_SKIP_ACL = 1;
-   };
- 
-   buildInputs = [`}, [2]string{"container-tests", `From bf14a412e47344fff2681f4b24d1ecc7415bfcb0 Mon Sep 17 00:00:00 2001
-From: Ophestra <cat@gensokyo.uk>
-Date: Sat, 31 Jan 2026 10:59:56 +0900
-Subject: [PATCH] container: fix host-dependent test cases
-
-These are not fully controlled by hakurei and may change depending on host configuration.
-
-Signed-off-by: Ophestra <cat@gensokyo.uk>
----
- container/container_test.go | 27 +++++++++++++++------------
- 1 file changed, 15 insertions(+), 12 deletions(-)
-
-diff --git a/container/container_test.go b/container/container_test.go
-index d737a18..98713cb 100644
---- a/container/container_test.go
-+++ b/container/container_test.go
-@@ -275,12 +275,12 @@ var containerTestCases = []struct {
- 		),
- 		earlyMnt(
- 			ent("/", "/dev", "ro,nosuid,nodev,relatime", "tmpfs", "devtmpfs", ignore),
--			ent("/null", "/dev/null", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
--			ent("/zero", "/dev/zero", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
--			ent("/full", "/dev/full", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
--			ent("/random", "/dev/random", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
--			ent("/urandom", "/dev/urandom", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
--			ent("/tty", "/dev/tty", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
-+			ent("/null", "/dev/null", ignore, "devtmpfs", "devtmpfs", ignore),
-+			ent("/zero", "/dev/zero", ignore, "devtmpfs", "devtmpfs", ignore),
-+			ent("/full", "/dev/full", ignore, "devtmpfs", "devtmpfs", ignore),
-+			ent("/random", "/dev/random", ignore, "devtmpfs", "devtmpfs", ignore),
-+			ent("/urandom", "/dev/urandom", ignore, "devtmpfs", "devtmpfs", ignore),
-+			ent("/tty", "/dev/tty", ignore, "devtmpfs", "devtmpfs", ignore),
- 			ent("/", "/dev/pts", "rw,nosuid,noexec,relatime", "devpts", "devpts", "rw,mode=620,ptmxmode=666"),
- 			ent("/", "/dev/mqueue", "rw,nosuid,nodev,noexec,relatime", "mqueue", "mqueue", "rw"),
- 			ent("/", "/dev/shm", "rw,nosuid,nodev,relatime", "tmpfs", "tmpfs", ignore),
-@@ -293,12 +293,12 @@ var containerTestCases = []struct {
- 		),
- 		earlyMnt(
- 			ent("/", "/dev", "ro,nosuid,nodev,relatime", "tmpfs", "devtmpfs", ignore),
--			ent("/null", "/dev/null", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
--			ent("/zero", "/dev/zero", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
--			ent("/full", "/dev/full", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
--			ent("/random", "/dev/random", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
--			ent("/urandom", "/dev/urandom", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
--			ent("/tty", "/dev/tty", "rw,nosuid", "devtmpfs", "devtmpfs", ignore),
-+			ent("/null", "/dev/null", ignore, "devtmpfs", "devtmpfs", ignore),
-+			ent("/zero", "/dev/zero", ignore, "devtmpfs", "devtmpfs", ignore),
-+			ent("/full", "/dev/full", ignore, "devtmpfs", "devtmpfs", ignore),
-+			ent("/random", "/dev/random", ignore, "devtmpfs", "devtmpfs", ignore),
-+			ent("/urandom", "/dev/urandom", ignore, "devtmpfs", "devtmpfs", ignore),
-+			ent("/tty", "/dev/tty", ignore, "devtmpfs", "devtmpfs", ignore),
- 			ent("/", "/dev/pts", "rw,nosuid,noexec,relatime", "devpts", "devpts", "rw,mode=620,ptmxmode=666"),
- 			ent("/", "/dev/shm", "rw,nosuid,nodev,relatime", "tmpfs", "tmpfs", ignore),
- 		),
-@@ -696,6 +696,9 @@ func init() {
- 					mnt[i].VfsOptstr = strings.TrimSuffix(mnt[i].VfsOptstr, ",relatime")
- 					mnt[i].VfsOptstr = strings.TrimSuffix(mnt[i].VfsOptstr, ",noatime")
- 
-+					cur.FsOptstr = strings.Replace(cur.FsOptstr, ",seclabel", "", 1)
-+					mnt[i].FsOptstr = strings.Replace(mnt[i].FsOptstr, ",seclabel", "", 1)
-+
- 					if !cur.EqualWithIgnore(mnt[i], "\x00") {
- 						fail = true
- 						log.Printf("[FAIL] %s", cur)`}, [2]string{"dist-01-tarball-name", `diff --git a/dist/release.sh b/dist/release.sh
-index 0ba9104..2990ee1 100755
---- a/dist/release.sh
-+++ b/dist/release.sh
-@@ -1,7 +1,7 @@
- #!/bin/sh -e
- cd "$(dirname -- "$0")/.."
- VERSION="${HAKUREI_VERSION:-untagged}"
--pname="hakurei-${VERSION}"
-+pname="hakurei-${VERSION}-$(go env GOARCH)"
- out="${DESTDIR:-dist}/${pname}"
-
- echo '# Preparing distribution files.'
-`}),
-	), pkg.Path(AbsUsrSrc.Append("hostname", "main.go"), false, pkg.NewFile(
+	)), pkg.Path(AbsUsrSrc.Append("hostname", "main.go"), false, pkg.NewFile(
 		"hostname.go",
 		[]byte(`
 package main

internal/rosa/llvm.go

@@ -160,7 +160,7 @@ ln -s ld.lld /work/system/bin/ld
 			[2]string{"LIBCXX_USE_COMPILER_RT", "ON"},
 		)
 
-		if t > toolchainStage3 {
+		if t > toolchainStage0 {
 			// libcxxabi fails to compile if c++ headers not prefixed in /usr
 			// is found by the compiler, and doing this is easier than
 			// overriding CXXFLAGS; not using mv here to avoid chown failures
@@ -199,7 +199,7 @@ cp -r /system/include /usr/include && rm -rf /system/include
 
 		Paths: attr.paths,
 		Flag:  TExclusive,
-	}, stage3Concat(t, attr.extra,
+	}, stage0Concat(t, attr.extra,
 		t.Load(Libffi),
 		t.Load(Python),
 		t.Load(Perl),
@@ -233,7 +233,7 @@ func (t Toolchain) newLLVM() (musl, compilerRT, runtimes, clang pkg.Artifact) {
 	}
 
 	compilerRT = t.newLLVMVariant("compiler-rt", &llvmAttr{
-		env: stage3ExclConcat(t, []string{},
+		env: stage0ExclConcat(t, []string{},
 			"LDFLAGS="+earlyLDFLAGS(false),
 		),
 		cmake: [][2]string{
@@ -276,7 +276,7 @@ ln -s \
 
 	musl = t.NewMusl(&MuslAttr{
 		Extra: []pkg.Artifact{compilerRT},
-		Env: stage3ExclConcat(t, []string{
+		Env: stage0ExclConcat(t, []string{
 			"CC=clang",
 			"LIBCC=/system/lib/clang/21/lib/" +
 				triplet() + "/libclang_rt.builtins.a",
@@ -288,7 +288,7 @@ ln -s \
 	})
 
 	runtimes = t.newLLVMVariant("runtimes", &llvmAttr{
-		env: stage3ExclConcat(t, []string{},
+		env: stage0ExclConcat(t, []string{},
 			"LDFLAGS="+earlyLDFLAGS(false),
 		),
 		flags: llvmRuntimeLibunwind | llvmRuntimeLibcxx | llvmRuntimeLibcxxABI,
@@ -308,7 +308,7 @@ ln -s \
 
 	clang = t.newLLVMVariant("clang", &llvmAttr{
 		flags: llvmProjectClang | llvmProjectLld,
-		env: stage3ExclConcat(t, []string{},
+		env: stage0ExclConcat(t, []string{},
 			"CFLAGS="+earlyCFLAGS,
 			"CXXFLAGS="+earlyCXXFLAGS(),
 			"LDFLAGS="+earlyLDFLAGS(false),

internal/rosa/make.go

@@ -36,8 +36,8 @@ type MakeAttr struct {
 
 	// Do not include default extras.
 	OmitDefaults bool
-	// Dependencies not provided by stage3.
-	NonStage3 []pkg.Artifact
+	// Dependencies not provided by stage0.
+	NonStage0 []pkg.Artifact
 
 	// Additional environment variables.
 	Env []string
@@ -148,8 +148,8 @@ func (t Toolchain) NewViaMake(
 		panic("cannot remain in root")
 	}
 
-	return t.New(name+"-"+version, attr.Flag, stage3Concat(t,
-		attr.NonStage3,
+	return t.New(name+"-"+version, attr.Flag, stage0Concat(t,
+		attr.NonStage0,
 		finalExtra...,
 	), nil, attr.Env, scriptEarly+`
 /usr/src/`+name+`/configure \

internal/rosa/mksh.go

@@ -7,7 +7,7 @@ func (t Toolchain) newMksh() pkg.Artifact {
 		version  = "59c"
 		checksum = "0Zj-k4nXEu3IuJY4lvwD2OrC2t27GdZj8SPy4DoaeuBRH1padWb7oREpYgwY8JNq"
 	)
-	return t.New("mksh-"+version, 0, stage3Concat(t, []pkg.Artifact{},
+	return t.New("mksh-"+version, 0, stage0Concat(t, []pkg.Artifact{},
 		t.Load(Perl),
 		t.Load(Coreutils),
 	), nil, []string{

internal/rosa/musl.go

@@ -42,7 +42,7 @@ rmdir -v /work/lib
 		script = ""
 	}
 
-	return t.New("musl-"+version, 0, stage3Concat(t, attr.Extra,
+	return t.New("musl-"+version, 0, stage0Concat(t, attr.Extra,
 		t.Load(Make),
 		t.Load(Coreutils),
 	), nil, slices.Concat([]string{

internal/rosa/perl.go

@@ -27,7 +27,7 @@ make \
 	"-j$(nproc)" \
 	TEST_JOBS=256 \
 	test_harness
-make DESTDIR=/work install
+./perl -Ilib -I. installperl --destdir=/work
 `, pkg.Path(AbsUsrSrc.Append("perl"), true, t.NewPatchedSource(
 		"perl", version, pkg.NewHTTPGetTar(
 			nil, "https://www.cpan.org/src/5.0/perl-"+version+".tar.gz",

internal/rosa/rosa.go

@@ -82,11 +82,11 @@ func earlyLDFLAGS(static bool) string {
 	return s
 }
 
-// earlyCFLAGS is reference CFLAGS for the stage3 toolchain.
+// earlyCFLAGS is reference CFLAGS for the stage0 toolchain.
 const earlyCFLAGS = "-Qunused-arguments " +
 	"-isystem/system/include"
 
-// earlyCXXFLAGS returns reference CXXFLAGS for the stage3 toolchain
+// earlyCXXFLAGS returns reference CXXFLAGS for the stage0 toolchain
 // corresponding to [runtime.GOARCH].
 func earlyCXXFLAGS() string {
 	return "--start-no-unused-arguments " +
@@ -105,12 +105,12 @@ const (
 	// binary distribution. This is for decompressing unsupported formats.
 	toolchainBusybox Toolchain = iota
 
-	// toolchainStage3 denotes the Gentoo stage3 toolchain. Special care must be
-	// taken to compile correctly against this toolchain.
-	toolchainStage3
+	// toolchainStage0 denotes the stage0 toolchain. Special care must be taken
+	// to compile correctly against this toolchain.
+	toolchainStage0
 
 	// toolchainIntermediate denotes the intermediate toolchain compiled against
-	// toolchainStage3. This toolchain should be functionally identical to [Std]
+	// toolchainStage0. This toolchain should be functionally identical to [Std]
 	// and is used to bootstrap [Std].
 	toolchainIntermediate
 
@@ -122,19 +122,19 @@ const (
 	_toolchainEnd
 )
 
-// stage3Concat concatenates s and values. If the current toolchain is
-// toolchainStage3, stage3Concat returns s as is.
-func stage3Concat[S ~[]E, E any](t Toolchain, s S, values ...E) S {
-	if t == toolchainStage3 {
+// stage0Concat concatenates s and values. If the current toolchain is
+// toolchainStage0, stage0Concat returns s as is.
+func stage0Concat[S ~[]E, E any](t Toolchain, s S, values ...E) S {
+	if t == toolchainStage0 {
 		return s
 	}
 	return slices.Concat(s, values)
 }
 
-// stage3ExclConcat concatenates s and values. If the current toolchain is not
-// toolchainStage3, stage3ExclConcat returns s as is.
-func stage3ExclConcat[S ~[]E, E any](t Toolchain, s S, values ...E) S {
-	if t == toolchainStage3 {
+// stage0ExclConcat concatenates s and values. If the current toolchain is not
+// toolchainStage0, stage0ExclConcat returns s as is.
+func stage0ExclConcat[S ~[]E, E any](t Toolchain, s S, values ...E) S {
+	if t == toolchainStage0 {
 		return slices.Concat(s, values)
 	}
 	return s
@@ -208,7 +208,7 @@ func (t Toolchain) New(
 		args[0] = "hush"
 		env = fixupEnviron(env, nil, "/system/bin")
 
-	case toolchainStage3:
+	case toolchainStage0:
 		name += "-boot"
 		var seed string
 		switch runtime.GOARCH {
@@ -224,11 +224,11 @@ func (t Toolchain) New(
 		args[0] = "bash"
 		support = slices.Concat([]pkg.Artifact{
 			cureEtc{},
-			toolchainBusybox.New("stage3", 0, nil, nil, nil, `
-tar -C /work -xf /usr/src/stage3.tar.xz
+			toolchainBusybox.New("stage0", 0, nil, nil, nil, `
+tar -C /work -xf /usr/src/stage0.tar.xz
 rm -rf /work/dev/ /work/proc/
 ln -vs ../usr/bin /work/bin
-`, pkg.Path(AbsUsrSrc.Append("stage3.tar.xz"), false,
+`, pkg.Path(AbsUsrSrc.Append("stage0.tar.xz"), false,
 				pkg.NewHTTPGet(
 					nil, "https://basement.gensokyo.uk/seed/"+seed,
 					mustDecode(seed),
@@ -328,7 +328,7 @@ cat /usr/src/` + name + `-patches/* | \
 `
 		aname += "-patched"
 	}
-	return t.New(aname, 0, stage3Concat(t, []pkg.Artifact{},
+	return t.New(aname, 0, stage0Concat(t, []pkg.Artifact{},
 		t.Load(Patch),
 	), nil, nil, script, paths...)
 }

internal/rosa/toybox.go

@@ -7,13 +7,13 @@ func (t Toolchain) newToybox(suffix, script string) pkg.Artifact {
 		version  = "0.8.13"
 		checksum = "rZ1V1ATDte2WeQZanxLVoiRGdfPXhMlEo5-exX-e-ml8cGn9qOv0ABEUVZpX3wTI"
 	)
-	return t.New("toybox-"+version+suffix, TEarly, stage3Concat(t, []pkg.Artifact{},
+	return t.New("toybox-"+version+suffix, TEarly, stage0Concat(t, []pkg.Artifact{},
 		t.Load(Make),
 		t.Load(Bash),
 		t.Load(Gzip),
 
 		t.Load(KernelHeaders),
-	), nil, stage3Concat(t, []string{},
+	), nil, stage0Concat(t, []string{},
 		"ROSA_CHECK=make USER=cure tests",
 	), `
 ln -s ../system/bin/bash /bin/ || true