From 530543bcd77e1e0e63c59e0f2f8c8c0380ca0cd3 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Sat, 26 Oct 2024 22:32:57 +0300 Subject: [PATCH] sys-kernel/xanmod-kernel: netfilter: xtables: fix typo Get genpatches fix from ::gentoo. Closes: https://bugs.gentoo.org/941988 Signed-off-by: Alfred Wingate --- sys-kernel/xanmod-kernel/Manifest | 4 + .../xanmod-kernel-6.11.5-r1.ebuild | 87 +++++++++++++++++++ .../xanmod-kernel-6.6.58-r1.ebuild | 86 ++++++++++++++++++ 3 files changed, 177 insertions(+) create mode 100644 sys-kernel/xanmod-kernel/xanmod-kernel-6.11.5-r1.ebuild create mode 100644 sys-kernel/xanmod-kernel/xanmod-kernel-6.6.58-r1.ebuild diff --git a/sys-kernel/xanmod-kernel/Manifest b/sys-kernel/xanmod-kernel/Manifest index 7c06c30..70928fb 100644 --- a/sys-kernel/xanmod-kernel/Manifest +++ b/sys-kernel/xanmod-kernel/Manifest @@ -4,12 +4,16 @@ DIST genpatches-6.11-5.base.tar.xz 531212 BLAKE2B c9e98632ebd2e74f59dfee66d13f9e DIST genpatches-6.11-5.extras.tar.xz 4056 BLAKE2B a09e9802239237005410082eb6c4294a13cb3d415be4bd83aaea52ff37f472d4ab743fda02c8cff76a12e232044a91fe2ba83e0e46055edf28a5f473cf7f863c SHA512 3556b2f09e4f9e328bb04fb1e40b26038ef98864741b517f222c98fbb75975b34ce5d091df571f4e65b707fc8a74eb395f687a20f9f8ea0d617c4c8ccf8fa288 DIST genpatches-6.11-6.base.tar.xz 561884 BLAKE2B 8fd4ee418b02f2dad7e8599477d03dc56b7e3ab8752d9e73bec91e9f7e01d1615aaf4d14b1091314bd82a15ff443b16d3cb4be58c4a46f33a1f95ff8bb85d82f SHA512 109f1e9e562eac0c606ef621bd2ebc4bda96a26002999765e31551edc6070c46de6c24dc4387389f964fdde485aee0048e01bf5189997b84111334c2f239d5f8 DIST genpatches-6.11-6.extras.tar.xz 4056 BLAKE2B 7884aa8796e7b79db2b0db6aff5cf02119ac092d95529e0d0ee78ae5458faddf4fdc288b222f3126bb40749cb2ebb7bf2ac3fc6f77f1d2fb46d53b4b62b75c7e SHA512 b7c927e5bf90be5afb0cd479d385c7170316cf74c2aff136ab966734c82e6f4a1791a12124c7a73065711ba22f9260a3094f2bfbc8d0674ba46c158b2e147774 +DIST genpatches-6.11-7.base.tar.xz 562312 BLAKE2B 80227e573f63c6356c846fc1608ceaf336f209887a00e95504125298b24c3497a44fe53f7fb231b1cc2f0cdcc82a49e2bbb8496e16f182ef4884c7da15c62bae SHA512 02441292bcfa15034f7bbdfc7c92b4c0e583208cc9c94f20c7f0edf4c18cb56630de0e888d5ec208c15ea75f03f8194bcf8b1d2ebad2b5e38f11632289928ad3 +DIST genpatches-6.11-7.extras.tar.xz 4060 BLAKE2B 073ddb98be6a0ea659f5b494574f0c004ad9342a6ae9bf6b2c46ca83f44f10f8cb02a6df3b7f054d9828dac5d5488d3920d21157848cd85340a0fe7c9dfb34dd SHA512 0b0b41516a7e47fb93ec819e90cbadd000b9615445dce61fda136028788791803f5681caef5e8e86c536063979dddae36d7c8e473a40fa1f65117f7125b1e5c8 DIST genpatches-6.6-62.base.tar.xz 3451484 BLAKE2B 526cd644a849da225bea9e77c91320c6fd28c26609e47123051eacc13827d9307b8bce1e53c0ec7ffbaaa9424c2da8d6573d40fc6ac18b4ab99f471b2ee7818b SHA512 68e0423803d0328bdde104b8eed06b144cd9aea0a6f8af8698c9d954fb3301a600de0bb9c48e084f957ca0efcbac5afb6520d234b8b2daba45cc203514931393 DIST genpatches-6.6-62.extras.tar.xz 4060 BLAKE2B a475e52b151241692f6db4b41b19d6ee0212fafa1570ca47bd9c1b6e3a3b00a00f3a12a023f5c13f519dac46a01147d513ebfe37011fc289e9b3590fa2fe5a69 SHA512 dfcc7657e7299fca6d3da30fa2ecbdcc00cc1133607d3ded5d2f8f9dbfd5877906e357368665fe3757ae6b873ae4313c321ff79b8cda5ed213b7a1866dc9009a DIST genpatches-6.6-63.base.tar.xz 3551092 BLAKE2B 8edca00c49096ef4682038389b19e312773d3a56e29a03527e8f39ae835243193e2afce6411e0f1404af899793e766e108134d990dc666f15eebf02d6dfe6475 SHA512 0b51ff04cf01262502c3b1651288a87f235f3c1f4cf8b92699161353ddd75cbaecc27b8f2838375d77a4cf99a746a2175eab6fb0d23fdea67a6d4e9b89279ca3 DIST genpatches-6.6-63.extras.tar.xz 4056 BLAKE2B a7a361bfe180362510300753b3fea12bb0ec1014a3b7307211931193672db1216abf994ba8cb22cf365221202dd93f4b49fff6970c8eb88b7a77ef7bd02d1f12 SHA512 49574eac90eb749de544afaa7102163607bc24e2214ccc3c84cb6bf8f60773c45831da93bb5598aa4b933f65455228649afcba6d93107a81a666828b0919b18e DIST genpatches-6.6-64.base.tar.xz 3582172 BLAKE2B e607e40b069b41983d461bdf9e3d6cb1bf53f6bdedef80934da3feaf7760ecc01fe77ae76980351e56d3358cbca8ba514b83719a6943b3ad3582bc5e1f55f949 SHA512 c33db1d09741c996c3e63253e24cd06e0b1ddcd66c602007394c2f8bf1800d5144fe6f27643954b004057cd2056d8e353a5aa67456c1afbdb3aa23e540a45792 DIST genpatches-6.6-64.extras.tar.xz 4060 BLAKE2B d91c7df7c970efbe0126a3e189daa71ac02259cf1746f432ac702af7991c04bf235c28ffb578ffb2250e92e2c475ecdadef97645b510606cb395e725dec348fa SHA512 c26f1c1446ccafb751bcb8d05a41d378ce670b8115ec79e1b9a21714a1275c75ca36b68424b17717cd5b75fc1421a132eff0fcc31f7f32bc192964f3c64a381c +DIST genpatches-6.6-65.base.tar.xz 3582916 BLAKE2B 3d750c677e61c122144de989a55db6f04a2a545981858b71c602c156f802478ad19f4d87629760be724a9b522b377479df9f0c5f9a859235c5fc438df95c2aae SHA512 1ac5e7fb36e50227a6bdf035562f11401ef6a19c1a7af2d001d224b8710e3aa10434d828a3a0213a1f5cce101992bb803199e5d4e76474b657dc5c4d6328c385 +DIST genpatches-6.6-65.extras.tar.xz 4060 BLAKE2B 53cdbf5d680c9943d189e7606caa10c18bd3317789ffc1f120bf535255d80bfb5e3969fe952eb0da3c1001ee41e93755616332363465d4714a67a90140c43bfb SHA512 b5b3c817426be391a72633740beb4ba7b4e2546ee441081906d77ba31636321501af414140d487d284de325f80d004aefb241f3e349ef3ccd62d2c6fc4d7cf7e DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 831f89078e539c8b4ce244528dfd847c12a45b52d540eb10d85ec0d9deb1c14288d8de12456865c92d16e3523ec3595676787a8f3b79545d76870b0fb68deb5d SHA512 2a7230cce57a67e3333f9a88a311afe4a928e27ce76036747451cb77d3186569ad11d7a5b827748ad53290a17ad63637a8362ca896516f85ff0944a8d68265a6 DIST gentoo-kernel-config-g14.tar.gz 5686 BLAKE2B e5147ff4ffab92428b3e7f1b0897b997f8a298805f4f43b0a4d3047607bbb1a5ebfc268e0bb9688372a5eda561df9f256c78e00cdd7e3caf7868724214722f56 SHA512 f79638f9ff9dd0154512baf0234024216b6708d35a3c03a580ca5913286ad1ea13bdde5ea9b4722c6a7cd8d591c11ec52c1e225111a260343cd56aa1f1a88502 DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab SHA512 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea diff --git a/sys-kernel/xanmod-kernel/xanmod-kernel-6.11.5-r1.ebuild b/sys-kernel/xanmod-kernel/xanmod-kernel-6.11.5-r1.ebuild new file mode 100644 index 0000000..1cf4888 --- /dev/null +++ b/sys-kernel/xanmod-kernel/xanmod-kernel-6.11.5-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 + +inherit kernel-build + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 )) +GENTOO_CONFIG_VER=g14 + +XANMOD_VERSION="1" + +DESCRIPTION="Linux kernel built with XanMod and Gentoo patches" +HOMEPAGE="https://www.kernel.org/ https://xanmod.org/" +SRC_URI=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://downloads.sourceforge.net/xanmod/patch-${PV}-xanmod${XANMOD_VERSION}.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="-* ~amd64" + +IUSE="debug" + +RDEPEND=" + !sys-kernel/xanmod-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +QA_FLAGS_IGNORED=" + usr/src/linux-.*/scripts/gcc-plugins/.*.so + usr/src/linux-.*/vmlinux +" + +src_prepare() { + # Remove linux-stable patches (see 0000_README) + find "${WORKDIR}" -maxdepth 1 -name "1[0-4][0-9][0-9]*.patch" -exec rm {} + || die + + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/patch-${PV}-xanmod${XANMOD_VERSION} + "${WORKDIR}"/*.patch + ) + default + + # prepare the default config + case ${ARCH} in + amd64) + cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v2" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + rm "${S}/localversion" || die + local myversion="-xanmod${XANMOD_VERSION}-dist" + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" + + local merge_configs=( + "${T}"/version.config + "${dist_conf_path}"/base.config + "${FILESDIR}"/x86-64-v1.config # keep v1 for simplicity, distribution kernels support user modification. + ) + use debug || merge_configs+=( + "${dist_conf_path}"/no-debug.config + ) + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +} diff --git a/sys-kernel/xanmod-kernel/xanmod-kernel-6.6.58-r1.ebuild b/sys-kernel/xanmod-kernel/xanmod-kernel-6.6.58-r1.ebuild new file mode 100644 index 0000000..a6357a5 --- /dev/null +++ b/sys-kernel/xanmod-kernel/xanmod-kernel-6.6.58-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 + +inherit kernel-build + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 )) +GENTOO_CONFIG_VER=g14 + +XANMOD_VERSION="1" + +DESCRIPTION="Linux kernel built with XanMod and Gentoo patches" +HOMEPAGE="https://www.kernel.org/ https://xanmod.org/" +SRC_URI=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://downloads.sourceforge.net/xanmod/patch-${PV}-xanmod${XANMOD_VERSION}.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="-* ~amd64" + +IUSE="debug" + +RDEPEND=" + !sys-kernel/xanmod-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +QA_FLAGS_IGNORED=" + usr/src/linux-.*/scripts/gcc-plugins/.*.so + usr/src/linux-.*/vmlinux +" + +src_prepare() { + # Remove linux-stable patches (see 0000_README) + find "${WORKDIR}" -maxdepth 1 -name "1[0-4][0-9][0-9]*.patch" -exec rm {} + || die + + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/patch-${PV}-xanmod${XANMOD_VERSION} + "${WORKDIR}"/*.patch + ) + default + + # prepare the default config + case ${ARCH} in + amd64) + cp "${S}/CONFIGS/xanmod/gcc/config_x86-64-v1" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + rm "${S}/localversion" || die + local myversion="-xanmod${XANMOD_VERSION}-dist" + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" + + local merge_configs=( + "${T}"/version.config + "${dist_conf_path}"/base.config + ) + use debug || merge_configs+=( + "${dist_conf_path}"/no-debug.config + ) + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +}