From 04d9984da06a07c42416469474fd17b82ea7392e Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 2 Mar 2026 14:07:16 +0900 Subject: internal/rosa/meson: migrate to helper interface This change also removes some unused options. Signed-off-by: Ophestra --- internal/rosa/kmod.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'internal/rosa/kmod.go') diff --git a/internal/rosa/kmod.go b/internal/rosa/kmod.go index 5be48732..4292bbf7 100644 --- a/internal/rosa/kmod.go +++ b/internal/rosa/kmod.go @@ -7,13 +7,13 @@ func (t Toolchain) newKmod() pkg.Artifact { version = "34.2" checksum = "0K7POeTKxMhExsaTsnKAC6LUNsRSfe6sSZxWONPbOu-GI_pXOw3toU_BIoqfBhJV" ) - return t.NewViaMeson("kmod", version, pkg.NewHTTPGetTar( + return t.NewPackage("kmod", version, pkg.NewHTTPGetTar( nil, "https://www.kernel.org/pub/linux/utils/kernel/"+ "kmod/kmod-"+version+".tar.gz", mustDecode(checksum), pkg.TarGzip, - ), &MesonAttr{ - Configure: [][2]string{ + ), nil, &MesonHelper{ + Setup: [][2]string{ {"Dsysconfdir", "/system/etc"}, {"Dbashcompletiondir", "no"}, {"Dfishcompletiondir", "no"}, @@ -22,12 +22,12 @@ func (t Toolchain) newKmod() pkg.Artifact { }, // makes assumptions about the running kernel - SkipCheck: true, + SkipTest: true, }, - t.Load(Zlib), - t.Load(Zstd), - t.Load(OpenSSL), - t.Load(KernelHeaders), + Zlib, + Zstd, + OpenSSL, + KernelHeaders, ) } func init() { artifactsF[Kmod] = Toolchain.newKmod } -- cgit v1.3.1