release: 0.4.2

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

all.sh

@@ -1,10 +1,3 @@
 #!/bin/sh -e
 
-TOOLCHAIN_VERSION="$(go version)"
-cd "$(dirname -- "$0")/"
-echo "Building cmd/dist using ${TOOLCHAIN_VERSION}."
-FLAGS=''
-if test -n "$VERBOSE"; then
-    FLAGS="$FLAGS -v"
-fi
-go run $FLAGS --tags=dist ./cmd/dist
+HAKUREI_DIST_MAKE='' exec "$(dirname -- "$0")/cmd/dist/dist.sh"

cmd/dist/dist.sh

@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+TOOLCHAIN_VERSION="$(go version)"
+cd "$(dirname -- "$0")/../.."
+echo "Building cmd/dist using ${TOOLCHAIN_VERSION}."
+FLAGS=''
+if test -n "$VERBOSE"; then
+    FLAGS="$FLAGS -v"
+fi
+go run $FLAGS --tags=dist ./cmd/dist

cmd/dist/main.go

@@ -46,6 +46,7 @@ func main() {
 	log.SetPrefix("")
 
 	verbose := os.Getenv("VERBOSE") != ""
+	runTests := os.Getenv("HAKUREI_DIST_MAKE") == ""
 	version := getenv("HAKUREI_VERSION", "untagged")
 	prefix := getenv("PREFIX", "/usr")
 	destdir := getenv("DESTDIR", "dist")
@@ -101,13 +102,15 @@ func main() {
 	)
 	log.Println()
 
-	log.Println("##### Testing Hakurei.")
-	mustRun(
-		ctx, "go", "test",
-		"-ldflags=-buildid= -linkmode external -extldflags=-static",
-		"./...",
-	)
-	log.Println()
+	if runTests {
+		log.Println("##### Testing Hakurei.")
+		mustRun(
+			ctx, "go", "test",
+			"-ldflags=-buildid= -linkmode external -extldflags=-static",
+			"./...",
+		)
+		log.Println()
+	}
 
 	log.Println("##### Creating distribution.")
 	const suffix = ".tar.gz"

cmd/mbf/cache.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"hakurei.app/check"
+	"hakurei.app/container"
 	"hakurei.app/internal/pkg"
 	"hakurei.app/message"
 )
@@ -19,9 +20,15 @@ type cache struct {
 	// Should generally not be used directly.
 	c *pkg.Cache
 
-	cures, jobs        int
-	hostAbstract, idle bool
-	verboseInit        bool
+	cures, jobs int
+	// Primarily to work around missing landlock LSM.
+	hostAbstract bool
+	// Set SCHED_IDLE.
+	idle bool
+	// Unset [pkg.CSuppressInit].
+	verboseInit bool
+	// Loaded artifact of [rosa.QEMU].
+	qemu pkg.Artifact
 
 	base string
 }
@@ -74,6 +81,39 @@ func (cache *cache) open() (err error) {
 		cache.jobs,
 		base,
 	)
+	if err != nil {
+		return
+	}
+	done <- struct{}{}
+
+	if cache.qemu != nil {
+		var pathname *check.Absolute
+		pathname, _, err = cache.c.Cure(cache.qemu)
+		if err != nil {
+			cache.c.Close()
+			return
+		}
+
+		pkg.RegisterArch("riscv64", container.BinfmtEntry{
+			Offset: 0,
+			Magic:  "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00",
+			Mask:   "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff",
+			Interpreter: pathname.Append(
+				"system/bin",
+				"qemu-riscv64",
+			),
+		})
+		pkg.RegisterArch("arm64", container.BinfmtEntry{
+			Offset: 0,
+			Magic:  "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00",
+			Mask:   "\xff\xff\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff",
+			Interpreter: pathname.Append(
+				"system/bin",
+				"qemu-aarch64",
+			),
+		})
+	}
+
 	return
 }
 

cmd/mbf/main.go

@@ -67,9 +67,13 @@ func main() {
 
 	var (
 		flagQuiet bool
+		flagQEMU  bool
+		flagArch  string
 		flagCheck bool
 		flagLTO   bool
 
+		flagCrossOverride int
+
 		addr net.UnixAddr
 	)
 	c := command.New(os.Stderr, log.Printf, "mbf", func([]string) error {
@@ -93,13 +97,36 @@ func main() {
 		if !flagLTO {
 			flags |= rosa.OptLLVMNoLTO
 		}
-		rosa.DropCaches(flags)
+		rosa.DropCaches("", flags)
+		cross := flagArch != "" && flagArch != runtime.GOARCH
+		if flagQEMU || cross {
+			cm.qemu = rosa.Std.Load(rosa.QEMU)
+		}
+
+		if cross {
+			if flagCrossOverride != -1 {
+				flags = flagCrossOverride
+			}
+
+			rosa.DropCaches(flagArch, flags)
+			if !rosa.HasStage0() {
+				return pkg.UnsupportedArchError(flagArch)
+			}
+		}
 
 		return nil
 	}).Flag(
 		&flagQuiet,
 		"q", command.BoolFlag(false),
 		"Do not print cure messages",
+	).Flag(
+		&flagQEMU,
+		"register", command.BoolFlag(false),
+		"Enable additional target architectures",
+	).Flag(
+		&flagArch,
+		"arch", command.StringFlag(runtime.GOARCH),
+		"Target architecture",
 	).Flag(
 		&flagLTO,
 		"lto", command.BoolFlag(false),
@@ -108,6 +135,10 @@ func main() {
 		&flagCheck,
 		"check", command.BoolFlag(true),
 		"Run test suites",
+	).Flag(
+		&flagCrossOverride,
+		"cross-flags", command.IntFlag(-1),
+		"Override non-native target preset flags",
 	).Flag(
 		&cm.verboseInit,
 		"v", command.BoolFlag(false),

cmd/mbf/main_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	rosa.DropCaches(rosa.OptLLVMNoLTO)
+	rosa.DropCaches("", rosa.OptLLVMNoLTO)
 	os.Exit(m.Run())
 }
 

cmd/sharefs/test/configuration.nix

@@ -20,11 +20,14 @@
   };
 
   virtualisation = {
+    # Hopefully reduces spurious test failures:
+    memorySize = if pkgs.stdenv.hostPlatform.is32bit then 2046 else 8192;
+
     diskSize = 6 * 1024;
 
     qemu.options = [
       # Increase test performance:
-      "-smp 8"
+      "-smp 16"
     ];
   };
 

cmd/sharefs/test/default.nix

@@ -28,7 +28,7 @@ testers.nixosTest {
         # For go tests:
         (pkgs.writeShellScriptBin "sharefs-workload-hakurei-tests" ''
           cp -r "${self.packages.${system}.hakurei.src}" "/sdcard/hakurei" && cd "/sdcard/hakurei"
-          ${fhs}/bin/hakurei-fhs -c 'CC="clang -O3 -Werror" go test ./...'
+          ${fhs}/bin/hakurei-fhs -c 'ROSA_SKIP_BINFMT=1 CC="clang -O3 -Werror" go test ./...'
         '')
       ];
 

internal/pkg/exec.go

@@ -9,8 +9,10 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"slices"
 	"strconv"
+	"sync"
 	"syscall"
 	"time"
 	"unique"
@@ -94,6 +96,32 @@ func MustPath(pathname string, writable bool, a ...Artifact) ExecPath {
 	return ExecPath{check.MustAbs(pathname), a, writable}
 }
 
+var (
+	binfmt   map[string]container.BinfmtEntry
+	binfmtMu sync.RWMutex
+)
+
+// RegisterArch arranges for [KindExec] and [KindExecNet] to support a new
+// architecture via a binfmt_misc entry. Each architecture must be registered
+// at most once.
+func RegisterArch(arch string, e container.BinfmtEntry) {
+	if arch == "" {
+		panic(UnsupportedArchError(arch))
+	}
+
+	binfmtMu.Lock()
+	defer binfmtMu.Unlock()
+
+	if binfmt == nil {
+		binfmt = make(map[string]container.BinfmtEntry)
+	}
+
+	if _, ok := binfmt[arch]; ok {
+		panic("attempting to register " + strconv.Quote(arch) + " twice")
+	}
+	binfmt[arch] = e
+}
+
 const (
 	// ExecTimeoutDefault replaces out of range [NewExec] timeout values.
 	ExecTimeoutDefault = 15 * time.Minute
@@ -110,6 +138,8 @@ type execArtifact struct {
 	// Caller-supplied user-facing reporting name, guaranteed to be nonzero
 	// during initialisation.
 	name string
+	// Target architecture.
+	arch string
 	// Caller-supplied inner mount points.
 	paths []ExecPath
 
@@ -178,7 +208,7 @@ func (a *execNetArtifact) Cure(f *FContext) error {
 // container and does not affect curing outcome. Because of this, it is omitted
 // from parameter data for computing identifier.
 func NewExec(
-	name string,
+	name, arch string,
 	checksum *Checksum,
 	timeout time.Duration,
 	exclusive bool,
@@ -193,13 +223,16 @@ func NewExec(
 	if name == "" {
 		name = "exec-" + filepath.Base(pathname.String())
 	}
+	if arch == "" {
+		arch = runtime.GOARCH
+	}
 	if timeout <= 0 {
 		timeout = ExecTimeoutDefault
 	}
 	if timeout > ExecTimeoutMax {
 		timeout = ExecTimeoutMax
 	}
-	a := execArtifact{name, paths, dir, env, pathname, args, timeout, exclusive}
+	a := execArtifact{name, arch, paths, dir, env, pathname, args, timeout, exclusive}
 	if checksum == nil {
 		return &a
 	}
@@ -211,6 +244,7 @@ func (*execArtifact) Kind() Kind { return KindExec }
 
 // Params writes paths, executable pathname and args.
 func (a *execArtifact) Params(ctx *IContext) {
+	ctx.WriteString(a.arch)
 	ctx.WriteString(a.name)
 
 	ctx.WriteUint32(uint32(len(a.paths)))
@@ -257,11 +291,26 @@ func (a *execArtifact) Params(ctx *IContext) {
 	}
 }
 
+// UnsupportedArchError describes an unsupported or invalid architecture.
+type UnsupportedArchError string
+
+func (e UnsupportedArchError) Error() string {
+	if e == "" {
+		return "invalid architecture name"
+	}
+	return "unsupported architecture " + string(e)
+}
+
 // readExecArtifact interprets IR values and returns the address of execArtifact
 // or execNetArtifact.
 func readExecArtifact(r *IRReader, net bool) Artifact {
 	r.DiscardAll()
 
+	arch := r.ReadString()
+	if arch == "" {
+		panic(UnsupportedArchError(arch))
+	}
+
 	name := r.ReadString()
 
 	sz := r.ReadUint32()
@@ -327,7 +376,7 @@ func readExecArtifact(r *IRReader, net bool) Artifact {
 	}
 
 	return NewExec(
-		name, checksumP, timeout, exclusive, dir, env, pathname, args, paths...,
+		name, arch, checksumP, timeout, exclusive, dir, env, pathname, args, paths...,
 	)
 }
 
@@ -442,6 +491,17 @@ func (a *execArtifact) makeContainer(
 	z.Env = slices.Concat(a.env, []string{EnvJobs + "=" + strconv.Itoa(jobs)})
 	z.Grow(len(a.paths) + 4)
 
+	if a.arch != runtime.GOARCH {
+		binfmtMu.RLock()
+		e, ok := binfmt[a.arch]
+		binfmtMu.RUnlock()
+		if !ok {
+			return nil, UnsupportedArchError(a.arch)
+		}
+		z.Binfmt = []container.BinfmtEntry{e}
+		z.InitAsRoot = true
+	}
+
 	for i, b := range a.paths {
 		if i == overlayWorkIndex {
 			if err = os.MkdirAll(work.String(), 0700); err != nil {

internal/pkg/exec_test.go

@@ -8,12 +8,15 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"slices"
 	"testing"
 	"unique"
 
 	"hakurei.app/check"
+	"hakurei.app/container"
 	"hakurei.app/hst"
+	"hakurei.app/internal/info"
 	"hakurei.app/internal/pkg"
 	"hakurei.app/internal/stub"
 
@@ -27,6 +30,17 @@ import (
 //go:embed internal/testtool/testtool
 var testtoolBin []byte
 
+func init() {
+	pathname, err := filepath.Abs("internal/testtool/testtool")
+	if err != nil {
+		panic(err)
+	}
+	pkg.RegisterArch("cafe", container.BinfmtEntry{
+		Magic:       expected.Magic,
+		Interpreter: check.MustAbs(pathname),
+	})
+}
+
 func TestExec(t *testing.T) {
 	t.Parallel()
 
@@ -43,7 +57,7 @@ func TestExec(t *testing.T) {
 
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
-					"exec-offline", nil, 0, false,
+					"exec-offline", "", nil, 0, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1"},
 					check.MustAbs("/opt/bin/testtool"),
@@ -66,7 +80,7 @@ func TestExec(t *testing.T) {
 				), ignorePathname, wantOffline, nil},
 
 				{"error passthrough", pkg.NewExec(
-					"", nil, 0, true,
+					"", "", nil, 0, true,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1"},
 					check.MustAbs("/opt/bin/testtool"),
@@ -89,7 +103,7 @@ func TestExec(t *testing.T) {
 				}},
 
 				{"invalid paths", pkg.NewExec(
-					"", nil, 0, false,
+					"", "", nil, 0, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1"},
 					check.MustAbs("/opt/bin/testtool"),
@@ -102,7 +116,7 @@ func TestExec(t *testing.T) {
 			// check init failure passthrough
 			var exitError *exec.ExitError
 			if _, _, err := c.Cure(pkg.NewExec(
-				"", nil, 0, false,
+				"", "", nil, 0, false,
 				pkg.AbsWork,
 				nil,
 				check.MustAbs("/opt/bin/testtool"),
@@ -141,7 +155,7 @@ func TestExec(t *testing.T) {
 			}
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
-					"exec-net", new(wantNet.hash()), 0, false,
+					"exec-net", "", new(wantNet.hash()), 0, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1"},
 					check.MustAbs("/opt/bin/testtool"),
@@ -188,7 +202,7 @@ func TestExec(t *testing.T) {
 
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
-					"exec-overlay-root", nil, 0, false,
+					"exec-overlay-root", "", nil, 0, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1", "HAKUREI_ROOT=1"},
 					check.MustAbs("/opt/bin/testtool"),
@@ -227,7 +241,7 @@ func TestExec(t *testing.T) {
 
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
-					"exec-overlay-work", nil, 0, false,
+					"exec-overlay-work", "", nil, 0, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1", "HAKUREI_ROOT=1"},
 					check.MustAbs("/work/bin/testtool"),
@@ -271,7 +285,7 @@ func TestExec(t *testing.T) {
 
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
-					"exec-multiple-layers", nil, 0, false,
+					"exec-multiple-layers", "", nil, 0, false,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1", "HAKUREI_ROOT=1"},
 					check.MustAbs("/opt/bin/testtool"),
@@ -342,7 +356,7 @@ func TestExec(t *testing.T) {
 
 			cureMany(t, c, []cureStep{
 				{"container", pkg.NewExec(
-					"exec-layer-promotion", nil, 0, true,
+					"exec-layer-promotion", "", nil, 0, true,
 					pkg.AbsWork,
 					[]string{"HAKUREI_TEST=1", "HAKUREI_ROOT=1"},
 					check.MustAbs("/opt/bin/testtool"),
@@ -382,6 +396,69 @@ func TestExec(t *testing.T) {
 			"temp": {Mode: fs.ModeDir | 0700},
 			"work": {Mode: fs.ModeDir | 0700},
 		}},
+
+		{"binfmt", pkg.CValidateKnown, nil, func(t *testing.T, base *check.Absolute, c *pkg.Cache) {
+			if info.CanDegrade && os.Getenv("ROSA_SKIP_BINFMT") != "" {
+				t.Skip("binfmt_misc test explicitly skipped")
+			}
+
+			cureMany(t, c, []cureStep{
+				{"container", pkg.NewExec(
+					"exec-binfmt", "cafe", nil, 0, true,
+					pkg.AbsWork,
+					[]string{"HAKUREI_TEST=1", "HAKUREI_BINFMT=1"},
+					check.MustAbs("/opt/bin/sample"),
+					[]string{"sample"},
+
+					pkg.MustPath("/", true, &stubArtifact{
+						kind:   pkg.KindTar,
+						params: []byte("empty directory"),
+						cure: func(t *pkg.TContext) error {
+							return os.MkdirAll(t.GetWorkDir().String(), 0700)
+						},
+					}),
+					pkg.MustPath("/opt", false, overrideIdent{pkg.ID{0xfe, 0xff}, &stubArtifact{
+						kind: pkg.KindTar,
+						cure: func(t *pkg.TContext) error {
+							work := t.GetWorkDir()
+							if err := os.MkdirAll(
+								work.Append("bin").String(),
+								0700,
+							); err != nil {
+								return err
+							}
+
+							return os.WriteFile(t.GetWorkDir().Append(
+								"bin",
+								"sample",
+							).String(), []byte(expected.Full), 0500)
+						},
+					}}),
+				), ignorePathname, expectsFS{
+					".": {Mode: fs.ModeDir | 0500},
+
+					"check": {Mode: 0400, Data: []byte("binfmt")},
+				}, nil},
+			})
+		}, expectsFS{
+			".": {Mode: fs.ModeDir | 0700},
+
+			"checksum": {Mode: fs.ModeDir | 0700},
+			"checksum/5aevg3YpDxjqQZ-pdvXK7YqgkL5JKqcoStYQxeD96kuYar6K2mRQWMHib6NQRnpV":            {Mode: fs.ModeDir | 0500},
+			"checksum/5aevg3YpDxjqQZ-pdvXK7YqgkL5JKqcoStYQxeD96kuYar6K2mRQWMHib6NQRnpV/bin":        {Mode: fs.ModeDir | 0700},
+			"checksum/5aevg3YpDxjqQZ-pdvXK7YqgkL5JKqcoStYQxeD96kuYar6K2mRQWMHib6NQRnpV/bin/sample": {Mode: 0500, Data: []byte("\xca\xfe\xba\xbe\xfd\xfd:3")},
+			"checksum/MGWmEfjut2QE2xPJwTsmUzpff4BN_FEnQ7T0j7gvUCCiugJQNwqt9m151fm9D1yU":            {Mode: fs.ModeDir | 0500},
+			"checksum/UnDo4B5KneEUY5b4vRUk_y9MWgkWuw2N8f8a2XayO686xXur-aZmX2-7n_8tKMe3":            {Mode: fs.ModeDir | 0500},
+			"checksum/UnDo4B5KneEUY5b4vRUk_y9MWgkWuw2N8f8a2XayO686xXur-aZmX2-7n_8tKMe3/check":      {Mode: 0400, Data: []byte("binfmt")},
+
+			"identifier": {Mode: fs.ModeDir | 0700},
+			"identifier/6VQTJ1lI5BmVuI1YFYJ8ClO3MRORvTTrcWFDcUU-l5Ga8EofxCxGlSTYN-u8dKj_": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/UnDo4B5KneEUY5b4vRUk_y9MWgkWuw2N8f8a2XayO686xXur-aZmX2-7n_8tKMe3")},
+			"identifier/_v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/5aevg3YpDxjqQZ-pdvXK7YqgkL5JKqcoStYQxeD96kuYar6K2mRQWMHib6NQRnpV")},
+			"identifier/vjz1MHPcGBKV7sjcs8jQP3cqxJ1hgPTiQBMCEHP9BGXjGxd-tJmEmXKaStObo5gK": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/MGWmEfjut2QE2xPJwTsmUzpff4BN_FEnQ7T0j7gvUCCiugJQNwqt9m151fm9D1yU")},
+
+			"temp": {Mode: fs.ModeDir | 0700},
+			"work": {Mode: fs.ModeDir | 0700},
+		}},
 	})
 }
 

internal/pkg/internal/testtool/expected/doc.go

@@ -1,2 +0,0 @@
-// Package expected contains expected identifiers for exec artifact tests.
-package expected

internal/pkg/internal/testtool/expected/expected.go

@@ -0,0 +1,9 @@
+// Package expected contains data shared between test helper and test harness.
+package expected
+
+const (
+	// Magic are magic bytes in the binfmt test case.
+	Magic = "\xca\xfe\xba\xbe\xfd\xfd"
+	// Full is the full content of the binfmt test case executable.
+	Full = Magic + ":3"
+)

internal/pkg/internal/testtool/expected/sum_amd64.go

@@ -1,10 +1,10 @@
 package expected
 
 const (
-	Offline = "dztPS6jRjiZtCF4_p8AzfnxGp6obkhrgFVsxdodbKWUoAEVtDz3MykepJB4kI_ks"
-	OvlRoot = "RdMA-mubnrHuu3Ky1wWyxauSYCO0ZH_zCPUj3uDHqkfwv5sGcByoF_g5PjlGiClb"
-	Layers  = "p1t_drXr34i-jZNuxDMLaMOdL6tZvQqhavNafGynGqxOZoXAUTSn7kqNh3Ovv3DT"
-	Net     = "G8qPxD9puvvoOVV7lrT80eyDeIl3G_CCFoKw12c8mCjMdG1zF7NEPkwYpNubClK3"
-	Promote = "xXTIYcXmgJWNLC91c417RRrNM9cjELwEZHpGvf8Fk_GNP5agRJp_SicD0w9aMeLJ"
-	Work    = "5hlaukCirnXE4W_RSLJFOZN47Z5RiHnacXzdFp_70cLgiJUGR6cSb_HaFftkzi0-"
+	Offline = "oe7Uv1u5BwxcuX3HLQzZRg1Q5oetJo6jWiKGMOeqLiqBkaVgyKzvx82N81_IzUAz"
+	OvlRoot = "NacZGXwuRkTvcHaG08a22ujJ8qCWN0RSoFlRSR5FSt0ZcBbJ28FRvkYsHEtX7G8i"
+	Layers  = "WBJDrATtX6rIE5yAu8ePX3WmDF0Tt9kFiue0m3cRnyRoVx1my8a67fh3CAW486oP"
+	Net     = "CmYtj2sNB3LHtqiDuck_Lz3MjLLIiwyP8N4NDitQ1Icvv__LVP9p8tm-sHeQaKKp"
+	Promote = "TX3eCloaQFkV-SZIH6Jg6E5WKH--rcXY1P0jnZKmLFKWrNqnOzd4G9eIBh6i5ywN"
+	Work    = "OuNiLSC68pZhAOr1YQ4WbV1tzASA0nxLEBcK7lO7MqxDY_j8dmP_C612RTuF23Lu"
 )

internal/pkg/internal/testtool/main.go

@@ -24,6 +24,19 @@ func main() {
 	log.SetFlags(0)
 	log.SetPrefix("testtool: ")
 
+	if os.Getenv("HAKUREI_BINFMT") == "1" {
+		wantArgs := []string{"/interpreter", "/opt/bin/sample"}
+		if !slices.Equal(os.Args, wantArgs) {
+			log.Fatalf("Args: %q, want %q", os.Args, wantArgs)
+		}
+
+		if err := os.WriteFile("check", []byte("binfmt"), 0400); err != nil {
+			log.Fatal(err)
+		}
+
+		return
+	}
+
 	environ := slices.DeleteFunc(slices.Clone(os.Environ()), func(s string) bool {
 		return s == "CURE_JOBS="+strconv.Itoa(runtime.NumCPU())
 	})

internal/pkg/ir_test.go

@@ -39,7 +39,7 @@ func TestIRRoundtrip(t *testing.T) {
 		)},
 
 		{"exec offline", pkg.NewExec(
-			"exec-offline", nil, 0, false,
+			"exec-offline", "", nil, 0, false,
 			pkg.AbsWork,
 			[]string{"HAKUREI_TEST=1"},
 			check.MustAbs("/opt/bin/testtool"),
@@ -59,7 +59,7 @@ func TestIRRoundtrip(t *testing.T) {
 		)},
 
 		{"exec net", pkg.NewExec(
-			"exec-net",
+			"exec-net", "",
 			(*pkg.Checksum)(bytes.Repeat([]byte{0xfc}, len(pkg.Checksum{}))),
 			0, false,
 			pkg.AbsWork,

internal/pkg/pkg_test.go

@@ -1289,6 +1289,11 @@ func TestErrors(t *testing.T) {
 		{"UnsupportedVariantError", pkg.UnsupportedVariantError(
 			"rosa",
 		), `unsupported variant "rosa"`},
+
+		{"UnsupportedArchError zero", pkg.UnsupportedArchError(""),
+			"invalid architecture name"},
+		{"UnsupportedArchError", pkg.UnsupportedArchError("riscv64"),
+			"unsupported architecture riscv64"},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {

internal/rosa/all.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"runtime"
 	"strconv"
 	"sync"
 
@@ -70,6 +71,7 @@ const (
 	Gzip
 	Hakurei
 	HakureiDist
+	Hwdata
 	IPTables
 	Kmod
 	LIT
@@ -79,8 +81,11 @@ const (
 	LibXrandr
 	LibXrender
 	LibXxf86vm
+	Libarchive
 	Libbsd
 	Libcap
+	Libconfig
+	LibdisplayInfo
 	Libdrm
 	Libev
 	Libexpat
@@ -173,6 +178,7 @@ const (
 	WaylandProtocols
 	XCB
 	XCBProto
+	XCBUtilKeysyms
 	XDGDBusProxy
 	XZ
 	XorgProto
@@ -182,7 +188,8 @@ const (
 	// PresetUnexportedStart is the first unexported preset.
 	PresetUnexportedStart
 
-	llvmSource = iota - 1
+	stage0Dist = iota - 1
+	llvmSource
 	// earlyCompilerRT is an early, standalone compiler-rt installation for the
 	// standalone runtimes build.
 	//
@@ -347,6 +354,9 @@ var (
 	// artifactsOnce is for lazy initialisation of artifacts.
 	artifactsOnce [_toolchainEnd][len(artifactsM)]sync.Once
 
+	// arch is the target architecture.
+	arch = runtime.GOARCH
+
 	// presetOpts globally modifies behaviour of presets.
 	presetOpts int
 )
@@ -358,6 +368,9 @@ const (
 	OptLLVMNoLTO
 )
 
+// Arch returns the target architecture.
+func Arch() string { return arch }
+
 // Flags returns the current preset flags
 func Flags() int { return presetOpts }
 
@@ -367,7 +380,12 @@ func zero[T any](p *T) { var v T; *p = v }
 // DropCaches arranges for all cached [pkg.Artifact] to be freed some time after
 // it returns. Must not be used concurrently with any other function from this
 // package.
-func DropCaches(flags int) {
+func DropCaches(targetArch string, flags int) {
+	if targetArch == "" {
+		targetArch = runtime.GOARCH
+	}
+
+	arch = targetArch
 	presetOpts = flags
 	zero(&artifacts)
 	zero(&artifactsOnce)

internal/rosa/all_test.go

@@ -20,8 +20,8 @@ func TestLoad(t *testing.T) {
 }
 
 func BenchmarkAll(b *testing.B) {
-	flags := rosa.Flags()
-	b.Cleanup(func() { rosa.DropCaches(flags) })
+	arch, flags := rosa.Arch(), rosa.Flags()
+	b.Cleanup(func() { rosa.DropCaches(arch, flags) })
 
 	for b.Loop() {
 		for i := range rosa.PresetEnd {
@@ -29,7 +29,7 @@ func BenchmarkAll(b *testing.B) {
 		}
 
 		b.StopTimer()
-		rosa.DropCaches(0)
+		rosa.DropCaches("", 0)
 		b.StartTimer()
 	}
 }

internal/rosa/busybox.go

@@ -5,7 +5,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"runtime"
 	"time"
 
 	"hakurei.app/fhs"
@@ -88,7 +87,7 @@ func (a busyboxBin) Cure(t *pkg.TContext) (err error) {
 // the https://busybox.net/downloads/binaries/ binary release.
 func newBusyboxBin() pkg.Artifact {
 	var version, url, checksum string
-	switch runtime.GOARCH {
+	switch arch {
 	case "amd64":
 		version = "1.35.0"
 		url = "https://busybox.net/downloads/binaries/" +
@@ -101,11 +100,11 @@ func newBusyboxBin() pkg.Artifact {
 		checksum = "npJjBO7iwhjW6Kx2aXeSxf8kXhVgTCDChOZTTsI8ZfFfa3tbsklxRiidZQdrVERg"
 
 	default:
-		panic("unsupported target " + runtime.GOARCH)
+		panic("unsupported target " + arch)
 	}
 
 	return pkg.NewExec(
-		"busybox-bin-"+version, nil, pkg.ExecTimeoutMax, false,
+		"busybox-bin-"+version, arch, nil, pkg.ExecTimeoutMax, false,
 		fhs.AbsRoot, []string{
 			"PATH=/system/bin",
 		},

internal/rosa/git.go

@@ -55,6 +55,9 @@ disable_test t9300-fast-import
 disable_test t0211-trace2-perf
 disable_test t1517-outside-repo
 disable_test t2200-add-update
+disable_test t0027-auto-crlf
+disable_test t7513-interpret-trailers
+disable_test t7703-repack-geometric
 `,
 		Check: []string{
 			"-C t",

internal/rosa/glslang.go

@@ -132,6 +132,57 @@ func (t Toolchain) newSPIRVLLVMTranslator() (pkg.Artifact, string) {
 		version  = "22.1.2"
 		checksum = "JZAaV5ewYcm-35YA_U2BM2IcsQouZtX1BLZR0zh2vSlfEXMsT5OCtY4Gh5RJkcGy"
 	)
+	skipChecks := []string{
+		// error: line 13: OpTypeCooperativeMatrixKHR Scope is limited to Workgroup and Subgroup
+		"cooperative_matrix_constant_null.spvasm",
+	}
+
+	switch arch {
+	case "arm64":
+		skipChecks = append(skipChecks,
+			// LLVM ERROR: unsupported calling convention
+			"DebugInfo/COFF/no-cus.ll",
+			"DebugInfo/Generic/2009-11-05-DeadGlobalVariable.ll",
+			"DebugInfo/Generic/2009-11-10-CurrentFn.ll",
+			"DebugInfo/Generic/2010-01-05-DbgScope.ll",
+			"DebugInfo/Generic/2010-03-12-llc-crash.ll",
+			"DebugInfo/Generic/2010-03-24-MemberFn.ll",
+			"DebugInfo/Generic/2010-04-19-FramePtr.ll",
+			"DebugInfo/Generic/2010-06-29-InlinedFnLocalVar.ll",
+			"DebugInfo/Generic/2010-10-01-crash.ll",
+			"DebugInfo/Generic/PR20038.ll",
+			"DebugInfo/Generic/constant-pointers.ll",
+			"DebugInfo/Generic/dead-argument-order.ll",
+			"DebugInfo/Generic/debug-info-eis-option.ll",
+			"DebugInfo/Generic/def-line.ll",
+			"DebugInfo/Generic/discriminator.ll",
+			"DebugInfo/Generic/dwarf-public-names.ll",
+			"DebugInfo/Generic/enum.ll",
+			"DebugInfo/Generic/func-using-decl.ll",
+			"DebugInfo/Generic/global.ll",
+			"DebugInfo/Generic/imported-name-inlined.ll",
+			"DebugInfo/Generic/incorrect-variable-debugloc1.ll",
+			"DebugInfo/Generic/inline-scopes.ll",
+			"DebugInfo/Generic/inlined-arguments.ll",
+			"DebugInfo/Generic/inlined-vars.ll",
+			"DebugInfo/Generic/linear-dbg-value.ll",
+			"DebugInfo/Generic/linkage-name-abstract.ll",
+			"DebugInfo/Generic/member-order.ll",
+			"DebugInfo/Generic/missing-abstract-variable.ll",
+			"DebugInfo/Generic/multiline.ll",
+			"DebugInfo/Generic/namespace_function_definition.ll",
+			"DebugInfo/Generic/namespace_inline_function_definition.ll",
+			"DebugInfo/Generic/noscopes.ll",
+			"DebugInfo/Generic/ptrsize.ll",
+			"DebugInfo/Generic/restrict.ll",
+			"DebugInfo/Generic/two-cus-from-same-file.ll",
+			"DebugInfo/Generic/version.ll",
+			"DebugInfo/LocalAddressSpace.ll",
+			"DebugInfo/UnknownBaseType.ll",
+			"DebugInfo/expr-opcode.ll",
+		)
+	}
+
 	return t.NewPackage("spirv-llvm-translator", version, newFromGitHub(
 		"KhronosGroup/SPIRV-LLVM-Translator",
 		"v"+version, checksum,
@@ -153,9 +204,7 @@ index c000a77e..86f79b03 100644
 
 		// litArgs emits shell syntax
 		ScriptEarly: `
-export LIT_OPTS=` + litArgs(true,
-			// error: line 13: OpTypeCooperativeMatrixKHR Scope is limited to Workgroup and Subgroup
-			"cooperative_matrix_constant_null.spvasm") + `
+export LIT_OPTS=` + litArgs(true, skipChecks...) + `
 `,
 	}, &CMakeHelper{
 		Cache: []KV{

internal/rosa/gnu.go

@@ -1,7 +1,6 @@
 package rosa
 
 import (
-	"runtime"
 	"slices"
 	"strconv"
 	"strings"
@@ -843,7 +842,7 @@ func (t Toolchain) newGnuTLS() (pkg.Artifact, string) {
 	)
 
 	var configureExtra []KV
-	switch runtime.GOARCH {
+	switch arch {
 	case "arm64":
 		configureExtra = []KV{
 			{"disable-hardware-acceleration"},
@@ -1148,7 +1147,7 @@ func (t Toolchain) newGCC() (pkg.Artifact, string) {
 	)
 
 	var configureExtra []KV
-	switch runtime.GOARCH {
+	switch arch {
 	case "amd64", "arm64":
 		configureExtra = append(configureExtra, KV{"with-multilib-list", "''"})
 	}

internal/rosa/go.go

@@ -1,7 +1,6 @@
 package rosa
 
 import (
-	"runtime"
 	"slices"
 
 	"hakurei.app/internal/pkg"
@@ -35,6 +34,10 @@ func (t Toolchain) newGo(
 	script string,
 	extra ...pkg.Artifact,
 ) pkg.Artifact {
+	name := "all"
+	if presetOpts&OptSkipCheck != 0 {
+		name = "make"
+	}
 	return t.New("go"+version, 0, t.AppendPresets(extra,
 		Bash,
 	), nil, slices.Concat([]string{
@@ -48,7 +51,7 @@ cp -r /usr/src/go /work/system
 cd /work/system/go/src
 chmod -R +w ..
 `+script+`
-./all.bash
+./`+name+`.bash
 
 mkdir /work/system/bin
 ln -s \
@@ -69,7 +72,7 @@ func (t Toolchain) newGoLatest() (pkg.Artifact, string) {
 
 		finalEnv []string
 	)
-	switch runtime.GOARCH {
+	switch arch {
 	case "amd64":
 		bootstrapExtra = append(bootstrapExtra, t.newGoBootstrap())
 
@@ -79,7 +82,7 @@ func (t Toolchain) newGoLatest() (pkg.Artifact, string) {
 		finalEnv = append(finalEnv, "CGO_ENABLED=0")
 
 	default:
-		panic("unsupported target " + runtime.GOARCH)
+		panic("unsupported target " + arch)
 	}
 
 	go119 := t.newGo(
@@ -104,7 +107,7 @@ echo \
 		[]string{"CGO_ENABLED=0"}, `
 sed -i \
 	's,/lib/ld-musl-`+linuxArch()+`.so.1,/system/bin/linker,' \
-	cmd/link/internal/`+runtime.GOARCH+`/obj.go
+	cmd/link/internal/`+arch+`/obj.go
 
 rm \
 	crypto/tls/handshake_client_test.go \
@@ -122,17 +125,17 @@ echo \
 		[]string{"CGO_ENABLED=0"}, `
 sed -i \
 	's,/lib/ld-musl-`+linuxArch()+`.so.1,/system/bin/linker,' \
-	cmd/link/internal/`+runtime.GOARCH+`/obj.go
+	cmd/link/internal/`+arch+`/obj.go
 `, go121,
 	)
 
 	go125 := t.newGo(
-		"1.25.9",
-		"gShJb9uOMk5AxqPSwvn53ZO56S6PyP6nfojzrHUiJ3krAvrgjJpYa6-DPA-jxbpN",
+		"1.25.10",
+		"TwKwatkpwal-j9U2sDSRPEdM3YesI4Gm88YgGV59wtU-L85K9gA7UPy9SCxn6PMb",
 		[]string{"CGO_ENABLED=0"}, `
 sed -i \
 	's,/lib/ld-musl-`+linuxArch()+`.so.1,/system/bin/linker,' \
-	cmd/link/internal/`+runtime.GOARCH+`/obj.go
+	cmd/link/internal/`+arch+`/obj.go
 
 rm \
 	os/root_unix_test.go \
@@ -141,8 +144,8 @@ rm \
 	)
 
 	const (
-		version  = "1.26.2"
-		checksum = "v-6BE89_1g3xYf-9oIYpJKFXlo3xKHYJj2_VGkaUq8ZVkIVQmLwrto-xGG03OISH"
+		version  = "1.26.3"
+		checksum = "lEiFocZFnN5fKvZzmwVdqc9pYUjAuhzqZGbuiOqxUP4XdcY8yECisKcqsQ_eNn1N"
 	)
 	return t.newGo(
 		version,
@@ -150,7 +153,7 @@ rm \
 		finalEnv, `
 sed -i \
 	's,/lib/ld-musl-`+linuxArch()+`.so.1,/system/bin/linker,' \
-	cmd/link/internal/`+runtime.GOARCH+`/obj.go
+	cmd/link/internal/`+arch+`/obj.go
 sed -i \
 	's/cpu.X86.HasAVX512VBMI/& \&\& cpu.X86.HasPOPCNT/' \
 	internal/runtime/gc/scan/scan_amd64.go

internal/rosa/hwdata.go

@@ -0,0 +1,34 @@
+package rosa
+
+import "hakurei.app/internal/pkg"
+
+func (t Toolchain) newHwdata() (pkg.Artifact, string) {
+	const (
+		version  = "0.407"
+		checksum = "6p1XD0CRuzt6hLfjv4ShKBW934BexmoPkRrmwxD4J63fBVCzVBRHyF8pVJdW_Xjm"
+	)
+	return t.NewPackage("hwdata", version, newFromGitHub(
+		"vcrhonek/hwdata",
+		"v"+version, checksum,
+	), &PackageAttr{
+		Writable:    true,
+		EnterSource: true,
+	}, &MakeHelper{
+		// awk: fatal: cannot open file `hwdata.spec' for reading: No such file or directory
+		InPlace: true,
+
+		// lspci: Unknown option 'A' (see "lspci --help")
+		SkipCheck: true,
+	}), version
+}
+func init() {
+	artifactsM[Hwdata] = Metadata{
+		f: Toolchain.newHwdata,
+
+		Name:        "hwdata",
+		Description: "contains various hardware identification and configuration data",
+		Website:     "https://github.com/vcrhonek/hwdata",
+
+		ID: 5387,
+	}
+}

internal/rosa/libarchive.go

@@ -0,0 +1,100 @@
+package rosa
+
+import "hakurei.app/internal/pkg"
+
+func (t Toolchain) newLibarchive() (pkg.Artifact, string) {
+	const (
+		version  = "3.8.7"
+		checksum = "CUJK4MDQmZmATClgQBH2Wt-7Ts4iiSUlg1J_TVb6-5IK3rVUgVLIMc5k-bnWB9w3"
+	)
+	return t.NewPackage("libarchive", version, newFromGitHub(
+		"libarchive/libarchive",
+		"v"+version, checksum,
+	), &PackageAttr{
+		Paths: []pkg.ExecPath{
+			pkg.Path(AbsUsrSrc.Append(
+				"CTestCustom.cmake",
+			), false, pkg.NewFile("CTestCustom.cmake", []byte(`
+list(APPEND CTEST_CUSTOM_TESTS_IGNORE
+	"libarchive_test_archive_string_conversion_fail_c"
+	"libarchive_test_archive_string_conversion_fail_latin1"
+	"libarchive_test_archive_string_update_utf8_koi8"
+	"libarchive_test_gnutar_filename_encoding_KOI8R_UTF8"
+	"libarchive_test_gnutar_filename_encoding_KOI8R_CP866"
+	"libarchive_test_gnutar_filename_encoding_CP1251_UTF8"
+	"libarchive_test_gnutar_filename_encoding_Russian_Russia"
+	"libarchive_test_gnutar_filename_encoding_EUCJP_UTF8"
+	"libarchive_test_gnutar_filename_encoding_EUCJP_CP932"
+	"libarchive_test_gnutar_filename_encoding_CP932_UTF8"
+	"libarchive_test_pax_filename_encoding_KOI8R"
+	"libarchive_test_pax_filename_encoding_CP1251"
+	"libarchive_test_pax_filename_encoding_EUCJP"
+	"libarchive_test_pax_filename_encoding_CP932"
+	"libarchive_test_read_format_cpio_filename_UTF8_eucJP"
+	"libarchive_test_read_format_cpio_filename_CP866_KOI8R"
+	"libarchive_test_read_format_cpio_filename_KOI8R_CP866"
+	"libarchive_test_read_format_cpio_filename_UTF8_KOI8R"
+	"libarchive_test_read_format_cpio_filename_UTF8_CP866"
+	"libarchive_test_read_format_cpio_filename_eucJP_CP932"
+	"libarchive_test_read_format_cpio_filename_UTF8_CP932"
+	"libarchive_test_read_format_cpio_filename_CP866_CP1251"
+	"libarchive_test_read_format_cpio_filename_CP866_CP1251_win"
+	"libarchive_test_read_format_cpio_filename_KOI8R_CP1251"
+	"libarchive_test_read_format_cpio_filename_UTF8_CP1251"
+	"libarchive_test_read_format_gtar_filename_CP866_KOI8R"
+	"libarchive_test_read_format_gtar_filename_KOI8R_CP866"
+	"libarchive_test_read_format_gtar_filename_eucJP_CP932"
+	"libarchive_test_read_format_gtar_filename_CP866_CP1251"
+	"libarchive_test_read_format_gtar_filename_CP866_CP1251_win"
+	"libarchive_test_read_format_gtar_filename_KOI8R_CP1251"
+	"libarchive_test_read_format_rar_unicode_CP932"
+	"libarchive_test_read_format_zip_filename_CP932_eucJP"
+	"libarchive_test_read_format_zip_filename_UTF8_eucJP"
+	"libarchive_test_read_format_zip_filename_CP866_KOI8R"
+	"libarchive_test_read_format_zip_filename_KOI8R_CP866"
+	"libarchive_test_read_format_zip_filename_UTF8_KOI8R"
+	"libarchive_test_read_format_zip_filename_UTF8_CP866"
+	"libarchive_test_read_format_zip_filename_CP932_CP932"
+	"libarchive_test_read_format_zip_filename_UTF8_CP932"
+	"libarchive_test_read_format_zip_filename_CP866_CP1251"
+	"libarchive_test_read_format_zip_filename_CP866_CP1251_win"
+	"libarchive_test_read_format_zip_filename_KOI8R_CP1251"
+	"libarchive_test_read_format_zip_filename_UTF8_CP1251"
+	"libarchive_test_ustar_filename_encoding_KOI8R_UTF8"
+	"libarchive_test_ustar_filename_encoding_KOI8R_CP866"
+	"libarchive_test_ustar_filename_encoding_CP1251_UTF8"
+	"libarchive_test_ustar_filename_encoding_Russian_Russia"
+	"libarchive_test_ustar_filename_encoding_EUCJP_UTF8"
+	"libarchive_test_ustar_filename_encoding_EUCJP_CP932"
+	"libarchive_test_ustar_filename_encoding_CP932_UTF8"
+	"libarchive_test_zip_filename_encoding_KOI8R"
+	"libarchive_test_zip_filename_encoding_ru_RU_CP1251"
+	"libarchive_test_zip_filename_encoding_Russian_Russia"
+	"libarchive_test_zip_filename_encoding_EUCJP"
+	"libarchive_test_zip_filename_encoding_CP932"
+	"libarchive_test_read_format_cab_filename"
+	"libarchive_test_read_format_lha_filename"
+	"libarchive_test_read_format_tar_filename"
+	"libarchive_test_read_format_ustar_filename"
+	"libarchive_test_read_append_wrong_filter"
+)
+`))),
+		},
+
+		Writable: true,
+		ScriptEarly: `
+install -Dv /usr/src/CTestCustom.cmake /cure/
+`,
+	}, (*CMakeHelper)(nil)), version
+}
+func init() {
+	artifactsM[Libarchive] = Metadata{
+		f: Toolchain.newLibarchive,
+
+		Name:        "libarchive",
+		Description: "multi-format archive and compression library",
+		Website:     "https://www.libarchive.org/",
+
+		ID: 1558,
+	}
+}

internal/rosa/libconfig.go

@@ -0,0 +1,50 @@
+package rosa
+
+import "hakurei.app/internal/pkg"
+
+func (t Toolchain) newLibconfig() (pkg.Artifact, string) {
+	const (
+		version  = "1.8.2"
+		checksum = "fD32hjeAZuTz98g6WYHRwsxphrgrEFqxi5Z1jlJemPckPBfxpS3i5HgshAuA6vmT"
+	)
+	return t.NewPackage("libconfig", version, newFromGitHub(
+		"hyperrealm/libconfig",
+		"v"+version,
+		checksum,
+	), &PackageAttr{
+		Patches: []KV{
+			{"disable-broken-tests", `diff --git a/tests/tests.c b/tests/tests.c
+index eba7eae..f916d2e 100644
+--- a/tests/tests.c
++++ b/tests/tests.c
+@@ -753,7 +753,6 @@ int main(int argc, char **argv)
+   int failures;
+ 
+   TT_SUITE_START(LibConfigTests);
+-  TT_SUITE_TEST(LibConfigTests, ParsingAndFormatting);
+   TT_SUITE_TEST(LibConfigTests, ParseInvalidFiles);
+   TT_SUITE_TEST(LibConfigTests, ParseInvalidStrings);
+   TT_SUITE_TEST(LibConfigTests, BigInt1);
+@@ -768,7 +767,6 @@ int main(int argc, char **argv)
+   TT_SUITE_TEST(LibConfigTests, OverrideSetting);
+   TT_SUITE_TEST(LibConfigTests, SettingLookups);
+   TT_SUITE_TEST(LibConfigTests, ReadStream);
+-  TT_SUITE_TEST(LibConfigTests, BinaryAndHex);
+   TT_SUITE_RUN(LibConfigTests);
+   failures = TT_SUITE_NUM_FAILURES(LibConfigTests);
+   TT_SUITE_END(LibConfigTests);
+`},
+		},
+	}, (*CMakeHelper)(nil)), version
+}
+func init() {
+	artifactsM[Libconfig] = Metadata{
+		f: Toolchain.newLibconfig,
+
+		Name:        "libconfig",
+		Description: "a simple library for processing structured configuration files",
+		Website:     "https://hyperrealm.github.io/libconfig/",
+
+		ID: 1580,
+	}
+}

internal/rosa/libdisplay-info.go

@@ -0,0 +1,30 @@
+package rosa
+
+import "hakurei.app/internal/pkg"
+
+func (t Toolchain) newLibdisplayInfo() (pkg.Artifact, string) {
+	const (
+		version  = "0.3.0"
+		checksum = "yjOqPUHHYgRtpqGw5RI1n2Q1_hO5j0LiFNMbjcRWV4Nf71XwwoC9fZMlKBDeLchT"
+	)
+	return t.NewPackage("libdisplay-info", version, newFromGitLab(
+		"gitlab.freedesktop.org",
+		"emersion/libdisplay-info",
+		version, checksum,
+	), nil, (*MesonHelper)(nil),
+		Diffutils,
+
+		Hwdata,
+	), version
+}
+func init() {
+	artifactsM[LibdisplayInfo] = Metadata{
+		f: Toolchain.newLibdisplayInfo,
+
+		Name:        "libdisplay-info",
+		Description: "EDID and DisplayID library",
+		Website:     "https://gitlab.freedesktop.org/emersion/libdisplay-info",
+
+		ID: 326668,
+	}
+}

internal/rosa/llvm.go

@@ -2,7 +2,6 @@ package rosa
 
 import (
 	"regexp"
-	"runtime"
 	"slices"
 	"strings"
 
@@ -248,7 +247,7 @@ func (t Toolchain) newLLVM() (pkg.Artifact, string) {
 			// unwind: fails on musl
 			"eh_frame_fde_pc_range",
 		}
-		switch runtime.GOARCH {
+		switch arch {
 		case "arm64":
 			skipChecks = append(skipChecks,
 				// LLVM: intermittently crashes

internal/rosa/mksh.go

@@ -7,6 +7,10 @@ func (t Toolchain) newMksh() (pkg.Artifact, string) {
 		version  = "59c"
 		checksum = "0Zj-k4nXEu3IuJY4lvwD2OrC2t27GdZj8SPy4DoaeuBRH1padWb7oREpYgwY8JNq"
 	)
+	scriptTest := "./test.sh -C regress:no-ctty\n"
+	if presetOpts&OptSkipCheck != 0 {
+		scriptTest = ""
+	}
 	return t.New("mksh-"+version, 0, t.AppendPresets(nil,
 		Perl,
 		Coreutils,
@@ -18,8 +22,7 @@ cd "$(mktemp -d)"
 sh /usr/src/mksh/Build.sh -r
 CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
 sh /usr/src/mksh/Build.sh -r -L
-./test.sh -C regress:no-ctty
-
+`+scriptTest+`
 mkdir -p /work/system/bin/
 cp -v mksh /work/system/bin/
 cp -v lksh /work/system/bin/sh

internal/rosa/qemu.go

@@ -62,6 +62,7 @@ EOF
 			{"disable-download"},
 			{"disable-docs"},
 
+			{"static"},
 			{"target-list-exclude", "" +
 				// fails to load firmware
 				"ppc-linux-user," +

internal/rosa/rosa.go

@@ -4,7 +4,6 @@ package rosa
 import (
 	"errors"
 	"path"
-	"runtime"
 	"slices"
 	"strconv"
 	"strings"
@@ -54,10 +53,9 @@ var (
 	AbsSystem = fhs.AbsRoot.Append("system")
 )
 
-// linuxArch returns the architecture name used by linux corresponding to
-// [runtime.GOARCH].
+// linuxArch returns the architecture name used by linux corresponding to arch.
 func linuxArch() string {
-	switch runtime.GOARCH {
+	switch arch {
 	case "amd64":
 		return "x86_64"
 	case "arm64":
@@ -66,11 +64,11 @@ func linuxArch() string {
 		return "riscv64"
 
 	default:
-		panic("unsupported target " + runtime.GOARCH)
+		panic("unsupported target " + arch)
 	}
 }
 
-// triplet returns the Rosa OS host triple corresponding to [runtime.GOARCH].
+// triplet returns the Rosa OS host triple corresponding to arch.
 func triplet() string {
 	return linuxArch() + "-rosa-linux-musl"
 }
@@ -80,9 +78,9 @@ type perArch[T any] map[string]T
 
 // unwrap returns the value for the current architecture.
 func (p perArch[T]) unwrap() T {
-	v, ok := p[runtime.GOARCH]
+	v, ok := p[arch]
 	if !ok {
-		panic("unsupported target " + runtime.GOARCH)
+		panic("unsupported target " + arch)
 	}
 	return v
 }
@@ -268,7 +266,7 @@ func (t Toolchain) New(
 		support = append(support, extra...)
 		support = append(support, cureEtc{})
 		if t == toolchainStage0 {
-			support = append(support, NewStage0())
+			support = append(support, t.Load(stage0Dist))
 		} else {
 			support = append(support, _toolchainBusybox.New("gentoo", 0, nil, nil, nil, `
 tar -C /work -xf /usr/src/stage3.tar.xz
@@ -327,7 +325,7 @@ mkdir -vp /work/system/bin
 	}
 
 	return pkg.NewExec(
-		name, knownChecksum, pkg.ExecTimeoutMax, flag&TExclusive != 0,
+		name, arch, knownChecksum, pkg.ExecTimeoutMax, flag&TExclusive != 0,
 		fhs.AbsRoot, env,
 		AbsSystem.Append("bin", "sh"),
 		[]string{"sh", absCureScript.String()},

internal/rosa/rosa_test.go

@@ -28,7 +28,7 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	rosa.DropCaches(rosa.OptLLVMNoLTO)
+	rosa.DropCaches("", rosa.OptLLVMNoLTO)
 	container.TryArgv0(nil)
 
 	code := m.Run()
@@ -94,14 +94,14 @@ func TestCureAll(t *testing.T) {
 }
 
 func BenchmarkStage3(b *testing.B) {
-	flags := rosa.Flags()
-	b.Cleanup(func() { rosa.DropCaches(flags) })
+	arch, flags := rosa.Arch(), rosa.Flags()
+	b.Cleanup(func() { rosa.DropCaches(arch, flags) })
 
 	for b.Loop() {
 		rosa.Std.Load(rosa.LLVM)
 
 		b.StopTimer()
-		rosa.DropCaches(0)
+		rosa.DropCaches("", 0)
 		b.StartTimer()
 	}
 }

internal/rosa/stage0.go

@@ -1,8 +1,6 @@
 package rosa
 
 import (
-	"sync"
-
 	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
 )
@@ -32,25 +30,32 @@ func init() {
 	}
 }
 
-var (
-	// stage0 stores the tarball unpack artifact.
-	stage0 pkg.Artifact
-	// stage0Once is for lazy initialisation of stage0.
-	stage0Once sync.Once
-)
+func init() {
+	const version = "20260504"
+	artifactsM[stage0Dist] = Metadata{
+		f: func(Toolchain) (pkg.Artifact, string) {
+			return newTar(
+				"https://hakurei.app/seed/"+version+"/"+
+					"stage0-"+triplet()+".tar.bz2",
+				perArch[string]{
+					"amd64":   "IQjFDkiAVLo1XzflgMMiLP3gnVY2hhDMTzl-QqJDCQhcLQ3lLtRzjI5WCxGyW_lk",
+					"arm64":   "6fmwl2Umx2QssKQvxxb1JOGkAjzfA_MXKku0jVdGjYGb35OvwEVA5NYtd0HIy3yH",
+					"riscv64": "Z2ODV0rIoo9iQRUIu35bsaOBeXc_9qQfGcyb2aGneatzNUJlXh5emSpEV2bOklUL",
+				}.unwrap(),
+				pkg.TarBzip2,
+			), version
+		},
 
-// NewStage0 returns a stage0 distribution created from curing [Stage0].
-func NewStage0() pkg.Artifact {
-	stage0Once.Do(func() {
-		stage0 = newTar(
-			"https://hakurei.app/seed/20260504/"+
-				"stage0-"+triplet()+".tar.bz2",
-			perArch[string]{
-				"amd64": "IQjFDkiAVLo1XzflgMMiLP3gnVY2hhDMTzl-QqJDCQhcLQ3lLtRzjI5WCxGyW_lk",
-				"arm64": "6fmwl2Umx2QssKQvxxb1JOGkAjzfA_MXKku0jVdGjYGb35OvwEVA5NYtd0HIy3yH",
-			}.unwrap(),
-			pkg.TarBzip2,
-		)
-	})
-	return stage0
+		Name:        "stage0-dist",
+		Description: "Rosa OS stage0 bootstrap seed",
+	}
+}
+
+// HasStage0 returns whether a stage0 distribution is available.
+func HasStage0() (ok bool) {
+	func() {
+		defer func() { ok = recover() == nil }()
+		toolchainStage0.Load(stage0Dist)
+	}()
+	return
 }

internal/rosa/tamago.go

@@ -1,10 +1,6 @@
 package rosa
 
-import (
-	"runtime"
-
-	"hakurei.app/internal/pkg"
-)
+import "hakurei.app/internal/pkg"
 
 func (t Toolchain) newTamaGo() (pkg.Artifact, string) {
 	const (
@@ -26,7 +22,7 @@ chmod -R +w ..
 
 sed -i \
 	's,/lib/ld-musl-`+linuxArch()+`.so.1,/system/bin/linker,' \
-	cmd/link/internal/`+runtime.GOARCH+`/obj.go
+	cmd/link/internal/`+arch+`/obj.go
 sed -i \
 	's/cpu.X86.HasAVX512VBMI/& \&\& cpu.X86.HasPOPCNT/' \
 	internal/runtime/gc/scan/scan_amd64.go

internal/rosa/x.go

@@ -186,6 +186,37 @@ func init() {
 	}
 }
 
+func (t Toolchain) newXCBUtilKeysyms() (pkg.Artifact, string) {
+	const (
+		version  = "0.4.1"
+		checksum = "-EEje12UEjtFBuIjb6Fy4cxEghV20BXwQ1BLvhtvSuVcrFkp_X-ZHRM48wAspXZ4"
+	)
+	return t.NewPackage("xcb-util-keysyms", version, newTar(
+		"https://xcb.freedesktop.org/dist/xcb-util-keysyms-"+version+".tar.gz",
+		checksum,
+		pkg.TarGzip,
+	), nil, (*MakeHelper)(nil),
+		PkgConfig,
+
+		XCB,
+	), version
+}
+func init() {
+	artifactsM[XCBUtilKeysyms] = Metadata{
+		f: Toolchain.newXCBUtilKeysyms,
+
+		Name:        "xcb-util-keysyms",
+		Description: "standard X key constants and conversion to/from keycodes",
+		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms",
+
+		Dependencies: P{
+			XCB,
+		},
+
+		ID: 5168,
+	}
+}
+
 func (t Toolchain) newLibX11() (pkg.Artifact, string) {
 	const (
 		version  = "1.8.13"

make.sh

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+HAKUREI_DIST_MAKE=1 exec "$(dirname -- "$0")/cmd/dist/dist.sh"

options.md

@@ -35,7 +35,7 @@ package
 
 
 *Default:*
-` <derivation hakurei-static-x86_64-unknown-linux-musl-0.4.1> `
+` <derivation hakurei-static-x86_64-unknown-linux-musl-0.4.2> `
 
 
 
@@ -842,7 +842,7 @@ package
 
 
 *Default:*
-` <derivation hakurei-hsu-0.4.1> `
+` <derivation hakurei-hsu-0.4.2> `
 
 
 

package.nix

@@ -30,7 +30,7 @@
 
 buildGo126Module rec {
   pname = "hakurei";
-  version = "0.4.1";
+  version = "0.4.2";
 
   srcFiltered = builtins.path {
     name = "${pname}-src";