commit: 7f641f3f0491ef5674c2a171a91bbfc5079b4ebb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 5 15:37:51 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 5 17:53:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f641f3f
sys-kernel/vanilla-kernel: Bump to 6.12.2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.12.2.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 3e5a6a81ff30..58560fdbef32 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,6 +38,8 @@ DIST linux-6.11.11.tar.sign 991 BLAKE2B
43c9f936cfc7838254484ab73efa8a29517bf579
DIST linux-6.11.11.tar.xz 147042416 BLAKE2B
47171f79f7d275a7cff2d9ff2f1e1fb1b1ebac9add8681469733d9ce03858959bc6324f47cd7bc9c61658c9d646c99f6ac27613c652a52f153ea4659d01a83ee
SHA512
2eb783c5e7a06178971acd594d8aa5b9d50cf02b266a2afe4d2c664037c86a3df131ff9073be20b2354c6b50f14860febae401181f97ca4b2b308e23bea9003d
DIST linux-6.12.1.tar.sign 989 BLAKE2B
13e9dc9afe6b77987d69835b14c61def632fb109cb7adc3ee5ac674a829949e16f67f30ccba4d6b7dc1722a3971b6e575fa921052bc97795c506a6e6cad56a04
SHA512
ec0d559643559fc90839f31b2b83aab6093f323a26c550163aea389a85a6fb07d1123b8a273d4704abd0f25e4d244dace9df5210451fd77b731b650ae41fc01b
DIST linux-6.12.1.tar.xz 147912528 BLAKE2B
de3f4dec2fc7e36711c68683d6564d0c3ce6fe728ffa6a629604e2fa9e489dbab45fd6676343f6e68bafbd202a3e814e82a1448b46844e34046b9f82f819b8f4
SHA512
c7523dc5b012367301ab43a685b766dce025c4993041acd3dacd085b052b3fccc7f50c892357acf481e24ccad512770ef46a13d2da16c2a178c44a27f7022932
+DIST linux-6.12.2.tar.sign 989 BLAKE2B
370acb844dfb0ce02bb62463fcc9884067ba9d143a79f9f9778e1169875454c9e8972e22e83ba6362a68aa913baf701f1901b8ef3fac3462fd99ff806c4518d2
SHA512
61955631861e0ebd503d85f02d731e63bc7d49408a9e48afff43945b6dc200e00e48844fc430b3089bc601fab5eb06d0601a6e6257d454b81e7f1a8adb8dd4b2
+DIST linux-6.12.2.tar.xz 147952264 BLAKE2B
3161f791e13156a97215b14ed9d0a18dfd69324e7fa516df2a9385678ba2a2cd67196aa9efd82f7d9f1cb2c91b8733a095ced66c491f3a80c8c70eec1dc703d8
SHA512
1e1531edecf60ff1d587b5806f10d0ebc7b981f22c5f7794b9997b9f33a1cb00e4d5fc89ca2d2fc67c67774d638ce5c4730270ff0aba94d9dc2dea6346af9ec9
DIST linux-6.6.62.tar.sign 989 BLAKE2B
fc8e42f4e6967a3b1617590e7eda620a1e422cd1991cef4be75a3a0b7a6f7a4a3517a0229a750665ef17893d12c3f74222f3115cf557804edd6c390470688ac9
SHA512
340234e7c438e3a6396d2aa7de330e82822158193d8f1daadd7f566f29da152fc465e461383e0ab1add8981df11bd51d2593d00729ea893553d1085b933176f4
DIST linux-6.6.62.tar.xz 140430984 BLAKE2B
be626b8e4af2394a9eca5024f0c6b2274d3bfccae9989c353d9b1a80c903f8a632cf986d43a0e283c02b62ae77a7409fbca6a6c7bf9cf1530119d7a712e8076f
SHA512
9b49ff136afe1044ed29b776246d91fbbc9976629f3dd30bd0ee233664db10c35cd1791fc1c82c0d9b2db8829e562c547db43da60a6de962100f2a0dbdbbd00c
DIST linux-6.6.63.tar.sign 989 BLAKE2B
16ab329b4e25021c785ffd5285e369ba9e54f084a6b06e5385973a8924b635b61d34159de9fef6675d569bf04ae2b5a77be4c861db29e68756142e7172ab9987
SHA512
72ed22a290f027386f2d864f91b6c79ccb49ad164576752b8ebe3ce755c8b49e710feb1c2520d9c147830da4ba258c059940331eebd4c544a406ef46f6773629
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.2.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.2.ebuild
new file mode 100644
index 000000000000..ee14efba51b8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.12.1-gentoo
+GENTOO_CONFIG_VER=g14
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+ https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+ https://www.kernel.org/
+"
+SRC_URI+="
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ verify-sig? (
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut
1).x/${MY_P}.tar.sign
+ )
+ amd64? (
+
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+ -> kernel-i686-fedora.config.${CONFIG_VER}
+ )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+ debug? ( dev-util/pahole )
+ verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+ if use verify-sig; then
+ einfo "Unpacking linux-${PV}.tar.xz ..."
+ verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+ < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar
-xf -))
+ assert "Unpack failed"
+ unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ default
+
+ local biendian=false
+
+ # prepare the default config
+ case ${ARCH} in
+ arm | hppa | loong)
+ > .config || die
+ ;;
+ amd64)
+ cp
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ arm64)
+ cp
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+ biendian=true
+ ;;
+ ppc)
+ # assume powermac/powerbook defconfig
+ # we still package.use.force savedconfig
+ cp
"${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+ ;;
+ ppc64)
+ cp
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+ biendian=true
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}"
.config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ local myversion="-dist"
+ use hardened && myversion+="-hardened"
+ 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
+ )
+ if use hardened; then
+ merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+ tc-is-gcc && merge_configs+=(
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+ if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+ merge_configs+=(
"${dist_conf_path}/hardened-${ARCH}.config" )
+ fi
+ fi
+
+ # this covers ppc64 and aarch64_be only for now
+ if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+ merge_configs+=( "${dist_conf_path}/big-endian.config" )
+ fi
+
+ use secureboot && merge_configs+=(
"${dist_conf_path}/secureboot.config" )
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
