internal/rosa: disable busybox SHA1_HWACCEL
All checks were successful
Test / Create distribution (push) Successful in 59s
Test / Sandbox (push) Successful in 2m33s
Test / Hakurei (push) Successful in 3m47s
Test / ShareFS (push) Successful in 3m55s
Test / Hpkg (push) Successful in 4m28s
Test / Sandbox (race detector) (push) Successful in 5m0s
Test / Hakurei (race detector) (push) Successful in 3m32s
Test / Flake checks (push) Successful in 2m7s

This also pretties up the build output and sets correct linker path.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-01-28 00:51:09 +09:00
parent 53e6df7e81
commit 660835151e

View File

@@ -124,7 +124,8 @@ func (t Toolchain) newBusybox() pkg.Artifact {
var env []string
if t == toolchainStage3 {
env = append(env, "EXTRA_LDFLAGS=-static")
env = append(env,
"EXTRA_LDFLAGS=-Wl,--dynamic-linker=/system/bin/linker")
}
return t.New("busybox-"+version, false, stage3Concat(t, []pkg.Artifact{},
@@ -136,6 +137,8 @@ func (t Toolchain) newBusybox() pkg.Artifact {
"PIE",
}, " "),
"ROSA_BUSYBOX_DISABLE=" + strings.Join([]string{
"SHA1_HWACCEL",
"FEATURE_IPV6",
"FEATURE_PREFER_IPV4_ADDRESS",
"FEATURE_HWIB",
@@ -307,6 +310,7 @@ config_disable() {
cat > /bin/gcc << EOF
exec clang \
-Qunused-arguments \
-Wno-ignored-optimization-argument \
${LDFLAGS} \
\$@
@@ -325,8 +329,12 @@ make \
config_enable $ROSA_BUSYBOX_ENABLE
config_disable $ROSA_BUSYBOX_DISABLE
mkdir -p /system/bin
ln -s ../../usr/lib/libc.so /system/bin/linker || true
ln -s ../system/bin/pwd /bin/pwd || true
make CFLAGS_busybox="${LDFLAGS} ${EXTRA_LDFLAGS}" "-j$(nproc)"
make \
CFLAGS_busybox="${LDFLAGS} ${EXTRA_LDFLAGS}" \
"-j$(nproc)"
mkdir -p /system/bin/ /work/bin/
cp busybox /system/bin/