commit:     82018545032b0dbc89abeab41cdc70525a0798f1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 14:16:40 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 17:56:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82018545

sys-kernel/vanilla-kernel: Bump to 6.12.7

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.12.7.ebuild    | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 7a83d7eb95c5..45cf61c37923 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -64,6 +64,8 @@ DIST linux-6.12.5.tar.sign 989 BLAKE2B 
71928e3e4657857ea19b6267aed7616ce60b559cc
 DIST linux-6.12.5.tar.xz 148003000 BLAKE2B 
bca871f8ebc2b2d286c0d2fb8526aeff835aa9eb4af43c307dea08c9da31592310e3e103d3294152a7e011f8539629c0cec925d23cb635191cdd41da86babc29
 SHA512 
1331df19fda83120d2b5491b6978cce4003229892b4fa40d5b8c10910293207cc36ec212621583e6c848f8ba42179637437f03df353aabe941922846f84a2371
 DIST linux-6.12.6.tar.sign 989 BLAKE2B 
c6f0688bcb86988b02b67e962faa3a150058880668f4f5baf1690771b8985d8f30bb102b023e6d76fc1ce500d9305ecf4e714af728864c28b13d7bada6bdaa5b
 SHA512 
144e8daafb2542f4621deeecbd8c733764037c9b0c3a64b6762fdb76d7d29e3a5f1ab352af1c400a6e4852e1f290251359e8ea54080d32284dede0f62024af61
 DIST linux-6.12.6.tar.xz 147963588 BLAKE2B 
b1b992e1c03c095203a6aa8e529768c0af00fc89e1afbbcb56821465a9e78fb8f8ca19d038bc1f08c5286e1781b407d49775f28153572d3b9fe8d80b86d540bf
 SHA512 
35fcfc5044b1bf892b6432a330df26c5601f78f78f416400359f5e08c448255bcf424de611e67ff7ac72d014884d5f3c6c2bddb20d08dd47469df5c0424832f9
+DIST linux-6.12.7.tar.sign 989 BLAKE2B 
f991ff0c9c1c5ecd7a7ab2d1f2179ebcc68253230134adea804aa95206611ea7b2034d3e653ecb257bc800189720e4c59c30fb1f788fa1bc0abb1ef914a45807
 SHA512 
261ed11790468b753a45b074fb578d2d3b88277df1c508a8e5e0ce3221ca1f8a9549afbec12e90ef96acf788be4ea7aa82e46ebc54225a51d4ca2a3aead5344e
+DIST linux-6.12.7.tar.xz 147968308 BLAKE2B 
ddf10abdcc50c077495050bd695b1e6f2547955c8f6a07a689e38a35c205ccc97849a1270be844eb30d07f396eb9af2f3ea8b4ad0c383711785456cc910d4554
 SHA512 
e8e59e20319346f3489994b92deda5063b558a7445af145f77a3e5bee51aecfe6b7f7f408f7eebf4656d20236c69c0aaee389dae98d07bdcec138fac41d2ebf0
 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.7.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.7.ebuild
new file mode 100644
index 000000000000..64de0d89a2d6
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.12.7.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.5-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[@]}"
+}

Reply via email to