commit:     78cfa796dea5e00d95f23b8e1f3d32403cf36be5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 15:58:30 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 25 19:58:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78cfa796

sys-kernel/vanilla-kernel: Bump to 6.6.32

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.6.32.ebuild    | 143 +++++++++++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 90df23d3a8e6..9993dab8bbb8 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -42,6 +42,8 @@ DIST linux-6.6.30.tar.sign 989 BLAKE2B 
a85b3b764503aad276019a702282ae29b3f84ea57
 DIST linux-6.6.30.tar.xz 140183976 BLAKE2B 
815c85dae71784bc1eb722fc7651abebf344a960f51c473daa50f51f9097b8d64c68c033a3d488f7780cebd29e360c6df6ceff255a1a07d18533d7d950e77db8
 SHA512 
1c1cb9449686fc334385e9997073503ac6312d6855e8ef26bb1e73267447cce14f1f0a22b5c585a0a3c6c8dd1ed0e3c246671773ab8990fdf3c2f081219a9212
 DIST linux-6.6.31.tar.sign 989 BLAKE2B 
cf6ebd066fde8f62fd33e96219732e29f70c3bd97f1111cf9b31b8a1593ac13c2eb624d8c4e6ad1fb35a77998a7c42a4ac4d026eccde1090dcf54d48bc39ab27
 SHA512 
1d30414266bfaa390288fd4436562f28daecebbcf7a097f19240a5732b3a7c5248f56595ea9a6f312ffc5d7dd254a3a69b5ee36173c983c62fbe722bd5fdbca2
 DIST linux-6.6.31.tar.xz 140189332 BLAKE2B 
521d01b10be736cc7be1108ad0fe9b046aad0ba5af02539d3d0425e424d5c081aaa69446e9f861e5ff4166c0f99201cb827b044d5a70816e4059f53f417c945f
 SHA512 
8fa8b0be38bd29c0132acc295b95abda03c8e967103bd87bd7d95a1263fe35b82a4f9a1a7c2944ef5302217540dcefe50b320701a9d3948cfffa5c8ef38872ee
+DIST linux-6.6.32.tar.sign 989 BLAKE2B 
ddfd3ca2ccda00a7550f6f42bdebccdf3564a54516cc03f80a350e3d3af8a3f5d1275f0200118ae60e37e13bb3966c80d19cd422d5f4f4b77a6c6371c022ab91
 SHA512 
99ceefd0c2cb8540d816b558a889f955f562d4db911929ee20963b2bbd22b4b7d2ab415d6bf975662c3025e6295e6000139df0043902797e528ebd09a114fd42
+DIST linux-6.6.32.tar.xz 140213376 BLAKE2B 
6456fcafe10eae6c0cf962b651aa567ba9ad522c4df0c87301ab0060313b8179a818a1d305e0af21599bc5b7bf42e2f61121a2ee0658a065524d098eb2947f0e
 SHA512 
e8b8d05faeb0c8a467e36fbec87643f35bf868caf6f64d10bee2a2e18566bc586a9770c247c1fb82a6af811455d5c2d5f313703b05778069c95c5434b418b3f0
 DIST linux-6.8.10.tar.sign 989 BLAKE2B 
4c38e702a545742f56e899f0905734692b7157c1c6df9503df2361cc9f00561a8b6e8ef91a16dc70c419e0da88e5cfc8aa47df0f274085d70ff2d1929f9403dc
 SHA512 
b54c28d60f29811f1f799aa1278e0a14bdc2afb2ce680f269839910d99e96fe8b1cf1410b435a80bbacdf3a6c2a249236c1e75b7b0ca6fa4d8e6dc3654ddc2f7
 DIST linux-6.8.10.tar.xz 142586612 BLAKE2B 
1e3fba4cdbe1c3d4f0ea56f8e54242e0276a3ae47e5dc97152d0afd7042a02ae9b57d6808ed8482358eb244eecc73ed41f7411ab50d4b462fc776b68c293c30a
 SHA512 
97869a0271ae7f36a16e0a73eba3962fef96129bc33fea98909020127336b2cac54184cac1fcafacae2e4fa1fa24fa27dd68a2d43e4c588636782fdaef6b9fff
 DIST linux-6.8.9.tar.sign 987 BLAKE2B 
0fc69e60bae77731897380cf929ae43785e0b7db7e68e761e53894b288a6a80fbf5ad888b5c0312f601a56984ec0b9206901d7c02b202e73dc0d19e17212c81d
 SHA512 
18730f08135b06018d1f7757e1332dd0f20761363aa8bea7d49734a22a9cb27067b8052849cd2180299a4323786f7dc0bcd598536e8ce5e5042f2f841589daf0

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.32.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.32.ebuild
new file mode 100644
index 000000000000..2de327030b51
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.32.ebuild
@@ -0,0 +1,143 @@
+# 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.6.12-gentoo
+GENTOO_CONFIG_VER=g13
+
+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 
-x))
+               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
+               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
+                       ;;
+               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