From 96abf266dd8bbbb4ea65c74a3f84f2461a6021a7 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 20 May 2026 02:25:41 +0900 Subject: [PATCH] internal/rosa/package: migrate hwdata, kmod, libarchive This removes a blank line in CTestCustom.cmake, causing a libarchive rebuild. Resulting IR is identical otherwise. Signed-off-by: Ophestra --- internal/rosa/hwdata.go | 32 ------------- internal/rosa/kmod.go | 48 ------------------- internal/rosa/package/hwdata.az | 23 +++++++++ internal/rosa/package/kmod.az | 40 ++++++++++++++++ .../libarchive/CTestCustom.cmake} | 35 -------------- internal/rosa/package/libarchive/package.az | 19 ++++++++ 6 files changed, 82 insertions(+), 115 deletions(-) delete mode 100644 internal/rosa/hwdata.go delete mode 100644 internal/rosa/kmod.go create mode 100644 internal/rosa/package/hwdata.az create mode 100644 internal/rosa/package/kmod.az rename internal/rosa/{libarchive.go => package/libarchive/CTestCustom.cmake} (79%) create mode 100644 internal/rosa/package/libarchive/package.az diff --git a/internal/rosa/hwdata.go b/internal/rosa/hwdata.go deleted file mode 100644 index 454cec28..00000000 --- a/internal/rosa/hwdata.go +++ /dev/null @@ -1,32 +0,0 @@ -package rosa - -import "hakurei.app/internal/pkg" - -func (t Toolchain) newHwdata() (pkg.Artifact, string) { - const ( - version = "0.407" - checksum = "6p1XD0CRuzt6hLfjv4ShKBW934BexmoPkRrmwxD4J63fBVCzVBRHyF8pVJdW_Xjm" - ) - return t.NewPackage("hwdata", version, newFromGitHub( - "vcrhonek/hwdata", - "v"+version, checksum, - ), &PackageAttr{ - Writable: true, - EnterSource: true, - }, &MakeHelper{ - // awk: fatal: cannot open file `hwdata.spec' for reading: No such file or directory - InPlace: true, - - // lspci: Unknown option 'A' (see "lspci --help") - SkipCheck: true, - }), version -} -func init() { - native.mustRegister(Toolchain.newHwdata, &Metadata{ - Name: "hwdata", - Description: "contains various hardware identification and configuration data", - Website: "https://github.com/vcrhonek/hwdata", - - ID: 5387, - }) -} diff --git a/internal/rosa/kmod.go b/internal/rosa/kmod.go deleted file mode 100644 index 7166eceb..00000000 --- a/internal/rosa/kmod.go +++ /dev/null @@ -1,48 +0,0 @@ -package rosa - -import "hakurei.app/internal/pkg" - -func (t Toolchain) newKmod() (pkg.Artifact, string) { - const ( - version = "34.2" - checksum = "0K7POeTKxMhExsaTsnKAC6LUNsRSfe6sSZxWONPbOu-GI_pXOw3toU_BIoqfBhJV" - ) - return t.NewPackage("kmod", version, newTar( - "https://www.kernel.org/pub/linux/utils/kernel/"+ - "kmod/kmod-"+version+".tar.gz", - checksum, - pkg.TarGzip, - ), nil, &MesonHelper{ - Setup: []KV{ - {"Dmoduledir", "/system/lib/modules"}, - {"Dsysconfdir", "/system/etc"}, - {"Dbashcompletiondir", "no"}, - {"Dfishcompletiondir", "no"}, - {"Dxz", "disabled"}, - {"Dmanpages", "false"}, - }, - - // makes assumptions about the running kernel - SkipTest: true, - }, - Zlib, - Zstd, - OpenSSL, - KernelHeaders, - ), version -} -func init() { - native.mustRegister(Toolchain.newKmod, &Metadata{ - Name: "kmod", - Description: "a set of tools to handle common tasks with Linux kernel modules", - Website: "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git", - - Dependencies: P{ - Zlib, - Zstd, - OpenSSL, - }, - - ID: 1517, - }) -} diff --git a/internal/rosa/package/hwdata.az b/internal/rosa/package/hwdata.az new file mode 100644 index 00000000..2a760eb2 --- /dev/null +++ b/internal/rosa/package/hwdata.az @@ -0,0 +1,23 @@ +package hwdata { + description = "contains various hardware identification and configuration data"; + website = "https://github.com/vcrhonek/hwdata"; + anitya = 5387; + + version* = "0.407"; + source = remoteGitHub { + suffix = "vcrhonek/hwdata"; + tag = "v"+version; + checksum = "6p1XD0CRuzt6hLfjv4ShKBW934BexmoPkRrmwxD4J63fBVCzVBRHyF8pVJdW_Xjm"; + }; + + writable = true; + enterSource = true; + + exec = make { + // awk: fatal: cannot open file `hwdata.spec' for reading: No such file or directory + inPlace = true; + + // lspci: Unknown option 'A' (see "lspci --help") + skipCheck = true; + }; +} diff --git a/internal/rosa/package/kmod.az b/internal/rosa/package/kmod.az new file mode 100644 index 00000000..c4b4733a --- /dev/null +++ b/internal/rosa/package/kmod.az @@ -0,0 +1,40 @@ +package kmod { + description = "a set of tools to handle common tasks with Linux kernel modules"; + website = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"; + anitya = 1517; + + version* = "34.2"; + source = remoteTar { + url = "https://www.kernel.org/pub/linux/utils/kernel/"+ + "kmod/kmod-"+version+".tar.gz"; + checksum = "0K7POeTKxMhExsaTsnKAC6LUNsRSfe6sSZxWONPbOu-GI_pXOw3toU_BIoqfBhJV"; + compress = gzip; + }; + + exec = meson { + setup = { + "Dmoduledir": "/system/lib/modules"; + "Dsysconfdir": "/system/etc"; + "Dbashcompletiondir": "no"; + "Dfishcompletiondir": "no"; + "Dxz": "disabled"; + "Dmanpages": "false"; + }; + + // makes assumptions about the running kernel + skipTest = true; + }; + + inputs = [ + zlib, + zstd, + openssl, + kernel-headers, + ]; + + runtime = [ + zlib, + zstd, + openssl, + ]; +} diff --git a/internal/rosa/libarchive.go b/internal/rosa/package/libarchive/CTestCustom.cmake similarity index 79% rename from internal/rosa/libarchive.go rename to internal/rosa/package/libarchive/CTestCustom.cmake index d79f1282..805c408e 100644 --- a/internal/rosa/libarchive.go +++ b/internal/rosa/package/libarchive/CTestCustom.cmake @@ -1,20 +1,3 @@ -package rosa - -import "hakurei.app/internal/pkg" - -func (t Toolchain) newLibarchive() (pkg.Artifact, string) { - const ( - version = "3.8.7" - checksum = "CUJK4MDQmZmATClgQBH2Wt-7Ts4iiSUlg1J_TVb6-5IK3rVUgVLIMc5k-bnWB9w3" - ) - return t.NewPackage("libarchive", version, newFromGitHub( - "libarchive/libarchive", - "v"+version, checksum, - ), &PackageAttr{ - Paths: []pkg.ExecPath{ - pkg.Path(AbsUsrSrc.Append( - "CTestCustom.cmake", - ), false, pkg.NewFile("CTestCustom.cmake", []byte(` list(APPEND CTEST_CUSTOM_TESTS_IGNORE "libarchive_test_archive_string_conversion_fail_c" "libarchive_test_archive_string_conversion_fail_latin1" @@ -78,21 +61,3 @@ list(APPEND CTEST_CUSTOM_TESTS_IGNORE "libarchive_test_read_format_ustar_filename" "libarchive_test_read_append_wrong_filter" ) -`))), - }, - - Writable: true, - ScriptEarly: ` -install -Dv /usr/src/CTestCustom.cmake /cure/ -`, - }, (*CMakeHelper)(nil)), version -} -func init() { - native.mustRegister(Toolchain.newLibarchive, &Metadata{ - Name: "libarchive", - Description: "multi-format archive and compression library", - Website: "https://www.libarchive.org/", - - ID: 1558, - }) -} diff --git a/internal/rosa/package/libarchive/package.az b/internal/rosa/package/libarchive/package.az new file mode 100644 index 00000000..2816e299 --- /dev/null +++ b/internal/rosa/package/libarchive/package.az @@ -0,0 +1,19 @@ +package libarchive { + description = "multi-format archive and compression library"; + website = "https://www.libarchive.org"; + anitya = 1558; + + version* = "3.8.7"; + source = remoteGitHub { + suffix = "libarchive/libarchive"; + tag = "v"+version; + checksum = "CUJK4MDQmZmATClgQBH2Wt-7Ts4iiSUlg1J_TVb6-5IK3rVUgVLIMc5k-bnWB9w3"; + }; + + files = [ "CTestCustom.cmake" ]; + + writable = true; + early = "\ninstall -Dv /usr/src/CTestCustom.cmake /cure/\n"; + + exec = cmake {}; +}