commit: 92cb4d566e382b500c344345fb0e763c5683353f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 11:54:18 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 1 15:23:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92cb4d56
sys-kernel/vanilla-kernel: Bump to 6.11.6
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.11.6.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index c72a8622f074..3cfe6a1221bb 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -44,6 +44,8 @@ DIST linux-6.11.4.tar.sign 989 BLAKE2B
02f5f722791780eee6c0e7da79adb00b02dbedc6f
DIST linux-6.11.4.tar.xz 146936800 BLAKE2B
0c77f514e29881b27b8bf815a55845b65182a25be006815541c0e843c2bbc0d12ee978d2a418d779d296c361bbba2d78ff58a0c13ae78382552afadb1e43aaec
SHA512
6685d71d60b6bb1b1bed104d71ca99a4909425f13d16be93e1cc1d9a10f3a03b6b55febd225105fcc423cad0932a3784e6a8b6e8ff3a8563adda6378184648e1
DIST linux-6.11.5.tar.sign 989 BLAKE2B
03ddeca59bb70744cae46abce20dd2b7f35e299aff419476ac657722092f4e35f98bd5aa95a142928ca642a3fc7859fba5e0f70de1c2cbce8015f0df8a78d1d9
SHA512
07bd2b0ff4b3940eb274d6b9e5ab1fb17ec18a2518a336b265fcb20f36d56121a4b03dea497ea86a9009259f73d912a393c71e2641e75ddf1354c9f6862f50df
DIST linux-6.11.5.tar.xz 146975304 BLAKE2B
8749d9f78cca3d64e97d081b3ededf506c07c7fe894253e7435afb37eb7c86b690a65293fb4b582ecd951229ca61f13679d10197e4629352262db776352b96dc
SHA512
532432967a1b343408be7764be67fd47dea28f41385efb6cba93f7039bf19e75027a59c53eb3752b32863d20f334e25d8dfe68237bc5449682d18eb2b7d0ea86
+DIST linux-6.11.6.tar.sign 989 BLAKE2B
c40f1cce49b802eff77556649774d4c733ff83dcdf9dd871ab32f599cda7fce8f61e813c7a3aedf35b088facdc938095d89e953642241abae7fdbde82c05d430
SHA512
7b277c22583e8664017f2144e664d7db3eb118143626a0d5d540e870cd713cd125cd77ead60234c761084751d6f7fc2fb911374e71c992b6295ff8f5bf83817e
+DIST linux-6.11.6.tar.xz 146932940 BLAKE2B
821eceaa7492122c724ea789a79aa99f61078f06c86fd6f76d08f640b47ea682f7441c47ed7b860ca39fd242b8797bb5bc311dc63dbb9c37bc15917eccafc255
SHA512
0736229b2b828c804080d4044fca3dff1ae3010d485a969077ebd19fb189ce382b7dde43239ca3cc3fa16ecd1a09c14492186e96f01404630ae76dc35201a976
DIST linux-6.6.57.tar.sign 989 BLAKE2B
95ac977643c2c2b1102fe69d1d0757f4746e14e103b9917dac0574596901b37124dc7dadaa47e86d95ce73f9acf5adb5f4a81dcefa30f3ab5ccf879837da160e
SHA512
13e69d25d75349b31b4dbf26592a26764724430e5cb36023330d2220eccc5d66eed6e00c0a6f2d40a41615b6efa6edd7a0db128049717a53b16a7a8f61cd2ff0
DIST linux-6.6.57.tar.xz 140376012 BLAKE2B
5aaac8528355d14fb7f589f70e8dfb1f002f50a0e511b248f1ba58f87e4452d984077e8458b4bb30cd0dd638c7318c78976e9ed7deb23183373cf7b4e4f8c05e
SHA512
6a3501e16823fda4b2b26f710f31fa1a5f17709dac1fb30d3845b0b2d0650444a21bf1be285fb0f0d385455f19e895ba07cb37112174d971ae29e8f4bdc3ac6b
DIST linux-6.6.58.tar.sign 989 BLAKE2B
ef24dd2e2cfb2430b3d3aa79b1ad4bbea1aebbdce03c4ee8d00aa14697ab2160cf98479bb54a4877e2ee783a7db2a117ff07b61983a66e10a2e3f37c4e8e6768
SHA512
2b6aeb6816a96d13c9d56014179910b58bd4f6c047f70d9581f18996d081c7fea6ee105e3832b333df7d3c4a822c307bac8d90b08a1f375192c6a86e74bc70b0
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.11.6.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.11.6.ebuild
new file mode 100644
index 000000000000..3c2cad2b80b7
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.11.6.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[@]}"
+}
