commit:     3e8d32a9f0fb239a7b271eb2dacc5e74f7b168f7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 01:09:13 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 07:48:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8d32a9

sys-kernel/vanilla-kernel: Bump to 5.10.198

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 958c25d9bd1d..73298eceb95f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -27,6 +27,8 @@ DIST kernel-x86_64-fedora.config.6.5.4-gentoo 241647 BLAKE2B 
8f72de8eb9ea6abf9b7
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 
0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200
 SHA512 
f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.197.tar.sign 993 BLAKE2B 
a98f032c0886edeb2f508a86aaa9fb7981ab8038b33c46157df555cc5d7173fe365736361d2a3b86f04df89d35448006cc31c8b46b86b44d2d1583f26ecc4d2d
 SHA512 
c3dd76c362069777d041a3cbd54576119f67973f8f91b38564a077473e6395dd309fc2286ce295443896a0b6a7c133604e9cfcd4800c080c3943e2d34db082cc
 DIST linux-5.10.197.tar.xz 120607852 BLAKE2B 
83ef21047b45710724f7b3570b27d22a0dc1cda3eb051eceb5952481dc3d3f3646bdebabaf4458e8f03f027b56b461d869abda15b0ad92a684a0a43ce87bab07
 SHA512 
5a8dcf7788e556b4a416bc7425e9684d1a6c40c483eb549dae975e3ff99cca9bfa2237106ba618c787b7d819940b90e29bad396108068ddc95aeb7d3529d9a38
+DIST linux-5.10.198.tar.sign 993 BLAKE2B 
37837e3f112bec045edc490c64c8182b96d9dbf2fb215d497b4b09529309ab6f7d843086526d55940766bb798ed1ca981acba6ba936250178a0928edd0c66001
 SHA512 
fb9920f6f714efd2331c5c5048721b17734ac12bfa85a4b6a9608461f4a6a5bd7442476728997d85a5db7eaa496759b404cd763203669f0fa33d430b6fe066b4
+DIST linux-5.10.198.tar.xz 120618524 BLAKE2B 
d463367f0e9d9e1cd426bae13571d36f739cea3de54a222894c4f837c56576c8d0f2e83f6c9c3a8fb2644340859a335403d9b91837b0754729a5270f34dc3a19
 SHA512 
3ccfbaff9b45d3239024e6c29e3a33af05460997971d767293e45f22c4db66f99595285d5dac1071f19926f35cdd90d323bd6e57809b57954f4988152ebe6342
 DIST linux-5.15.133.tar.sign 993 BLAKE2B 
f9195946c0903320cdc66db68fb7edc5bbeeb67e04b016bbe5ad3b281125d9e56f6608cf4308a5e758944c9c2aa3e537d043c981d568bdad52b9f90eb9dbcdc7
 SHA512 
60403a6be4f3382f2ac6b65306d4611c94d4dfdab236b0982632389ebc163c84eaa6cc064b6722278071887e6baec1b22ad8d1f0ef3a91c94895c8e7a88e9882
 DIST linux-5.15.133.tar.xz 126545380 BLAKE2B 
e71975def96d76fb5d0886be6460ed581a2ad88ee3b1c40b1b9a38013e912664a95a2055b2ecc190aa4c3f5e275eb8f00ffb6ac826e8ded9e1564a76f65f8985
 SHA512 
2877480c7f7da8d568c4ddb4e74d033ab2913509669377200320eb3f5faf7e7aaadc98ef80cec23055f0206692bae4663c36241562ba56e3c194c00779a99a0f
 DIST linux-5.15.134.tar.sign 993 BLAKE2B 
9830f97282775f5b69d6805c0b4e4a238ea0af86b1b802de349c4f4da72fe0b291fda92f4e0b37dc209c5f911ea170551469fc1598de2b0d94f1deeee49f1af2
 SHA512 
d55cb238264273c734b5ce06b2468b5cf8593252c32f87d5402fb2a150fc2ab966099387f283c7b831a6851ff3346159d032ed2878d24100f6b9d5b84c9d3f26

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.198.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.198.ebuild
new file mode 100644
index 000000000000..de1f71e33f69
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.198.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g9
+
+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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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=${BROOT}/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
+                       ;;
+               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
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to