diff options
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/Manifest.gz | bin | 13758 -> 13769 bytes | |||
| -rw-r--r-- | sys-libs/libnvidia-container/Manifest | 3 | ||||
| -rw-r--r-- | sys-libs/libnvidia-container/files/libnvidia-container-1.17.4-go-1.24.patch | 48 | ||||
| -rw-r--r-- | sys-libs/libnvidia-container/libnvidia-container-1.17.4.ebuild | 1 | ||||
| -rw-r--r-- | sys-libs/pkgcraft/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/pkgcraft/pkgcraft-0.0.16-r1.ebuild | 2 |
6 files changed, 53 insertions, 3 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz Binary files differindex caeb06d75c0f..c8befafa6745 100644 --- a/sys-libs/Manifest.gz +++ b/sys-libs/Manifest.gz diff --git a/sys-libs/libnvidia-container/Manifest b/sys-libs/libnvidia-container/Manifest index 84df5cbd9be5..4de53a105cdb 100644 --- a/sys-libs/libnvidia-container/Manifest +++ b/sys-libs/libnvidia-container/Manifest @@ -1,10 +1,11 @@ AUX libnvidia-container-1.17.0-fix-makefile-r1.patch 8040 BLAKE2B d7f3c6723d9ab25628eb40fd29749e2c3277330149ba21100a94f517b952b76992479c467c6338370e359007cb63e778db7242c9ece01c2c428ff37fbba3dab0 SHA512 478297e2874dd4fc0ac261430659375b11b68dbc8fb21e5f98d6a7d685cb2fa57140fbff402f742556e3a571d160b0b374514111b37e2efa60eb7708c3395ae7 +AUX libnvidia-container-1.17.4-go-1.24.patch 1681 BLAKE2B df0b26d5276fd78b912b24e64b8c6aa2f760f90b027543bd80e7a5a21a3740e9427668abd2eb51c9ca098daa625b07584c3f40e320e69c713a898707bd7302c4 SHA512 6af898fe455a2df81315544f62b960ddfa6cd3271bd461894f7fbf9bb40f293af348475f75288237d0a41a2ca38949984730213f54fc2abcac7e145b61820165 DIST libnvidia-container-1.17.2.tar.gz 1611920 BLAKE2B 571ddc5fda854999cd7d1b2bbc40d34728827bf2e9c26afe6784166db7202d2baa55b0ca0eba50be61b029645735aaf91655bfec55113996eaf8c5278b835cd8 SHA512 a791998012f681805b3cc0a3bd38abc958a523c3eaa13cab36be4e0242cfba095719d5f6fa59423453a81c3fc76c96a4bbfd2eea27d20e2ef2f9a03d3a447fd8 DIST libnvidia-container-1.17.3.tar.gz 1612952 BLAKE2B dad0bdf68d6f9e7b7ed37792a7b5609ae632bc450fe69d5d31e035e2e404ec32e5fd8f1663c66c5613041c5d9f814af692a77b6e522c62e673e1df1cf19abc29 SHA512 24293e369fea42ebe64163464f600808c0d18e8b4efeea12095de22e16d43837cb6441f46baf52e8c966810c76b0f5045737a96d173e2ecf8cd15fff37cd4c4f DIST libnvidia-container-1.17.4.tar.gz 1612093 BLAKE2B 225b0ffb31fca19f8b2996fb64cc31de59f1b38ad2a7389f8098bccabe4244289b3d857b51c9614f61cf770ced7eb74b55776e5398b1b4463d3b7d693c74a28e SHA512 a5edb4eec8cc4a9bd221c3cbb14515656854700b1a6aef7b47147d96b67511d5cfcae38c740fd946452768da0f993edf6c656697cd01189de88b67a4ae00aae5 DIST libnvidia-container-nvidia-modprobe-550.54.14.tar.gz 47147 BLAKE2B 7b334877d98d0c75d5750192dea868436938852443ced14e74e59076ed4d8be9e361cdefbe48295d87bb91ac4565152ec3f3233479b3da19bb8baf8e7ef53cd6 SHA512 279228aa315ff5fd1a23df23527aff58b2319f11f9fc7d939fa285ea933b4cc6d223451e20ecf7f50baba9f6c9c100e57cb77675d0d17fa77f19d3fea2ccc193 EBUILD libnvidia-container-1.17.2.ebuild 3260 BLAKE2B e52be0bc0d09afae9b4bae4cd01dab47a119fb8152bcdc706927e2a19ea0c783291d8b8399fd79c0440ecfd0b08119255ddb20c8c6941b711607f286bd69986f SHA512 d76505d08ae73e88f3e39c98c516503e52a9fe75cfd4f263cbf58823065b2605b0af59abd7416010a290e18c3e56d30838093f37b698d1713435a0d8a014bf72 EBUILD libnvidia-container-1.17.3.ebuild 3345 BLAKE2B 0d1d649008de4805bdc36f5140f1517e2c11952a2431d9d97dc19bd36d41a0320677e9953249e6ce1fbeccd8b3f3f2621b1e0b18c5ac7af434e4dd036c1d748b SHA512 c2651e762003e161fb2155e8f3d696da59d44919c56987a91b14a357937f104f63e6e5954f6821b108070113c3fde977e161c592275e94075ebf3b863234fd46 -EBUILD libnvidia-container-1.17.4.ebuild 3345 BLAKE2B 0d1d649008de4805bdc36f5140f1517e2c11952a2431d9d97dc19bd36d41a0320677e9953249e6ce1fbeccd8b3f3f2621b1e0b18c5ac7af434e4dd036c1d748b SHA512 c2651e762003e161fb2155e8f3d696da59d44919c56987a91b14a357937f104f63e6e5954f6821b108070113c3fde977e161c592275e94075ebf3b863234fd46 +EBUILD libnvidia-container-1.17.4.ebuild 3387 BLAKE2B bc060f2184cbc976f89934bf4465e9977e45c89ed924307be34a1f5e45b6bdd1fbe2e080298e4ff15cb64bc6bec72e6949efb12a11be556c477b73b27c0cc672 SHA512 55e8942f39caf496fba61d82069f1f864cbf611750a63bba9bd064278f882cc84f8c5e5b6896cc1cbd64911570014fb2958993b1e3503c804317ac817ccada24 EBUILD libnvidia-container-9999.ebuild 3345 BLAKE2B 0d1d649008de4805bdc36f5140f1517e2c11952a2431d9d97dc19bd36d41a0320677e9953249e6ce1fbeccd8b3f3f2621b1e0b18c5ac7af434e4dd036c1d748b SHA512 c2651e762003e161fb2155e8f3d696da59d44919c56987a91b14a357937f104f63e6e5954f6821b108070113c3fde977e161c592275e94075ebf3b863234fd46 MISC metadata.xml 1210 BLAKE2B 7a1af79b86dbe5a09eb4769a4a758db0f69cf93f8233dfe317822f1e9110bed783455abba7585bb2c67ef5386249dcf0c8ea07a42726674b87f86fd134a9fdb5 SHA512 48cd3f0a7170a0d6a5677da24e90bff0e9b6ed308a0cbec9e0e47e04d5a8f5d381eec7f992acdd3c8b1de4f144e2ba27c57b7d50d71ba3747ccb5f2bc44d860d diff --git a/sys-libs/libnvidia-container/files/libnvidia-container-1.17.4-go-1.24.patch b/sys-libs/libnvidia-container/files/libnvidia-container-1.17.4-go-1.24.patch new file mode 100644 index 000000000000..e2439651dd04 --- /dev/null +++ b/sys-libs/libnvidia-container/files/libnvidia-container-1.17.4-go-1.24.patch @@ -0,0 +1,48 @@ +https://patch-diff.githubusercontent.com/raw/NVIDIA/libnvidia-container/pull/297.patch + +From 1c680195fdc85948d635286b72a6ad9f823b5987 Mon Sep 17 00:00:00 2001 +From: Dmitry Sharshakov <dmitry.sharshakov@siderolabs.com> +Date: Thu, 13 Feb 2025 10:18:59 +0100 +Subject: [PATCH] Fix building with Go 1.24 + +Go 1.24 does not allow defining methods on C types anymore, so make convert a function, not a method. + +Fixes the following error when building with Go 1.24: +`./main.go:35:10: cannot define new methods on non-local type CDeviceRule` + +Signed-off-by: Dmitry Sharshakov <dmitry.sharshakov@siderolabs.com> +--- + src/nvcgo/main.go | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/nvcgo/main.go b/src/nvcgo/main.go +index 1523a06d..ed43be8e 100644 +--- a/src/nvcgo/main.go ++++ b/src/nvcgo/main.go +@@ -32,7 +32,7 @@ func main() {} + type CDeviceRule = C.struct_device_rule + + // Convert a C-based DeviceRule to a Go-based cgroup.DeviceRule +-func (r *CDeviceRule) convert() cgroup.DeviceRule { ++func convert(r *CDeviceRule) cgroup.DeviceRule { + return cgroup.DeviceRule{ + Allow: bool(r.allow), + Type: C.GoString(r._type), +@@ -67,7 +67,7 @@ func GetDeviceCGroupMountPath(version C.int, procRootPath *C.char, pid C.pid_t, + return -1 + } + *cgroupMountPath = C.CString(p) +- *cgroupRootPrefix= C.CString(r) ++ *cgroupRootPrefix = C.CString(r) + + return 0 + } +@@ -100,7 +100,7 @@ func AddDeviceRules(version C.int, cgroupPath *C.char, crules []CDeviceRule, rer + + rules := make([]cgroup.DeviceRule, len(crules)) + for i, cr := range crules { +- rules[i] = cr.convert() ++ rules[i] = convert(&cr) + } + + err = api.AddDeviceRules(C.GoString(cgroupPath), rules) diff --git a/sys-libs/libnvidia-container/libnvidia-container-1.17.4.ebuild b/sys-libs/libnvidia-container/libnvidia-container-1.17.4.ebuild index 5d4b6cda8900..b1e9266e9b98 100644 --- a/sys-libs/libnvidia-container/libnvidia-container-1.17.4.ebuild +++ b/sys-libs/libnvidia-container/libnvidia-container-1.17.4.ebuild @@ -53,6 +53,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.17.0-fix-makefile-r1.patch" + "${FILESDIR}/${PN}-1.17.4-go-1.24.patch" ) DOCS=( NOTICE README.md ) diff --git a/sys-libs/pkgcraft/Manifest b/sys-libs/pkgcraft/Manifest index 5bb0075e8bef..8f76e1784e47 100644 --- a/sys-libs/pkgcraft/Manifest +++ b/sys-libs/pkgcraft/Manifest @@ -1,4 +1,4 @@ DIST pkgcraft-c-0.0.16.tar.xz 20787816 BLAKE2B 085ee23fce8e03fa82fcec210e31f032cbe51354a14de2f2261329f432c0f6460363898d735dc7ed1c4115a184d6b7a3ff9a7c4d1697b12e34729cda54f6c234 SHA512 a805919375c8791b73a803a61c10df9ba0db87381f7fdec976428cf07b287bd10f02a6c97d1b7bb4d483b37a4ec6e027ae397067b658e4a4b422102e42d814e3 -EBUILD pkgcraft-0.0.16-r1.ebuild 2173 BLAKE2B ddff0959d7acd00253d7d8ddfeb800e84398192d5b9b749b6831596eda4874bc65675ebf5ec0123cc1346c90bc00029160acc9fdcf77960ef0b4e689e7e7bf49 SHA512 1650596a0845ec8363799b979ba302b0b75a36dd1997d8a350f84831e38789a1689de7bf9a3d1b81f579be697f941898c0358d89c040ace48f78007a00c82ffe +EBUILD pkgcraft-0.0.16-r1.ebuild 2172 BLAKE2B cf65c3d060734883d8c798fbb5210c6926119c0248d20fdad5ee70abee1371c8e50b3669902683e78e3bc83de89fc80c8a67760e9bfc2ca8a5e297f3abae10e9 SHA512 53b446748a3dfdd7c85ae5972bcd1f0cd2bc1670318fa469a45e5eddd28f95249c438934529d7bc2081b59583a090c0e77db7fd53bf7a2d24fe31412057f20a6 EBUILD pkgcraft-9999.ebuild 2173 BLAKE2B ddff0959d7acd00253d7d8ddfeb800e84398192d5b9b749b6831596eda4874bc65675ebf5ec0123cc1346c90bc00029160acc9fdcf77960ef0b4e689e7e7bf49 SHA512 1650596a0845ec8363799b979ba302b0b75a36dd1997d8a350f84831e38789a1689de7bf9a3d1b81f579be697f941898c0358d89c040ace48f78007a00c82ffe MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a diff --git a/sys-libs/pkgcraft/pkgcraft-0.0.16-r1.ebuild b/sys-libs/pkgcraft/pkgcraft-0.0.16-r1.ebuild index 5ef300f81b23..038e5f986a44 100644 --- a/sys-libs/pkgcraft/pkgcraft-0.0.16-r1.ebuild +++ b/sys-libs/pkgcraft/pkgcraft-0.0.16-r1.ebuild @@ -24,7 +24,7 @@ else SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${MY_P}/${MY_P}.tar.xz" S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm64" + KEYWORDS="amd64 ~arm64" fi LICENSE="MIT" |