From 83b0e32c550bf47eea826be7403183bf8f412850 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 13 Apr 2026 15:23:41 +0900 Subject: internal/rosa: helpers for common url formats This cleans up call site of NewPackage. Signed-off-by: Ophestra --- internal/rosa/kernel.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'internal/rosa/kernel.go') diff --git a/internal/rosa/kernel.go b/internal/rosa/kernel.go index 5b92fd50..508c52d5 100644 --- a/internal/rosa/kernel.go +++ b/internal/rosa/kernel.go @@ -4,10 +4,10 @@ import "hakurei.app/internal/pkg" const kernelVersion = "6.12.80" -var kernelSource = pkg.NewHTTPGetTar( - nil, "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/"+ +var kernelSource = newTar( + "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/"+ "snapshot/linux-"+kernelVersion+".tar.gz", - mustDecode("_iJEAYoQISJxefuWZYfv0RPWUmHHIjHQw33Fapix-irXrEIREP5ruK37UJW4uMZO"), + "_iJEAYoQISJxefuWZYfv0RPWUmHHIjHQw33Fapix-irXrEIREP5ruK37UJW4uMZO", pkg.TarGzip, ) @@ -1285,11 +1285,11 @@ func (t Toolchain) newFirmware() (pkg.Artifact, string) { version = "20260309" checksum = "M1az8BxSiOEH3LA11Trc5VAlakwAHhP7-_LKWg6k-SVIzU3xclMDO4Tiujw1gQrC" ) - return t.NewPackage("firmware", version, pkg.NewHTTPGetTar( - nil, "https://gitlab.com/kernel-firmware/linux-firmware/-/"+ - "archive/"+version+"/linux-firmware-"+version+".tar.bz2", - mustDecode(checksum), - pkg.TarBzip2, + return t.NewPackage("firmware", version, newFromGitLab( + "gitlab.com", + "kernel-firmware/linux-firmware", + version, + checksum, ), &PackageAttr{ // dedup creates temporary file Writable: true, -- cgit v1.3.1