commit: f8b20048030944588ec1398ce7376771e7391cd9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 16:18:47 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 2 19:53:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8b20048
sys-kernel/vanilla-kernel: Bump to 5.15.158
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.158.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 34861572ac77..c4109758ac74 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -29,6 +29,8 @@ DIST linux-5.15.156.tar.sign 993 BLAKE2B
c606bc02fa75747b0647913fbc8acf4c9047119
DIST linux-5.15.156.tar.xz 126642224 BLAKE2B
55c20146a7065ab491867d4b5f03d651399471031c8d4291f3f493bdd223c566a9f38ad66e8662732c2f7183f3fa5255cb4bddd069ea1d5cffd6ebbd7c07835f
SHA512
567e6ced6a2d3a47406f7f2ddb92773d349ebc6fd43423af5ad29b55e66f954785487cb1257e1b72b1257479895f2b31c6e36761ab12bcce3dcb3d749d5c0bb3
DIST linux-5.15.157.tar.sign 993 BLAKE2B
120a557b7603fd80205003b81c5b4cad61414ec407e357620e29296c09712f15cd50b0e06e176ef87ecc17be5c236805435adc23d29ec965d20c7d6bb32617ea
SHA512
954711d4ed03fa505c0453f3d9aa8bb074d418a303d5d62ca56e7665031d33747f14219fb7c4a966804a6aa348b09d98a3e201e09925b9d30bf21d97dd5cc0dd
DIST linux-5.15.157.tar.xz 126631416 BLAKE2B
d60b0d7ecda564a1de399c13c085f659792c754d68721dd3e0f2d3fbd5748d1f0a324bfdc9a14b1b54d097068d2e76721a3427230fcad40a5a17607e7d098377
SHA512
e89964732f7a6ae5d2daeb6b37e429fa87e6020eb48bba4132cf532ed8ad111b91d967d9f0dec5dc47da4229a337ad8d2dcc7820c4684624bdf63ae4b736aafa
+DIST linux-5.15.158.tar.sign 993 BLAKE2B
4a9cb5b7eb5213482aba75ead47f0719a0e3d14205549d5f01a1d064835d75f962b98eca5e97a05c802dcf3f2b46a4354cc450e74a248cf71f71f7533d8466ee
SHA512
4140c65f25b394b4f044b9d995fb766f82647f1cbe21c707313869caf06c0877db20f4fb1489cfd077b78303c4a2b25b7ffce00885c8ebe0b923b9a641a961a9
+DIST linux-5.15.158.tar.xz 126633604 BLAKE2B
920a70642acfa806af9e1e6455aececd0490784990101368b77314082ccd99fe9a426960516f434a214932f01161f44ffb8b10fe5b91822e0213fb3380c0c93f
SHA512
e10f8df018a7e5b10a3769befdaeaba21ac8cda1ce278422b7049c5531d985f7f46c85d498a7ca1b45b78dee4a0157a62fba8818f88d45a7551f49f6f6201f8d
DIST linux-6.1.87.tar.sign 989 BLAKE2B
5dcbdf95424d5042049065e865ab2864b252eddedc3b13745843285116bd6c2536b9c117b86e28c783d1ac1f247374224399377d293180bfe3b81691abed0f78
SHA512
f0db832d08a38e1c462cc8b7bb26a18b1e5c47975888524d4d3f8157f87bfe141323210e42c9576cfb4260730ea8238e576f20fc889d89c5cb3ec0e8585b5a82
DIST linux-6.1.87.tar.xz 135155024 BLAKE2B
42f5f28cc22db9200a1a1fbc8ffe63434e61d4d954ea86d364bd1adab6b882f530983778f3a2db51be5d33d8fa302c1e29badf45440c142e10456055afb1f0e0
SHA512
5c5b8910f27229768292e4c5737a988e8cf3b19e787c2dff3c15bba268b28c3f99b2169ea48256b692cfbd259ef48b9f6e836ad9b306a8e2230bc7bdb3f64613
DIST linux-6.1.88.tar.sign 989 BLAKE2B
82761c4c89269c66d493eb93a83c6964a29ded1eba0d72eee4328a5c67e678403605ef4433457a26f9befb5067d350f9a71f111d11ece103110e70a669be8a3d
SHA512
5830a9a15c0f4c4b8cdd1d28f6f8193bb57eaccf4257346ff2e274da2bf4dc0f36d0c5c4e31a329c3698dd0ce17f584a4712a04c59368709210e8c1e4173be6a
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.158.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.158.ebuild
new file mode 100644
index 000000000000..75273ad670d7
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.158.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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=g13
+
+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=/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[@]}"
+}
