diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-03-01 23:54:40 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-03-02 01:24:50 +0900 |
| commit | cc60e0d15d79916a69c8a1caeb3c4611351bb6c4 (patch) | |
| tree | 67f4f59ed7ba7b18af51338e56ffa8d9acf52da6 /internal/rosa/fakeroot.go | |
| parent | 9deaf853f0676ee4475468bffd35aae7e1160a74 (diff) | |
internal/rosa/make: migrate to helper interface
This also updates all affected artifacts to use new behaviour.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/fakeroot.go')
| -rw-r--r-- | internal/rosa/fakeroot.go | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/internal/rosa/fakeroot.go b/internal/rosa/fakeroot.go index dea7515f..f97b4663 100644 --- a/internal/rosa/fakeroot.go +++ b/internal/rosa/fakeroot.go @@ -7,13 +7,14 @@ func (t Toolchain) newFakeroot() pkg.Artifact { version = "1.37.2" checksum = "4ve-eDqVspzQ6VWDhPS0NjW3aSenBJcPAJq_BFT7OOFgUdrQzoTBxZWipDAGWxF8" ) - return t.NewViaMake("fakeroot", version, t.NewPatchedSource( - "fakeroot", version, pkg.NewHTTPGetTar( - nil, "https://salsa.debian.org/clint/fakeroot/-/archive/upstream/"+ - version+"/fakeroot-upstream-"+version+".tar.bz2", - mustDecode(checksum), - pkg.TarBzip2, - ), false, [2]string{"remove-broken-docs", `diff --git a/doc/Makefile.am b/doc/Makefile.am + return t.NewPackage("fakeroot", version, pkg.NewHTTPGetTar( + nil, "https://salsa.debian.org/clint/fakeroot/-/archive/upstream/"+ + version+"/fakeroot-upstream-"+version+".tar.bz2", + mustDecode(checksum), + pkg.TarBzip2, + ), &PackageAttr{ + Patches: [][2]string{ + {"remove-broken-docs", `diff --git a/doc/Makefile.am b/doc/Makefile.am index f135ad9..85c784c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -24,30 +25,27 @@ index f135ad9..85c784c 100644 man_MANS = faked.1 fakeroot.1 `}, - ), &MakeAttr{ - Writable: true, + }, Env: []string{ "CONFIG_SHELL=/bin/sh", }, - ScriptEarly: ` -cd /usr/src/fakeroot -./bootstrap -`, + }, &MakeHelper{ + Generate: "./bootstrap", // makes assumptions about /etc/passwd SkipCheck: true, }, - t.Load(M4), - t.Load(Perl), - t.Load(Autoconf), - t.Load(Automake), - t.Load(Libtool), - t.Load(PkgConfig), + M4, + Perl, + Autoconf, + Automake, + Libtool, + PkgConfig, - t.Load(Attr), - t.Load(Libcap), - t.Load(KernelHeaders), + Attr, + Libcap, + KernelHeaders, ) } func init() { artifactsF[Fakeroot] = Toolchain.newFakeroot } |