commit:     41544c6e7fa27f781974ec5a2806e73fa30d3a42
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 12:37:32 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 15:22:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41544c6e

sys-kernel/vanilla-kernel: Bump to 6.11.3

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 347ea5a21e85..be20948b6741 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -43,6 +43,8 @@ DIST linux-6.10.13.tar.sign 991 BLAKE2B 
cb6a063a814fdc9b375c959cfb105fa50c121b04
 DIST linux-6.10.13.tar.xz 145190852 BLAKE2B 
ecade921475057a3834fb07ded49f094b5d6c008939554b30463f5fece12b4d1619515e1207ad5fd089a13c0ecd290313a36041df408af922b85c466e0b14e0a
 SHA512 
3df1fa7a1cf373063f73ab6f4e3d98321cd17890ca3836907526d88bf44d9ce4c588b0bc252230732c4128ccf24825c658d0e324c645fc59a16d17c55a158a5b
 DIST linux-6.11.2.tar.sign 989 BLAKE2B 
685a21225e6c3001ab51ed508494402daa3271587659d32d026c3a0436c0aaa2ade9be348f153a0ba2b2e0efb6c45a6643910d30166a8ac421fb05143eaec775
 SHA512 
1cbb97a95364470a1ed39878b0b933a21b1d990ce6a3c58b39f9ac2ca563970804ad7c375a82f155575a483f431631861326c3ecbfc3f44082cb4f895aeb7947
 DIST linux-6.11.2.tar.xz 146931068 BLAKE2B 
5720e8dd0bed0247dcfe0bdbce17e36e67bff56811611ae1b04f048b77b6e60c2a48303db73c5a0d4a56c7125cdd695116c4dfd965bd7cb28aa932f427bb3e7d
 SHA512 
7c07edfa5dcbfd824fd45ab4523f1f6e3b15b4f3f1a424f14e060450b59d343db03af7a965707e6e6944ddc368f58655a10961d521592c4b4b9e97c9ee7c6732
+DIST linux-6.11.3.tar.sign 989 BLAKE2B 
53fe38b1c15fc7df8e7a9774b97c3510068ead9f2ec3417edaa305e665a72d1e2b0f53b607afc124a57b3dccee5f3ab66b06d18183585bd64a6296291dcf3f6e
 SHA512 
d5c24190bc80918364b6b27218ac060c771a7ed8c0db9e1829107616a252ca1046eca442e69a1b7124f818500905bbdd18c06b3c81b9055651be5ecae8473115
+DIST linux-6.11.3.tar.xz 146928596 BLAKE2B 
69582e4745850f3ec004d87859ac88994e3715ed38cd66aff2633fbcb6c20ca2e3be83417cd2c42c2757ab4e084e622c688799b5ad28e15c391adb2afab79a68
 SHA512 
da3088bf011da14d45c8abf16b003261fadd85bd05e8c48781134c75830b26b5e5ec3b1cf0b1bb0ea18bb596d95e13b5445e8084ae4cb61110db0c719c7b046e
 DIST linux-6.6.51.tar.sign 989 BLAKE2B 
6413a28f43c12842b24a6bbb3def5cdff4776ddb773afe71d13f987212e8247b721599f24fe003585f85402b39e175a223053d47871603ab5878b1caa9a13f1d
 SHA512 
0eecf63ad8f3c20edef379b90e9c7b576457ae5dee6cf265bbc7bbed1e46f6fc33fbbdf437497edc3ca821349762f97d8b2a11f249fc14ecd91c4f7002528a66
 DIST linux-6.6.51.tar.xz 140337048 BLAKE2B 
11c628d94cd62e08ec500fd67fc8b989e03cfa617690f5f7ce010f211c7778c7b57c119d827a707b3c09e862b5b96de3eb8e503b7128a4e1651789e4420ac1e6
 SHA512 
c79fcd957dbc855e101464a04b33921ab0dab7bf16201da0cd49b4c3dc9746f22a7f3411033035698ef98e8c9bcc6edf560e44c2b740235beac7cd59a4ea695c
 DIST linux-6.6.52.tar.sign 989 BLAKE2B 
c3ea21b0921eab9df4fd36ee10ba4f417ccdde013be1d4a75c28e50578495812ec058a51bbbefdd9baf9b5fab97ee1558c6bb9ba79172750dd89ac8494f5913c
 SHA512 
a19d1283072c8a648b02765e9ac94284171a1376e0a07fd4872a32c565e5d6f213cf38af636475c46e9369bf45c32971ad60afaed3c2ebe9d6e6614fc9731d5b

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