From 6546ddc64bcbf73c7419bac7af596b924005dbc3 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 21 May 2026 16:10:55 +0900 Subject: internal/rosa: expose in-place behaviour in generic helper This change also combines the createDir and wantsDir methods, and replaces the non-inplace target of the generic helper with a deterministic path. Signed-off-by: Ophestra --- internal/rosa/package/kernel/package.az | 2 ++ internal/rosa/package/make.az | 1 - internal/rosa/package/mksh.az | 2 -- internal/rosa/package/nss.az | 2 ++ internal/rosa/package/perl.az | 2 ++ internal/rosa/package/unzip.az | 2 ++ 6 files changed, 8 insertions(+), 3 deletions(-) (limited to 'internal/rosa/package') diff --git a/internal/rosa/package/kernel/package.az b/internal/rosa/package/kernel/package.az index d768ebac..9460813d 100644 --- a/internal/rosa/package/kernel/package.az +++ b/internal/rosa/package/kernel/package.az @@ -153,7 +153,9 @@ package gen_init_cpio { description = "a program in the kernel source tree for creating initramfs archive"; source = kernel-source; + enterSource = true; exec = generic { + inPlace = true; build = ` mkdir -p /work/system/bin/ cc -o /work/system/bin/gen_init_cpio usr/gen_init_cpio.c diff --git a/internal/rosa/package/make.az b/internal/rosa/package/make.az index 9d685a44..a0e1aec1 100644 --- a/internal/rosa/package/make.az +++ b/internal/rosa/package/make.az @@ -13,7 +13,6 @@ package make { toyboxEarly = true; exec = generic { - mktemp = true; build = `/usr/src/make/configure \ --prefix=/system \ --build="${ROSA_TRIPLE}" \ diff --git a/internal/rosa/package/mksh.az b/internal/rosa/package/mksh.az index 21911196..0e43d1e8 100644 --- a/internal/rosa/package/mksh.az +++ b/internal/rosa/package/mksh.az @@ -16,8 +16,6 @@ package mksh { ]; exec = generic { - mktemp = true; - build = `sh /usr/src/mksh/Build.sh -r CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \ sh /usr/src/mksh/Build.sh -r -L diff --git a/internal/rosa/package/nss.az b/internal/rosa/package/nss.az index f9cbb817..92d46a9d 100644 --- a/internal/rosa/package/nss.az +++ b/internal/rosa/package/nss.az @@ -78,7 +78,9 @@ package nss-cacert { source = nss; + enterSource = true; exec = generic { + inPlace = true; build = ` mkdir -p /work/system/etc/ssl/{certs/unbundled,certs/hashed,trust-source} buildcatrust \ diff --git a/internal/rosa/package/perl.az b/internal/rosa/package/perl.az index d2cbee77..71322cc7 100644 --- a/internal/rosa/package/perl.az +++ b/internal/rosa/package/perl.az @@ -59,10 +59,12 @@ package perl-Module-Build { checksum = "ZKxEFG4hE1rqZt52zBL2LRZBMkYzhjb5-cTBXcsyA52EbPeeYyVxU176yAea8-Di"; }; + enterSource = true; writable = true; chmod = true; exec = generic { + inPlace = true; build = ` perl Build.PL --prefix=/system ./Build build`; diff --git a/internal/rosa/package/unzip.az b/internal/rosa/package/unzip.az index a802ddff..e52f8555 100644 --- a/internal/rosa/package/unzip.az +++ b/internal/rosa/package/unzip.az @@ -15,10 +15,12 @@ package unzip { compress = gzip; }; + enterSource = true; writable = true; chmod = true; exec = generic { + inPlace = true; build = `unix/configure make -f unix/Makefile generic1`; install = ` -- cgit v1.3.1