commit:     69831635e3a69b545cebb4517c0998611747ad53
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 18:32:30 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 21:02:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69831635

sys-kernel/vanilla-kernel: Bump to 6.11.9

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index d6366de86dc8..99e8f1ca871d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -54,6 +54,8 @@ DIST linux-6.11.7.tar.sign 989 BLAKE2B 
8f0830ce9b1deb87c6724a24ad3806d399dc1ee67
 DIST linux-6.11.7.tar.xz 146976356 BLAKE2B 
4d1aec68c93f3159099ac02a6d4bbc46f207383079ea3117102b9d657964132d946b9579e4e8582a0cf9c79170de0b7a0c5fac2b6e1b36aabd5e66340bec3c18
 SHA512 
4e6c985e817342024f253db478d97c575f27c4b199f59930421c120150292b6c6bdfae5724cc52e4775b426f274905876a51efe0fcb7a325c3fa288a368bd1f5
 DIST linux-6.11.8.tar.sign 989 BLAKE2B 
ca145a23a024875c64bffef46e328a4a2814d9e6b71f6f01eee02706b96c1cfa2ca9de93d1bd81c97bd9ce28de53317c302d59dac4f05a37fa1fad5f52c7d3be
 SHA512 
63546e092e4e868c49aca6d82fef378978ac56bb26b20bd9e43e060df14edc97b09562186c8295a51e8f1a197cec12f975afe383856416d1f12fcce003aeafbe
 DIST linux-6.11.8.tar.xz 146987856 BLAKE2B 
2d3b56bf4fa3a3d20c5379856c9e2d2ce7220bc05320859e123053d08138dd380f9aa7a9d11df3a8fbe07583a28bafffc0ffd3ed9cf28ebf09d6af7e97a0ed5f
 SHA512 
f63e52b7ff8218126e1453d82337cc0a2052290b5a440b1f41f03ab66f57f26d9cb0d1296989f982615f88e8c6bc8fa169119a6447916526c6b0baf655df5da9
+DIST linux-6.11.9.tar.sign 989 BLAKE2B 
c85389258ffbbecb275af2a1a9eb5b57a96951b933f48d8c0c7fffa2a89eb813edad154ba25a10d158c265785940e34c6374f35767b88ded75ac475a76297b0d
 SHA512 
c179ec9913bc1ec7d876df9b9d3d586996720c5cc88a34d785a9a5a364e28f00c04051df432c2e80bd19eca5cebeee62a3806bc5768b0c68fbe02ecd0e8df10a
+DIST linux-6.11.9.tar.xz 147016756 BLAKE2B 
97787b71bcf6a57872078e46917b3b6e339f25a0320dabe226fe5fe91e3eb829e3749b096eec4525fd1d6f25805f54f8a2d2b71a41bc94fd35c2b9c9140f25d7
 SHA512 
4b4e986150e09404a529828aaca59d42c9553d5159863bb88a215d9e7dc208e2fceff33a01019ef4e9c474db8d988779d89a64e04c961c9db16db8948022d123
 DIST linux-6.6.58.tar.sign 989 BLAKE2B 
ef24dd2e2cfb2430b3d3aa79b1ad4bbea1aebbdce03c4ee8d00aa14697ab2160cf98479bb54a4877e2ee783a7db2a117ff07b61983a66e10a2e3f37c4e8e6768
 SHA512 
2b6aeb6816a96d13c9d56014179910b58bd4f6c047f70d9581f18996d081c7fea6ee105e3832b333df7d3c4a822c307bac8d90b08a1f375192c6a86e74bc70b0
 DIST linux-6.6.58.tar.xz 140387240 BLAKE2B 
f621a4f786ac1f043b70419f6b623075c771eff6765a51130d1ae710b58202988286332be90f3a1849a75f9bc44463a23a1f69b38906d469abaf2075730e646c
 SHA512 
695203f9f4486a928ab50bbfb761feeebd59b82f0e090fb126a8584dd676bcc5a6c6a5feb8c5d576891d7ae3ae31cca3a35c2655f06e8410818c24a1edfe0136
 DIST linux-6.6.59.tar.sign 989 BLAKE2B 
8060c1282d31f3ca4ec5552d311cf6a79d8f89efef19a7cd64b9095973f2941c823bcece2482026e12acc4f28631e1bcd7d34f20636d17d348f93f200e939515
 SHA512 
a2ced94d03b65aed94130a18579fd2a561775bc0c1adac44c2eeb339cca463edb9ab88e784d3e7e90afc2d66d98a8dbfb27c33203235299b58cd2154a94dfa74

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.11.9.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.11.9.ebuild
new file mode 100644
index 000000000000..3c2cad2b80b7
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.11.9.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.11.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