commit:     87e0049b3f03464336e272530e5375a4759f69d7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 15:40:44 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 02:10:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e0049b

sys-kernel/vanilla-kernel: Bump to 5.10.199

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 07049385cb33..d8cfcea82b4c 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,6 +28,8 @@ DIST kernel-x86_64-fedora.config.6.5.4-gentoo 241647 BLAKE2B 
8f72de8eb9ea6abf9b7
 DIST kernel-x86_64-fedora.config.6.5.8-gentoo 241611 BLAKE2B 
471ded43ec2f75998fdce8844367a6f14c06ee83c0aea343301b1ea901b4e8e185855099ff61ddb855953fba1599f8874bb8ffe4da27152994a0cbbc53670e28
 SHA512 
bd92695c32d33c6a90eee96e481fcde02586d71d1d0da158b04d9e9f3dbf9367178bdcaaf71167a043df646c5d715b087f1acd1ecb4f3690dce766604676e7a4
 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.10.199.tar.sign 993 BLAKE2B 
a71acc03788cc9d9003d88d8ba544d71f70c1cc0ff15d38ae6598c1273fda416f74f8cfc879377d3cc94dd0910b4078b8a5021df5cc010ad39049354b1db88a1
 SHA512 
ff22da4e86e137cafc1ff210331ddabec7c0a568b38845c14c1bfbd12024068666279271639eeaececd6c11b2f191425eba8ad0832b1f9e5fa7462571054052d
+DIST linux-5.10.199.tar.xz 120607452 BLAKE2B 
ad0f17fc6c052a622c54a94c755224954bc5c18d284c97667d578f02a66ce6a4b2dbd19bc9da5d418885d28930022c980f04aacbf30729c0b52e736eb36bf23e
 SHA512 
8bc81aacb1410b45546d0618d2719716e0592ad6826c64568946bf3b755b881e83d8e18cd61759da28cb5513b024779dd42412420df61f00b84e2ae957fa6767
 DIST linux-5.15.135.tar.sign 993 BLAKE2B 
a3558f5e466ce41ad38ddf0da970ef87614630dfe90ffbb60cf26ca159bd8e2d4ec09e55225201bc7c541139243607232f65536d4000ac4ca3ea2cf1d3322e3d
 SHA512 
2ef6d6bf7b730402305ced9c5ca403619ac8879e99f2071d3c72ed7ebf0f42ce5a008da7d1acefb195e9c5a157e3d24b8c5e7675e68eee9f8e440ebf2c536b9e
 DIST linux-5.15.135.tar.xz 126555708 BLAKE2B 
13579733de339520faafd1e80fa0a8c7e43c7321483f0519de713864b44699f64a439e819c9901e60921973b6db182063517cd4c4ac0aa876c68a7c50cecd967
 SHA512 
c5993103523ddda31893fe69a1bb6c77d6f20e9cacefc6041453072ac8c0294353ddc4eeaea0464b097d7c41c0a6339a225b3b029da771dce0652c637fd19777
 DIST linux-5.15.136.tar.sign 993 BLAKE2B 
d72d98b6557ac356e9eb2c994e86c25ad0e56fcf6c1dbe012e11d2ca6f9b54dcfae328d919e00378547a3a439d858610fb16460bcae9fb1ebbab5fa97f1332f7
 SHA512 
e1551b696e623a0485f98b104ad22c49ef7db4165a84c4946105e9222250b87aef77181dfaab70cae72f821c850e6a6da4e24c9e86a18389e9ec143b444707a9

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.199.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.199.ebuild
new file mode 100644
index 000000000000..432b6f93c620
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.199.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=g10
+
+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