commit:     13ada5aa93f4da09fecbb613ab992b4b185fa97e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 05:26:29 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 11:16:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ada5aa

sys-kernel/vanilla-kernel: Bump to 5.10.187

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 372bada10c66..0bda061be4c3 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -26,6 +26,8 @@ DIST kernel-x86_64-fedora.config.6.4.3-gentoo 233494 BLAKE2B 
15481955940dc58447f
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 
0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200
 SHA512 
f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.186.tar.sign 993 BLAKE2B 
e30659b0db0d993dc6f0fe2de7f9c26d0f93017b0d0ddba59da6632dd07b5ffd59b5a27d32c5d02cc2db6f7a8825ffbe8e6ca8d8faf6241c18f45fce7a4cfa6d
 SHA512 
01114d0ecadbd17cf44b31294962933daa7986d86ff92f90c5bf71b62578fcb1a1d1196765aeb57d359f0e68032cfac62a1dfcccf369e400d6438c376e216783
 DIST linux-5.10.186.tar.xz 120570052 BLAKE2B 
b587b6d6eee838f20a50f2eea1dc2c9e8750d4c1aef6a59b26bfebba244e5337e4555ff771c4e41e51df41f14c370b30e35449f5c3a7bdcf702424633616cfd8
 SHA512 
748f37b7d5b072f02b2fe74ec40eb48abe7b6386b4ee8e9a614ef78c286c67ae979809a7eaecc34afa6f4e19f8cdce296435d423ddd9ccd7f88236a779e63139
+DIST linux-5.10.187.tar.sign 993 BLAKE2B 
5739f7361b320d36db7489ceb7afeb56583d4364eb9e2f18c999545d7d97960cd8686e8ecfb8994878249cffaa8e905fc2a6fa45b5738e6016305990b2f5238d
 SHA512 
0ad381430b76a20fc678b905b2d6ba76897f99d52157e3d03d4e53329603b83b463dac2647c36e57b26857bcafa4de91125177206acdabb8d30d918a39aa2aaa
+DIST linux-5.10.187.tar.xz 120576532 BLAKE2B 
098bcad0944cbf6bacea7b62baa41e2583561cd1995cdd112ecc9459eec09dc64dcd4ea0c8494a8cb6dc9c17d2482b62b44567ce805c57beac91a84f2ad3ba65
 SHA512 
c61a22f3f1f9c54e416e8761e52cfb35dccb7c0f9a4171be9893b8e2a5a186d8417b88141f616f109d3429b1676fdaadc79f687a104a0e05a75e2d479af9bd9a
 DIST linux-5.15.120.tar.sign 993 BLAKE2B 
2be056b63e56dcd11a78a0b2a943e26d4da12a69f0973ea70a02f8c7f6c09808bd53fc382a152dc99e121c5bfd1baef3beee129e82aed0e6cc94d2d5e168ecb2
 SHA512 
ee027f64785277376c937b3affffbbbf1a29fb1107e321538d387b4e355132d4d83a330b40705210d024dbb3c321e943e1772ff1ed4cf0bb4f520e141d959b5e
 DIST linux-5.15.120.tar.xz 126492316 BLAKE2B 
0411aee0b2d04e14494741dc566dc89c6b22c78e4de84dae6dd28c5580b006ecd5b5be937e1826f6494395ad40f1b2ee12c2e93025fb07577bd83423d4f0c4b0
 SHA512 
838ffb6b26f4e455788123370638eedb03fac292bc1073769e2f33a2eb216537674f2d930844e26983f4e371e49ce11da1b80a915704d0f0f74cdd5fc6eb448f
 DIST linux-5.15.121.tar.sign 993 BLAKE2B 
0f992951db3324696c1e608f4c2360063401af3fc3a8bece10b4753fe5e13e8a8396f1d00153e704b5c3822ecd0b2e36f1fab119ebebc274f290c11a0ea3efb6
 SHA512 
dd80aadeecb6a65bd189c3cd14de50f4eaa6245a71aabb8821f2e5358106569f982f988fd18b20bfccb69f7566e1f90a6c34c7b2f4bf25967f129d7713988d7b

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.187.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.187.ebuild
new file mode 100644
index 000000000000..3d406f474e2f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.187.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=g7
+
+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