commit:     a60d8875378dd4f00c72fb2d30fd40583a36df68
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 29 11:01:32 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 29 14:04:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a60d8875

sys-kernel/gentoo-kernel: Bump to 6.12.21

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

 sys-kernel/gentoo-kernel/Manifest                  |   3 +
 .../gentoo-kernel/gentoo-kernel-6.12.21.ebuild     | 144 +++++++++++++++++++++
 2 files changed, 147 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index b8fb5aa2fb6e..26cd1eef1f94 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -29,6 +29,9 @@ DIST genpatches-6.12-23.extras.tar.xz 4056 BLAKE2B 
dc27e7f57ea95e678f08d3b6f791a
 DIST genpatches-6.12-24.base.tar.xz 1500152 BLAKE2B 
634de57b5d91cdc4ff2c221f036ec11d36db1396be3d3f7e3967f2d9ec78335fe9fdbf84d582978147535fb287238ac7d18f5763beb4efb8cf0430b547b76fe8
 SHA512 
aa9663fe8226793e138d24f48f66bd4dbe113ee9cc04111707e652e0d104cb861eeb40caaf7b6aecd0a56770086211612d08e4c58abe38e75b36b92ce031cc9d
 DIST genpatches-6.12-24.experimental.tar.xz 78504 BLAKE2B 
e59854c0773526dc7071900a92cabb65a963f096c363af347eab6ee5ca5232326da76b5d4c16556bacdb85751bb9633cf432c3804a1ce3f60ef80b2b8615bbb9
 SHA512 
eaeacda6e5fc6016a293ec08bc2080c0a047681b024f0f86a304e0854a265bdfde7301f24783b1c378f3efbc07a217c49f3fe60087a0e21a414687cf87e2e4b7
 DIST genpatches-6.12-24.extras.tar.xz 4056 BLAKE2B 
21881a1d1182e60063e65132935e59a0ab66b3d6568b1ce4105df04f819bbb92a21422788ebf5ba763f09bd1341be2a5cd64d15f48684fcb3bac655b6d01e40c
 SHA512 
d2ddbcc2944196f0e7e22367951246467acb1fa6623413c1889fd3e52fcd3be855f5c793fbad8537353cacbea262b1eef664c60b39715470603a82bb41930623
+DIST genpatches-6.12-25.base.tar.xz 1528212 BLAKE2B 
818643d9f5ec5f4edc3cf2360f75bcf213ca99846e2bb96721933fa1785624aef8ae5c3ecd3af4f2e13e0cc44fed86e2d1cad8b53ed45acddcb9d91fc483c20b
 SHA512 
746f4b5523fc3ebb3c59211c7fb4a80714e6068ab769a001c044ad300621b5a4a7a0b0b06c5a689bbf382cb27098f36725962bafb4d6e4489ab44cdb19b6ed1d
+DIST genpatches-6.12-25.experimental.tar.xz 78504 BLAKE2B 
67f29383edfbcf8ee219d41e29534ba1ddbbfe7f1ec31b1227dc0c9fd45dbc4c0d101633f1d9a7487e4b2783adc040dd8b8a17b4d5f9194633e2567f05e72bf1
 SHA512 
306687dc70fd7e268941c201f40953df7f93ac92e1de91746d3cfe938c0a53761e915365cb2ccf91e97a9d583233b6567f2408a40adf2f38d00c06e3fabb043e
+DIST genpatches-6.12-25.extras.tar.xz 4056 BLAKE2B 
2244be3d7b4121232106ee8110cb12ab75c8ae1a15377dc87598e25a287b8ce48577945a1677b944ff5fb5ce31e7309121181effe3814d2a522250fdaf8bcaa1
 SHA512 
d4fffa688883298c41f0c0ceae9ebdc234ec615945165fd74f67d31ececb23a2c905c106aa63ff16ce28bab31b1e08660002b68df0e27e0b54682b2a4981bb92
 DIST genpatches-6.13-10.base.tar.xz 663656 BLAKE2B 
57d077fdb9f2550bb7f71386c65e1c39abc1e0e90ba16fa36010b4e731a554c24354a28c5b61fc1e7fe5bba187b0b0f96271d73cf5e6931b0c4df631c7c454d8
 SHA512 
67f1d1564e1c3f7debb7e8f8ed163f46a8b36c2d84179c97579df45cffcf70cc4c4d888380644c4df88aac8956439200e1cd467efdcf8cf1e6c9b405564052c6
 DIST genpatches-6.13-10.experimental.tar.xz 79168 BLAKE2B 
b7e1e3e0804098ef5832622e5b5a448736a24e6b4360a636ad66fdfdbfefd5b096f274dd743ee6e4fe6c972092235f4146d85ec3ca23304a0f3ecf492614636e
 SHA512 
b2dd9d73683d9034a7e82a9dd511d807d07c31a9b054ae57c0cff1cfc73cd00792d0278b0966333843146e562d151aff03277d06f566d5995453a0673d483494
 DIST genpatches-6.13-10.extras.tar.xz 4056 BLAKE2B 
0b1f54fde344f439375673cc8bb7c076f9809dafd46769897875e59fa8a27c0aafed7cc3b1137cc67fa906e874e052da67c37184a1e3fd343e8d60f53c8f1aa5
 SHA512 
9b5d3a03583c9312d309c67cae347957fc0739ce722c0f7e901e2a5812de392207a7f2126106c741966c4c3a9c7d0a5b01e39dd8deeda495b07cc85728992130

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.21.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.21.ebuild
new file mode 100644
index 000000000000..5b65f76f5b2f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.21.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2025 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 toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.12.8-gentoo
+GENTOO_CONFIG_VER=g15
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+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://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       experimental? (
+               
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.tar.xz
+       )
+       
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug experimental hardened"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( savedconfig )
+       riscv? ( savedconfig )
+       sparc? ( savedconfig )
+"
+
+RDEPEND="
+       !sys-kernel/gentoo-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
+       usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       default
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               arm | hppa | loong | riscv | sparc)
+                       > .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="-gentoo-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