commit: be9f155ac81baa29915793de9a2a05c1a7d61c32
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 16:23:33 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 18:31:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be9f155a
sys-kernel/vanilla-kernel: Bump to 5.15.121
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.121.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 2425ec06db39..408b80b902c4 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,6 +28,8 @@ DIST linux-5.10.186.tar.sign 993 BLAKE2B
e30659b0db0d993dc6f0fe2de7f9c26d0f93017
DIST linux-5.10.186.tar.xz 120570052 BLAKE2B
b587b6d6eee838f20a50f2eea1dc2c9e8750d4c1aef6a59b26bfebba244e5337e4555ff771c4e41e51df41f14c370b30e35449f5c3a7bdcf702424633616cfd8
SHA512
748f37b7d5b072f02b2fe74ec40eb48abe7b6386b4ee8e9a614ef78c286c67ae979809a7eaecc34afa6f4e19f8cdce296435d423ddd9ccd7f88236a779e63139
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
+DIST linux-5.15.121.tar.xz 126510440 BLAKE2B
276109c879fb96fc2f4c4bdfcb5095e454a8e96e279209933e7115fb2adede2b1ea88a5e8ca5db3c3c6ff6fcebc1cc8da0dd9d46e023937b3bc1a365a36de5c0
SHA512
2fcd4a1d0c70e647a93d6d330e957972298953db7aa4ff9d3f8b08cfe8f2869e59a3339596079c35199ec9da59fd9b0373d00939c35dd9f566cc220efcc2cb9e
DIST linux-5.4.249.tar.sign 991 BLAKE2B
4d1d936ef8ca139a3d46801ec59e3fc0137d7b8dc2d4d7298b8059e6de501594edefffc98743a28ea9ef34f66be20e72cd259d45e76aa9b7bc40a64302bdb7ee
SHA512
98774b79f70e848c61bd8797ec30fbe8f65313da012767ef9034330bcbe7491acafe57e6a6fc74abfb7b1216db9997f396f443ed88cf4904a02d5e6912d061cb
DIST linux-5.4.249.tar.xz 112942636 BLAKE2B
ff967a8c37f5bec5d3ffcd89c9cfa934beaae570fcb4b184d7c715c2d419dcb3e80ba80381f9d692d0efe02b6a05cb5a06ae88723f974e54b9e0116877dba313
SHA512
ae97a954a14fdc3702c850780559d64950376575132043d3bab627878a65331648a02016dcebed20320e1040fc0374bbb9e8941fde6b35ae6457652a0778e08d
DIST linux-6.1.38.tar.sign 989 BLAKE2B
9e1710fc446d8cf5fe7cf9ee933650955c28b2bce1dfeec592ab9462acc25be2f5fac2d24009c491a201d4d209ac5c98589f81c1047d44d713a8989c4f2a3559
SHA512
ea0b09cc4ed64560ca2ff32b51a4a34ae6a45841060cc562ab5136657855744493ab35f33a4621864d5f2e3cb74bc02f2ca06f414ad6359be67e54ea2504dcbc
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.121.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.121.ebuild
new file mode 100644
index 000000000000..f68caf0fd433
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.121.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=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[@]}"
+}
