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/mesa.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'internal/rosa/mesa.go') diff --git a/internal/rosa/mesa.go b/internal/rosa/mesa.go index 43a95219..33881a29 100644 --- a/internal/rosa/mesa.go +++ b/internal/rosa/mesa.go @@ -7,11 +7,11 @@ func (t Toolchain) newLibglvnd() (pkg.Artifact, string) { version = "1.7.0" checksum = "eIQJK2sgFQDHdeFkQO87TrSUaZRFG4y2DrwA8Ut-sGboI59uw1OOiIVqq2AIwnGY" ) - return t.NewPackage("libglvnd", version, pkg.NewHTTPGetTar( - nil, "https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/"+ - "v"+version+"/libglvnd-v"+version+".tar.bz2", - mustDecode(checksum), - pkg.TarBzip2, + return t.NewPackage("libglvnd", version, newFromGitLab( + "gitlab.freedesktop.org", + "glvnd/libglvnd", + "v"+version, + checksum, ), nil, (*MesonHelper)(nil), Binutils, // symbols check fail with llvm nm ), version @@ -33,11 +33,11 @@ func (t Toolchain) newLibdrm() (pkg.Artifact, string) { version = "2.4.131" checksum = "riHPSpvTnvCPbR-iT4jt7_X-z4rpwm6oNh9ZN2zP6RBFkFVxBRKmedG4eEXSADIh" ) - return t.NewPackage("libdrm", version, pkg.NewHTTPGetTar( - nil, "https://gitlab.freedesktop.org/mesa/libdrm/-/archive/"+ - "libdrm-"+version+"/libdrm-libdrm-"+version+".tar.bz2", - mustDecode(checksum), - pkg.TarBzip2, + return t.NewPackage("libdrm", version, newFromGitLab( + "gitlab.freedesktop.org", + "mesa/libdrm", + "libdrm-"+version, + checksum, ), nil, (*MesonHelper)(nil), Binutils, // symbols check fail with llvm nm -- cgit v1.3.1