aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--internal/rosa/acl.go4
-rw-r--r--internal/rosa/gnu.go3
-rw-r--r--internal/rosa/go.go14
-rw-r--r--internal/rosa/hakurei.go11
-rw-r--r--internal/rosa/libexpat.go2
-rw-r--r--internal/rosa/libseccomp.go2
-rw-r--r--internal/rosa/libxml2.go3
-rw-r--r--internal/rosa/pkg-config.go2
-rw-r--r--internal/rosa/wayland.go2
-rw-r--r--internal/rosa/x.go4
-rw-r--r--internal/rosa/xcb.go4
11 files changed, 34 insertions, 17 deletions
diff --git a/internal/rosa/acl.go b/internal/rosa/acl.go
index 54c29377..ca9b8771 100644
--- a/internal/rosa/acl.go
+++ b/internal/rosa/acl.go
@@ -10,6 +10,8 @@ func (t Toolchain) newAttr() pkg.Artifact {
return t.New("attr-"+version, 0, []pkg.Artifact{
t.Load(Make),
t.Load(Perl),
+ t.Load(Gawk),
+ t.Load(Coreutils),
}, nil, nil, `
ln -s ../../system/bin/perl /usr/bin
@@ -77,6 +79,8 @@ func (t Toolchain) newACL() pkg.Artifact {
)
return t.New("acl-"+version, 0, []pkg.Artifact{
t.Load(Make),
+ t.Load(Gawk),
+ t.Load(Coreutils),
t.Load(Attr),
}, nil, nil, `
diff --git a/internal/rosa/gnu.go b/internal/rosa/gnu.go
index 0945279d..347ff647 100644
--- a/internal/rosa/gnu.go
+++ b/internal/rosa/gnu.go
@@ -304,6 +304,9 @@ func (t Toolchain) newGperf() pkg.Artifact {
)
return t.New("gperf-"+version, 0, []pkg.Artifact{
t.Load(Make),
+ t.Load(Gawk),
+ t.Load(Coreutils),
+ t.Load(Diffutils),
}, nil, nil, `
cd "$(mktemp -d)"
/usr/src/gperf/configure \
diff --git a/internal/rosa/go.go b/internal/rosa/go.go
index 7004ceb5..4cd2a077 100644
--- a/internal/rosa/go.go
+++ b/internal/rosa/go.go
@@ -20,19 +20,7 @@ cp -r /usr/src/go /work
cd /work/go/src
chmod -R +w ..
-ln -s ../system/bin/toybox /bin/pwd
-cat << EOF > /bin/hostname
-#!/bin/sh
-echo cure
-EOF
-chmod +x /bin/hostname
-
-rm \
- cmd/objdump/objdump_test.go \
- syscall/creds_test.go \
- net/multicast_test.go
-
-./all.bash
+./make.bash
cd /work/
mkdir system/
mv go/ system/
diff --git a/internal/rosa/hakurei.go b/internal/rosa/hakurei.go
index 1fdf73e7..41572965 100644
--- a/internal/rosa/hakurei.go
+++ b/internal/rosa/hakurei.go
@@ -32,6 +32,7 @@ func (t Toolchain) newHakurei(script string) pkg.Artifact {
t.Load(Wayland),
t.Load(WaylandProtocols),
}, nil, []string{
+ "CGO_ENABLED=1",
"GOCACHE=/tmp/gocache",
"CC=clang -O3 -Werror",
}, `
@@ -193,7 +194,7 @@ func main() {
func init() {
artifactsF[Hakurei] = func(t Toolchain) pkg.Artifact {
return t.newHakurei(`
-mkdir -p /work/system/{bin,libexec/hakurei}
+mkdir -p /work/system/libexec/hakurei/
echo '# Building hakurei.'
go generate -v ./...
@@ -210,9 +211,11 @@ echo '# Testing hakurei.'
go test -ldflags='-buildid= -extldflags=-static' ./...
echo
-mv \
- /work/system/libexec/hakurei/{hakurei,sharefs} \
- /work/system/bin
+mkdir -p /work/system/bin/
+(cd /work/system/libexec/hakurei && mv \
+ hakurei \
+ sharefs \
+ ../../bin/)
`)
}
artifactsF[HakureiDist] = func(t Toolchain) pkg.Artifact {
diff --git a/internal/rosa/libexpat.go b/internal/rosa/libexpat.go
index f158f106..2139e442 100644
--- a/internal/rosa/libexpat.go
+++ b/internal/rosa/libexpat.go
@@ -14,6 +14,8 @@ func (t Toolchain) newLibexpat() pkg.Artifact {
return t.New("libexpat-"+version, 0, []pkg.Artifact{
t.Load(Make),
t.Load(Bash),
+ t.Load(Gawk),
+ t.Load(Coreutils),
}, nil, nil, `
cd "$(mktemp -d)"
/usr/src/libexpat/configure \
diff --git a/internal/rosa/libseccomp.go b/internal/rosa/libseccomp.go
index 8b9ce9e4..a2e5ce19 100644
--- a/internal/rosa/libseccomp.go
+++ b/internal/rosa/libseccomp.go
@@ -12,7 +12,9 @@ func (t Toolchain) newLibseccomp() pkg.Artifact {
return t.New("libseccomp-"+version, 0, []pkg.Artifact{
t.Load(Make),
t.Load(Bash),
+ t.Load(Gawk),
t.Load(Coreutils),
+ t.Load(Diffutils),
t.Load(Gperf),
t.Load(KernelHeaders),
diff --git a/internal/rosa/libxml2.go b/internal/rosa/libxml2.go
index dd6bd9c0..e2dcc4b8 100644
--- a/internal/rosa/libxml2.go
+++ b/internal/rosa/libxml2.go
@@ -13,6 +13,9 @@ func (t Toolchain) newLibxml2() pkg.Artifact {
)
return t.New("libxml2-"+version, 0, []pkg.Artifact{
t.Load(Make),
+ t.Load(Gawk),
+ t.Load(Coreutils),
+ t.Load(Diffutils),
t.Load(XZ),
}, nil, nil, `
cd /usr/src/
diff --git a/internal/rosa/pkg-config.go b/internal/rosa/pkg-config.go
index c4fb7225..1e3ff217 100644
--- a/internal/rosa/pkg-config.go
+++ b/internal/rosa/pkg-config.go
@@ -9,6 +9,8 @@ func (t Toolchain) newPkgConfig() pkg.Artifact {
)
return t.New("pkg-config-"+version, 0, []pkg.Artifact{
t.Load(Make),
+ t.Load(Gawk),
+ t.Load(Coreutils),
}, nil, nil, `
cd "$(mktemp -d)"
/usr/src/pkg-config/configure \
diff --git a/internal/rosa/wayland.go b/internal/rosa/wayland.go
index ab9c7fb3..48ab9a65 100644
--- a/internal/rosa/wayland.go
+++ b/internal/rosa/wayland.go
@@ -13,6 +13,8 @@ func (t Toolchain) newWayland() pkg.Artifact {
t.Load(PkgConfig),
t.Load(CMake),
t.Load(Ninja),
+ t.Load(Gawk),
+ t.Load(Diffutils),
t.Load(Libffi),
t.Load(Libexpat),
diff --git a/internal/rosa/x.go b/internal/rosa/x.go
index 8b9e6edf..19f3ee68 100644
--- a/internal/rosa/x.go
+++ b/internal/rosa/x.go
@@ -9,6 +9,8 @@ func (t Toolchain) newXproto() pkg.Artifact {
)
return t.New("xproto-"+version, 0, []pkg.Artifact{
t.Load(Make),
+ t.Load(Gawk),
+ t.Load(Coreutils),
t.Load(PkgConfig),
}, nil, nil, `
cd "$(mktemp -d)"
@@ -32,6 +34,8 @@ func (t Toolchain) newLibXau() pkg.Artifact {
)
return t.New("libXau-"+version, 0, []pkg.Artifact{
t.Load(Make),
+ t.Load(Gawk),
+ t.Load(Coreutils),
t.Load(PkgConfig),
t.Load(Xproto),
diff --git a/internal/rosa/xcb.go b/internal/rosa/xcb.go
index ff90d0ab..134f5d2f 100644
--- a/internal/rosa/xcb.go
+++ b/internal/rosa/xcb.go
@@ -9,6 +9,8 @@ func (t Toolchain) newXCBProto() pkg.Artifact {
)
return t.New("xcb-proto-"+version, 0, []pkg.Artifact{
t.Load(Make),
+ t.Load(Gawk),
+ t.Load(Coreutils),
t.Load(Python),
}, nil, nil, `
cd "$(mktemp -d)"
@@ -33,6 +35,8 @@ func (t Toolchain) newXCB() pkg.Artifact {
)
return t.New("xcb-"+version, 0, []pkg.Artifact{
t.Load(Make),
+ t.Load(Gawk),
+ t.Load(Coreutils),
t.Load(Python),
t.Load(PkgConfig),
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-29 23:24:55 +0000