internal/rosa: remove busybox patch
All checks were successful
Test / Create distribution (push) Successful in 1m8s
Test / Sandbox (push) Successful in 3m2s
Test / Hakurei (push) Successful in 4m28s
Test / ShareFS (push) Successful in 4m34s
Test / Hpkg (push) Successful in 5m9s
Test / Sandbox (race detector) (push) Successful in 6m4s
Test / Hakurei (race detector) (push) Successful in 9m25s
Test / Flake checks (push) Successful in 2m57s
All checks were successful
Test / Create distribution (push) Successful in 1m8s
Test / Sandbox (push) Successful in 3m2s
Test / Hakurei (push) Successful in 4m28s
Test / ShareFS (push) Successful in 4m34s
Test / Hpkg (push) Successful in 5m9s
Test / Sandbox (race detector) (push) Successful in 6m4s
Test / Hakurei (race detector) (push) Successful in 9m25s
Test / Flake checks (push) Successful in 2m57s
This allows different versions of busybox to be attempted, to find one that works on arm. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -350,25 +350,7 @@ ln -vs ../../system/bin/busybox /work/usr/bin/env
|
|||||||
"https://busybox.net/downloads/busybox-"+version+".tar.bz2",
|
"https://busybox.net/downloads/busybox-"+version+".tar.bz2",
|
||||||
mustDecode(checksum),
|
mustDecode(checksum),
|
||||||
pkg.TarBzip2,
|
pkg.TarBzip2,
|
||||||
), true, [2]string{"awk-fix-literal-backslash", `diff --git a/editors/awk.c b/editors/awk.c
|
), false,
|
||||||
index 64e752f4b..40f5ba7f7 100644
|
|
||||||
--- a/editors/awk.c
|
|
||||||
+++ b/editors/awk.c
|
|
||||||
@@ -2636,8 +2636,13 @@ static int awk_sub(node *rn, const char *repl, int nm, var *src, var *dest /*,in
|
|
||||||
resbuf = qrealloc(resbuf, residx + replen + n, &resbufsize);
|
|
||||||
memcpy(resbuf + residx, sp + pmatch[j].rm_so - start_ofs, n);
|
|
||||||
residx += n;
|
|
||||||
- } else
|
|
||||||
+ } else {
|
|
||||||
+/* '\\' and '&' following a backslash keep its original meaning, any other
|
|
||||||
+ * occurrence of a '\\' should be treated as literal */
|
|
||||||
+ if (bslash && c != '\\' && c != '&')
|
|
||||||
+ resbuf[residx++] = '\\';
|
|
||||||
resbuf[residx++] = c;
|
|
||||||
+ }
|
|
||||||
bslash = 0;
|
|
||||||
}
|
|
||||||
}`},
|
|
||||||
)))
|
)))
|
||||||
}
|
}
|
||||||
func init() { artifactsF[Busybox] = Toolchain.newBusybox }
|
func init() { artifactsF[Busybox] = Toolchain.newBusybox }
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ func (t Toolchain) newRsync() pkg.Artifact {
|
|||||||
)
|
)
|
||||||
return t.New("rsync-"+version, false, []pkg.Artifact{
|
return t.New("rsync-"+version, false, []pkg.Artifact{
|
||||||
t.Load(Make),
|
t.Load(Make),
|
||||||
|
t.Load(Gawk),
|
||||||
}, nil, nil, `
|
}, nil, nil, `
|
||||||
cd "$(mktemp -d)"
|
cd "$(mktemp -d)"
|
||||||
/usr/src/rsync/configure --prefix=/system \
|
/usr/src/rsync/configure --prefix=/system \
|
||||||
|
|||||||
Reference in New Issue
Block a user