internal/rosa: create /bin symlinks via helper

This centralises the workaround for surprisingly common buggy scripts with nonstandard hardcoded paths.

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

13 files changed, 23 insertions, 43 deletions

diff --git a/internal/rosa/package/acl/package.az b/internal/rosa/package/acl/package.az
index 1317ae02..d4e4a13e 100644
--- a/internal/rosa/package/acl/package.az
+++ b/internal/rosa/package/acl/package.az
@@ -13,10 +13,8 @@ package attr {
 
 	patches = [ "musl-errno.patch" ];
 
-	early = `
-ln -s ../../system/bin/perl /usr/bin
-`;
-
+	bin = [ "perl" ];
+	populateUsrBin = true;
 	exec = make {};
 
 	inputs = [
diff --git a/internal/rosa/package/git.az b/internal/rosa/package/git.az
index ffa6bb5a..f2da8ef5 100644
--- a/internal/rosa/package/git.az
+++ b/internal/rosa/package/git.az
@@ -12,8 +12,6 @@ package git {
 	};
 
 	early = `
-ln -s ../../system/bin/perl /usr/bin/ || true
-
 # test suite assumes apache
 rm -f /system/bin/httpd
 `;
@@ -22,6 +20,8 @@ rm -f /system/bin/httpd
 	enterSource = true;
 	env = [ "NO_RUST=YesPlease" ];
 
+	bin = [ "perl" ];
+	populateUsrBin = true;
 	exec = make {
 		inPlace = true;
 		generate = "make configure";
diff --git a/internal/rosa/package/gnu.az b/internal/rosa/package/gnu.az
index c27fc2d8..49b8a933 100644
--- a/internal/rosa/package/gnu.az
+++ b/internal/rosa/package/gnu.az
@@ -511,10 +511,7 @@ package parallel {
 		compress = bzip2;
 	};
 
-	early = `
-ln -s ../system/bin/bash /bin/
-`;
-
+	bin = [ "bash" ];
 	exec = make {};
 
 	inputs = [
diff --git a/internal/rosa/package/libcap.az b/internal/rosa/package/libcap.az
index 3816bc5d..6f6eb355 100644
--- a/internal/rosa/package/libcap.az
+++ b/internal/rosa/package/libcap.az
@@ -12,6 +12,7 @@ package libcap {
 	};
 
 	// uses source tree as scratch space
+	enterSource = true;
 	writable = true;
 	chmod = true;
 
@@ -20,8 +21,7 @@ package libcap {
 		"lib=lib",
 	];
 
-	early = "\nln -s ../system/bin/bash /bin/\n";
-
+	bin = [ "bash" ];
 	exec = make {
 		skipConfigure = true;
 		inPlace = true;
diff --git a/internal/rosa/package/libinput.az b/internal/rosa/package/libinput.az
index 90725e14..272f33c1 100644
--- a/internal/rosa/package/libinput.az
+++ b/internal/rosa/package/libinput.az
@@ -11,8 +11,7 @@ package libinput {
 		checksum = "GxBGPN6YybQxrD2MDsIL8gdDYImXn4NAJi6EvTx_Hb_1jcbjwCrjeyjY2upUyTMi";
 	};
 
-	early = "ln -sf ../system/bin/bash /bin/\n";
-
+	bin = [ "bash" ];
 	exec = meson {
 		setup = {
 			"Dmtdev": "false";
diff --git a/internal/rosa/package/libseccomp/package.az b/internal/rosa/package/libseccomp/package.az
index 486a423a..71069849 100644
--- a/internal/rosa/package/libseccomp/package.az
+++ b/internal/rosa/package/libseccomp/package.az
@@ -13,8 +13,7 @@ package libseccomp {
 	};
 	patches = [ "fix-export-oob-read.patch" ];
 
-	early = "\nln -s ../system/bin/bash /bin/\n";
-
+	bin = [ "bash" ];
 	exec = make {};
 
 	inputs = [
diff --git a/internal/rosa/package/lm_sensors.az b/internal/rosa/package/lm_sensors.az
index 6b89bd6a..4b0486f2 100644
--- a/internal/rosa/package/lm_sensors.az
+++ b/internal/rosa/package/lm_sensors.az
@@ -14,12 +14,8 @@ package lm_sensors {
 	chmod = true;
 	enterSource = true;
 
-	early = `
-ln -s \
-	../../system/bin/perl \
-	/usr/bin/
-`;
-
+	bin = [ "perl" ];
+	populateUsrBin = true;
 	exec = make {
 		inPlace = true;
 		skipConfigure = true;
diff --git a/internal/rosa/package/netfilter/package.az b/internal/rosa/package/netfilter/package.az
index 421e2880..d5aeb5a1 100644
--- a/internal/rosa/package/netfilter/package.az
+++ b/internal/rosa/package/netfilter/package.az
@@ -81,13 +81,13 @@ sed -i \
 	extensions/libebt_snat.txlate
 `;
 
+	bin = [ "bash" ];
 	exec = make {
 		generate = "./autogen.sh";
 		configure = {
 			"enable-static";
 		};
 		preCheck = `
-ln -s ../system/bin/bash /bin/
 chmod +w /etc/ && ln -s ../usr/src/iptables/etc/ethertypes /etc/
 `;
 	};
diff --git a/internal/rosa/package/ninja.az b/internal/rosa/package/ninja.az
index d6a45493..2eb7694b 100644
--- a/internal/rosa/package/ninja.az
+++ b/internal/rosa/package/ninja.az
@@ -15,6 +15,7 @@ package ninja {
 		"CFLAGS=-std=c++17",
 	];
 
+	bin = [ "echo" ];
 	exec = generic {
 		build = `
 python3 /usr/src/ninja/configure.py \
@@ -22,12 +23,10 @@ python3 /usr/src/ninja/configure.py \
 	--bootstrap
 python3 /usr/src/ninja/configure.py \
 	--gtest-source-dir=/usr/src/extra/googletest
-./ninja ` + jobsFlagE + ` all`;
+./ninja ` + jobsFlagE + ` all
+`;
 
-		check = `
-chmod +w /bin/
-ln -s ../system/bin/echo /bin/
-./ninja_test`;
+		check = "./ninja_test";
 
 		install = `
 mkdir -p /work/system/bin/
diff --git a/internal/rosa/package/pcre2.az b/internal/rosa/package/pcre2.az
index 3fede131..27f21bf7 100644
--- a/internal/rosa/package/pcre2.az
+++ b/internal/rosa/package/pcre2.az
@@ -12,11 +12,8 @@ package pcre2 {
 		compress = bzip2;
 	};
 
-	early = `
-# RunGrepTest expects /bin/echo
-ln -s ../system/bin/toybox /bin/echo
-`;
-
+	// RunGrepTest expects /bin/echo
+	bin = [ "echo" ];
 	exec = make {
 		configure = {
 			"enable-jit";
diff --git a/internal/rosa/package/rdfind.az b/internal/rosa/package/rdfind.az
index 86caf33f..5c16548d 100644
--- a/internal/rosa/package/rdfind.az
+++ b/internal/rosa/package/rdfind.az
@@ -10,10 +10,9 @@ package rdfind {
 		compress = gzip;
 	};
 
-	exec = make {
-		// test suite hard codes /bin/echo
-		preCheck = "\nln -s ../system/bin/toybox /bin/echo\n";
-	};
+	// test suite hard codes /bin/echo
+	bin = [ "echo" ];
+	exec = make {};
 
 	inputs = [ nettle ];
 	runtime = [ nettle ];
diff --git a/internal/rosa/package/util-linux.az b/internal/rosa/package/util-linux.az
index 7b18d7c3..4c36199e 100644
--- a/internal/rosa/package/util-linux.az
+++ b/internal/rosa/package/util-linux.az
@@ -23,8 +23,7 @@ package util-linux {
 		compress = gzip;
 	};
 
-	early = "\nln -s ../system/bin/bash /bin/\n";
-
+	bin = [ "bash" ];
 	exec = make {
 		configure = {
 			"disable-use-tty-group";
diff --git a/internal/rosa/package/x.az b/internal/rosa/package/x.az
index 46658af9..04d4000f 100644
--- a/internal/rosa/package/x.az
+++ b/internal/rosa/package/x.az
@@ -781,6 +781,7 @@ package xwayland {
 		checksum = "0D0bs8EbDzlyLIULvm6lizqzdx4g1-umdbjVVO7zk-cS1kVIaSkKronCqj95tz-A";
 	};
 
+	bin = [ "bash" ];
 	exec = meson {
 		setup = {
 			"Dipv6": "false";
@@ -788,10 +789,6 @@ package xwayland {
 		};
 	};
 
-	early = `
-ln -sf ../system/bin/bash /bin/
-`;
-
 	inputs = [
 		bash,
 		gawk,