internal/rosa/netfilter: fetch iptables source via git
All checks were successful
Test / Create distribution (push) Successful in 1m43s
Test / Sandbox (push) Successful in 3m54s
Test / ShareFS (push) Successful in 5m41s
Test / Hakurei (push) Successful in 5m46s
Test / Sandbox (race detector) (push) Successful in 6m46s
Test / Hakurei (race detector) (push) Successful in 8m3s
Test / Flake checks (push) Successful in 1m32s

Eliminates the xz dependency.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-04-05 00:19:40 +09:00
parent 8b0648dd5d
commit 7de3cfe221

View File

@@ -96,15 +96,13 @@ func init() {
func (t Toolchain) newIPTables() (pkg.Artifact, string) { func (t Toolchain) newIPTables() (pkg.Artifact, string) {
const ( const (
version = "1.8.13" version = "1.8.13"
checksum = "JsNI7dyZHnHLtDkKWAxzAIMZ5t-ff3LkSPqNJsn5VM5Eq2m1bA5NKI-XfMRpQsg6" checksum = "TUA-cFIAsiMvtRR-XzQvXzoIhJUOc9J2gQDJCbBRjmgmVfGfPTCf58wL7e-cUKVQ"
) )
return t.NewPackage("iptables", version, pkg.NewHTTPGet( return t.NewPackage("iptables", version, t.NewViaGit(
nil, "https://www.netfilter.org/projects/iptables/files/"+ "https://git.netfilter.org/iptables",
"iptables-"+version+".tar.xz", "refs/tags/v"+version,
mustDecode(checksum), mustDecode(checksum),
), &PackageAttr{ ), &PackageAttr{
SourceKind: SourceKindTarXZ,
ScriptEarly: ` ScriptEarly: `
rm \ rm \
extensions/libxt_connlabel.txlate \ extensions/libxt_connlabel.txlate \
@@ -115,6 +113,7 @@ sed -i \
extensions/libebt_snat.txlate extensions/libebt_snat.txlate
`, `,
}, &MakeHelper{ }, &MakeHelper{
Generate: "./autogen.sh",
Configure: []KV{ Configure: []KV{
{"enable-static"}, {"enable-static"},
}, },
@@ -123,7 +122,8 @@ ln -s ../system/bin/bash /bin/
chmod +w /etc/ && ln -s ../usr/src/iptables/etc/ethertypes /etc/ chmod +w /etc/ && ln -s ../usr/src/iptables/etc/ethertypes /etc/
`, `,
}, },
XZ, Automake,
Libtool,
PkgConfig, PkgConfig,
Bash, Bash,
Python, Python,