commit:     97c8fcf1379128d1d8acaa7144b5a96c0dabf637
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 14:15:26 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 18:12:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97c8fcf1

sys-kernel/gentoo-kernel: Bump to 6.9.12

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.9.12.ebuild      | 153 +++++++++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 7ed947e1d019..8d6818a32f9d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -42,6 +42,8 @@ DIST genpatches-6.9-11.base.tar.xz 636320 BLAKE2B 
c1a730341ca150f9f698300f59f43d
 DIST genpatches-6.9-11.extras.tar.xz 4052 BLAKE2B 
3b12fe75ae76ff17e30bb30d5e5cb913e31732bf43958b972356772e76d892823b925e715d9e777dc3ca39f89c01960b8d420d2647775d1e4406e4b82ef2c08b
 SHA512 
5fb378ce92f4d443ce162cd69771d6b9d150bb7be01e776c22cb913437c7b441a4474dcb33fe7d6d3f285ff0f8605b7aabd9149594d0e45ef8b231e3703ed026
 DIST genpatches-6.9-12.base.tar.xz 683040 BLAKE2B 
4a87ff8941e75ef372616a5d705bddd62b9c4d305f6806463cefbcd8b21ce5ceee587e875c7ed6b2be9c239635bf59c532290af71700a6d651873cdf21d5e539
 SHA512 
dcd0a956248c9c3cf7a978e35ab8304569005fa4b688491a6b3a73d4ed32f3fbd0b4389a8aecb5649a39b6b3a603baa74c9be7b1ad1aed6a016f57f9a00408ef
 DIST genpatches-6.9-12.extras.tar.xz 4056 BLAKE2B 
cbcee5bdc1567abc3b7b546607b0c7f59c48b58deebf24e2ee1141f4181b19d05cb5a3b799d5d7e1619f6708ee7083f96d2f581b74104d910150c53f5248559a
 SHA512 
c7016f5dd9b1be70c80439b5f5f651731e193991a7551304daa5628bf296546d94378e74193b98d695f7d4860f952ac200a67342321dde8075c028e6a5701c21
+DIST genpatches-6.9-13.base.tar.xz 688596 BLAKE2B 
4d999aac191dbde56dbb6feae3d328d2e33f4731b7f9f6853bcd7e7f47e73dcb182e64b41c05e3035fade78ad02157a4fadc7e2e7e0d6a0a4bba5ff49b071adb
 SHA512 
d9347755a75a5c34dee79cbf3eb012f7c3b669510c9fe1d87035ac36073139e9e22ca55cedf2bbda5cd493026637d266ea227473c9a3c6f402c0f0c41b9e3579
+DIST genpatches-6.9-13.extras.tar.xz 4060 BLAKE2B 
001215e8ff494a0daf42306c4f2301e477c4135a8817b4b0c2abe7bf6894c570e7bfcf8454d1db1703a52ab77b5d54dd6fcdcef72fc1a3e9730f238996830dd5
 SHA512 
9cbaa56e9d2dc20915d6831f73903ecefbc1361e56d27cf71df36db87b648643cb974cdea1ab96426a6eeec710259755fb58ec285425c6b7ba44f2a42bb5549e
 DIST genpatches-6.9-9.base.tar.xz 548708 BLAKE2B 
e0130d225056f77c92e566eef9db643ecdef6faf2f81e8329859830850bb5409e212aca0ab0da85b9b1e3377121221259044dac650986ec05feac46f4d588a5d
 SHA512 
714016638f866b536b85edd24e3e44513048591aa270dbee1460c5893b3e8b0508f299d86a202deacd10f105c0da48038d78219226b2808e17012d1811df391e
 DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B 
7be69cb63abf9df9267bc61e3e365672dbd1c0b3568d48bf949b660ff1abb483b28846eb36a162ddd9bd91473c25462440fd41a7ba3bac70467ad45fa88fdd29
 SHA512 
955cd846bb020d08888aac04ebc5c1e56429e11ac59601a3e068971ad05aee59b75a24722dc7fe2645ef4414424d21e117e2eeb24ae72a5949476a213f3383fa
 DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 
831f89078e539c8b4ce244528dfd847c12a45b52d540eb10d85ec0d9deb1c14288d8de12456865c92d16e3523ec3595676787a8f3b79545d76870b0fb68deb5d
 SHA512 
2a7230cce57a67e3333f9a88a311afe4a928e27ce76036747451cb77d3186569ad11d7a5b827748ad53290a17ad63637a8362ca896516f85ff0944a8d68265a6

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.9.12.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-6.9.12.ebuild
new file mode 100644
index 000000000000..4b4e283265b5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.9.12.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2020-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 toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.9.10-gentoo
+GENTOO_CONFIG_VER=g13
+
+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
+       
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 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
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm)
+                       return
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               hppa)
+                       return
+                       ;;
+               loong)
+                       return
+                       ;;
+               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
+                       ;;
+               riscv)
+                       return
+                       ;;
+               sparc)
+                       return
+                       ;;
+               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