commit:     b5d535c2c258c8ed57ea7921910595bf3a1e45bd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  5 15:36:17 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec  5 17:53:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5d535c2

sys-kernel/vanilla-kernel: Bump to 6.11.11

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index e24abec50cd2..3e5a6a81ff30 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -34,6 +34,8 @@ DIST linux-6.1.119.tar.sign 991 BLAKE2B 
2b730bb727466194ea6aa1051a9f85d686876aff
 DIST linux-6.1.119.tar.xz 135231592 BLAKE2B 
ffdb7f08bc2e5c6a52889d0813490dd95126dc69baac6237f064b4a43b8d472ed80f0a4db92d0779c565bf3a7d6c4def75749d48687d5e1e4330f776a10a2630
 SHA512 
4f3556770337b9282211231fbeaf7d695a3312777ee1f8ff93e12c7b5180bf0babdda43132c527f741e88dbde2a0198c63cc5799535d5e23a32c4cbba1e74abd
 DIST linux-6.11.10.tar.sign 991 BLAKE2B 
7786945a39d02727f9f279d5aac42ec2fa641aa1413c79a1325cd3e3a0bc699db35067d95482dec8d0359d55168658365a13b65fd6ecccb8398c948b98c1ec95
 SHA512 
89f517764b9396cd2d14c5ee1df27477a9bd8e4111de73dcb1e19bac9a64d71011446b4ce6e246ce88d0a19ebbfd2a3ff6ade8cb3e97a05b63b2469d82888fd7
 DIST linux-6.11.10.tar.xz 147005172 BLAKE2B 
7eaa4da44fd0f6cde13c92a8dffcc3e20d96fc9a8dce4502883835f4c2822d181234f7e9bc684a09da4d499d0a7c5ecaecde29e3fa1e6a3562c4da610757d9e7
 SHA512 
77d739417b3a25b6dead21c5c6d1bd881b714d6f35b9e102f3e0720b897f9c7686d23d1da700a880bdda9a319f71da5a33c68ac118a345d2c054835cc9d3c927
+DIST linux-6.11.11.tar.sign 991 BLAKE2B 
43c9f936cfc7838254484ab73efa8a29517bf579afc17b86c76cfaf8cf6a02f80fa04bca2e60e8a0fef1d202354e50cc095d6e1c38d9d12385c0ae090de182db
 SHA512 
be394da33afaa38f3f7f471d404d0f6cacbebef5a4a881e74276a86357afa3ac10cfb8a5d4d79eb66c6ba79e6022f3fcad486c29d3f72dee4a015e83f8359c3d
+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.6.62.tar.sign 989 BLAKE2B 
fc8e42f4e6967a3b1617590e7eda620a1e422cd1991cef4be75a3a0b7a6f7a4a3517a0229a750665ef17893d12c3f74222f3115cf557804edd6c390470688ac9
 SHA512 
340234e7c438e3a6396d2aa7de330e82822158193d8f1daadd7f566f29da152fc465e461383e0ab1add8981df11bd51d2593d00729ea893553d1085b933176f4

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