commit:     919f462006b712427ddfa32eaeef161b57999df5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 04:50:14 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 09:42:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919f4620

sys-kernel/vanilla-kernel: Bump to 6.6.58

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 955884d4f6f8..374599926ef8 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -73,3 +73,5 @@ DIST linux-6.6.56.tar.sign 989 BLAKE2B 
78c1cbb565ef2ebc6e6555832c48b9e1ddcd367d1
 DIST linux-6.6.56.tar.xz 140374716 BLAKE2B 
c33477493337b759023dcff084360edcb3b0b53cc9543bd64537a9fdc736cc4d6c17d0b357e7a60141021bd9d1f46caaa997d8be8e75261fad657f4d9f058e12
 SHA512 
57af6cc0796db0f0cf727b93155d34cf9a702abdfdbcde2e9d421eca7e225ec519a9f8a5e859879a24dd530c047666468cb70445c5389f17e3a6996888ce89d7
 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
+DIST linux-6.6.58.tar.xz 140387240 BLAKE2B 
f621a4f786ac1f043b70419f6b623075c771eff6765a51130d1ae710b58202988286332be90f3a1849a75f9bc44463a23a1f69b38906d469abaf2075730e646c
 SHA512 
695203f9f4486a928ab50bbfb761feeebd59b82f0e090fb126a8584dd676bcc5a6c6a5feb8c5d576891d7ae3ae31cca3a35c2655f06e8410818c24a1edfe0136

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.58.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.58.ebuild
new file mode 100644
index 000000000000..024fb0dc392c
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.58.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.6.12-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