commit:     52d1d82eb2ce0ebade109461de41aa0ca0b750d4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 15:55:14 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 02:28:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52d1d82e

sys-kernel/vanilla-kernel: Bump to 5.15.133

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index e3ab2fa57a4f..435a49a57242 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -46,6 +46,8 @@ DIST linux-5.15.131.tar.sign 993 BLAKE2B 
1ae63f986751fc0dfbc2f16be0ad28fc5db9d8d
 DIST linux-5.15.131.tar.xz 126541144 BLAKE2B 
39b694232a1773b9a755b2811e7aa01d6bf30cbc2132e9c7ed16e8f5ed5ff83c0724bca09dbd459b1393dfb49e1b09844f93885d37e577efc961e5657df80787
 SHA512 
db043eb583568f6eef2adc2b9f48012728b6a91ac8ac6d38a3eeed3c710043a222dbbca2c3f40eab93f6b27f5715c1139fa0aa23ac431809b15cfb925706bbd4
 DIST linux-5.15.132.tar.sign 993 BLAKE2B 
f248478d5d6f3697cd3069b7f0881bb0c6f81834361eefd7eaf20cdc3f073014cd62d4d4e84f18cc9d03d8f8cd7a6e6f9a7ba36e16c2fd5fb6c0eb1659300596
 SHA512 
9002f124e9a33ebea3ceff6687a7bd7f50c73a798ae344a1a6ce1b4c6b2f4abe109905f98e1aac2a0500ec59d575555c3fd118fefd9ce4ab4e97154a74564fe3
 DIST linux-5.15.132.tar.xz 126556464 BLAKE2B 
4d92917651fafba6e7eb4312f0783e95b959241264775a8186f03201b2152b809cc5f03244e89d80201634de320f4dbcd2c4eaa47bce014f7b310ca8d46faa57
 SHA512 
a66d0847ed18860cfa20a01a43f3a9fba136dd474a977b0f842ec3b477a7786fb96063d2c3e331112dc1ae1610e70b0524412f26aca87465ba73d36e0d5f7601
+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.4.254.tar.sign 991 BLAKE2B 
4f5a5e4ea2c930a62e3743c4f10d8e9999530a106134c61635f2f1fd627e6cb375a6d21a2f66f0bc02bc99e419cb0a4db3499af090f8787f523e009789205007
 SHA512 
71b4b3777c238034d5624be9ad79f40634d2e861ae2665d2aee1701cc3d5a09e6a5d1a114642d0d01a97cf1556022a658fc3deef7c59e93ab9b41c829018bfc5
 DIST linux-5.4.254.tar.xz 112963588 BLAKE2B 
e0e395636643c49063cc1fbb04e06476ecf17471818f909559dc8f77fa5de69b8774ab8d6b16b4a2a57f32a7bf90126d381360fdd52069fc435090cde07769f8
 SHA512 
ccd82451c72eef0a0f35eb8c0e296e3018573ab99b602cce0a107bf2514bccf93113ea86d16205cb1b6a9f7c0198d411a250b215aed3cb0b4be6fcd27b878039
 DIST linux-5.4.256.tar.sign 991 BLAKE2B 
c47e8f8c6063f5bc82e0f6842d3953eaa86ff643f944c3c6f2bc465287774e4c3f3f5abc7c338220809f89fb1e0c0e60d2ade092687df5ca9cf6e2ce1a2d0f43
 SHA512 
8a3d10ef6286bf0119a29b72a8ca46d10a1cd27b196c39fc15507d68e3e7b87fa413437cb6c9f1b3cc194c6a89f7661ce78b39a3b98fc0d50e2f6b6d680b0bab

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.133.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.133.ebuild
new file mode 100644
index 000000000000..09401b1d4561
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.133.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.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+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