internal/rosa/acl: use patch helper
All checks were successful
Test / Create distribution (push) Successful in 50s
Test / Sandbox (push) Successful in 2m37s
Test / Hakurei (push) Successful in 3m49s
Test / ShareFS (push) Successful in 3m57s
Test / Hpkg (push) Successful in 4m25s
Test / Sandbox (race detector) (push) Successful in 4m58s
Test / Hakurei (race detector) (push) Successful in 6m14s
Test / Flake checks (push) Successful in 1m45s
All checks were successful
Test / Create distribution (push) Successful in 50s
Test / Sandbox (push) Successful in 2m37s
Test / Hakurei (push) Successful in 3m49s
Test / ShareFS (push) Successful in 3m57s
Test / Hpkg (push) Successful in 4m25s
Test / Sandbox (race detector) (push) Successful in 4m58s
Test / Hakurei (race detector) (push) Successful in 6m14s
Test / Flake checks (push) Successful in 1m45s
This is significantly less ugly. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -11,10 +11,23 @@ func (t Toolchain) newAttr() pkg.Artifact {
|
|||||||
t.Load(Make),
|
t.Load(Make),
|
||||||
t.Load(Perl),
|
t.Load(Perl),
|
||||||
}, nil, nil, `
|
}, nil, nil, `
|
||||||
cd /usr/src/attr
|
ln -s ../../system/bin/perl /usr/bin
|
||||||
chmod +w tools
|
|
||||||
patch -p 1 << EOF
|
cd "$(mktemp -d)"
|
||||||
From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001
|
/usr/src/attr/configure \
|
||||||
|
--prefix=/system \
|
||||||
|
--build="${ROSA_TRIPLE}" \
|
||||||
|
--enable-static
|
||||||
|
make "-j$(nproc)" check
|
||||||
|
make DESTDIR=/work install
|
||||||
|
`, pkg.Path(AbsUsrSrc.Append("attr"), true, t.NewPatchedSource(
|
||||||
|
"attr", version, pkg.NewHTTPGetTar(
|
||||||
|
nil,
|
||||||
|
"https://download.savannah.nongnu.org/releases/attr/"+
|
||||||
|
"attr-"+version+".tar.gz",
|
||||||
|
mustDecode(checksum),
|
||||||
|
pkg.TarGzip,
|
||||||
|
), true, [2]string{"libgen-basename", `From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001
|
||||||
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
|
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
|
||||||
Date: Sat, 30 Mar 2024 10:17:10 +0100
|
Date: Sat, 30 Mar 2024 10:17:10 +0100
|
||||||
Subject: tools/attr.c: Add missing libgen.h include for basename(3)
|
Subject: tools/attr.c: Add missing libgen.h include for basename(3)
|
||||||
@@ -39,26 +52,20 @@ index f12e4af..6a3c1e9 100644
|
|||||||
#include <attr/attributes.h>
|
#include <attr/attributes.h>
|
||||||
|
|
||||||
--
|
--
|
||||||
cgit v1.1
|
cgit v1.1`}, [2]string{"musl-errno", `diff --git a/test/attr.test b/test/attr.test
|
||||||
EOF
|
index 6ce2f9b..e9bde92 100644
|
||||||
|
--- a/test/attr.test
|
||||||
|
+++ b/test/attr.test
|
||||||
|
@@ -11,7 +11,7 @@ Try various valid and invalid names
|
||||||
|
|
||||||
chmod +w test
|
$ touch f
|
||||||
sed -i 's/Operation not supported/Not supported/' test/attr.test
|
$ setfattr -n user -v value f
|
||||||
ln -s ../../system/bin/perl /usr/bin
|
- > setfattr: f: Operation not supported
|
||||||
|
+ > setfattr: f: Not supported
|
||||||
|
|
||||||
cd "$(mktemp -d)"
|
$ setfattr -n user. -v value f
|
||||||
/usr/src/attr/configure \
|
> setfattr: f: Invalid argument
|
||||||
--prefix=/system \
|
`},
|
||||||
--build="${ROSA_TRIPLE}" \
|
|
||||||
--enable-static
|
|
||||||
make "-j$(nproc)" check
|
|
||||||
make DESTDIR=/work install
|
|
||||||
`, pkg.Path(AbsUsrSrc.Append("attr"), true, pkg.NewHTTPGetTar(
|
|
||||||
nil,
|
|
||||||
"https://download.savannah.nongnu.org/releases/attr/"+
|
|
||||||
"attr-"+version+".tar.gz",
|
|
||||||
mustDecode(checksum),
|
|
||||||
pkg.TarGzip,
|
|
||||||
)))
|
)))
|
||||||
}
|
}
|
||||||
func init() { artifactsF[Attr] = Toolchain.newAttr }
|
func init() { artifactsF[Attr] = Toolchain.newAttr }
|
||||||
|
|||||||
Reference in New Issue
Block a user