commit: ccbb93c2dbe1951247d559f05a03f6b039380a46
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 21 17:48:41 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 05:08:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbb93c2
sys-kernel/vanilla-kernel: Bump to 5.15.118
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.118.ebuild | 137 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index f3d577880e47..d9e68e6f89d5 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -44,6 +44,8 @@ DIST linux-5.15.116.tar.sign 993 BLAKE2B
ad8fd0325268b7debe85ccba5d1576e9a9d2600
DIST linux-5.15.116.tar.xz 126548212 BLAKE2B
d92824cf8ecf4894f839a2235f972da70c5658bc220b084ce088093d101046a34331efb3cca48df20f2b6b5630d5ee1c0e38fdedb0bc0f88f7365beec3ccb1c2
SHA512
6a934b1c14582dd8c958d166bed74243b9dba84008d493a1d5f89a7f3b0dbdc676b8659993768752ce971174e0ba6d48d3785f0efe157a3309bc6d7fc4973831
DIST linux-5.15.117.tar.sign 993 BLAKE2B
4408e841f53e2a2e54e6b2e2b8dc5d237ba51fbfffd601b33325dc73ff9cfa89c9084fd08c80e8edae7a83e9e789c3116374ed0f073b37ac34504bfdf152eeee
SHA512
0fdc2d532852160b99c96cbaf872d83659942125f388915175705adf2bd94db446e2f05747a594d374dd772f6c415795bf25a2e309217354255e9ec506e600fe
DIST linux-5.15.117.tar.xz 126549496 BLAKE2B
293498fc749025b1b23523d73e6cf121fa35c0aeeb8110e123fd3a557bdcb8652189bce58d1d28bd00145a036f00e78149917d5a7c077e8fe5905d928ebc9ed0
SHA512
8001c5fe571e574633c939d2379de8dc165b16f7b4d284f9916ce7ee5d7027bd87d9251d7b499a18100db23a09a9fbd29c4ff3af6fe8ebecc4bf5b5de617d662
+DIST linux-5.15.118.tar.sign 993 BLAKE2B
d837d9805818da9e3cfcab6b04c426584e439ca510c39b9ac81f78f3e579c1fe01e0ca371a681179b2aa01ac9bdbda1f633343e62e9c69dba8a6b6c5522b9fe8
SHA512
3793071326eae5e418b1152e47a629b686099a9b95ac67381d40c7aa75ad4c7a8f13627811b184c484038e47b6ac9aa1d13045a95ee1f7d8a724250076e1b49f
+DIST linux-5.15.118.tar.xz 126484912 BLAKE2B
dcdbfaf63ff36daa1b2bf2a919f0142c4d1bb459a796f9fc2ffbf32e593f707a7c46d6cbb6f048adcc9a4ff40a616bac9b4ac59e75dc1c36b7ae0a0d978dc0a2
SHA512
02f4369598e0a0e252e8f3bcf1f413272b1f997b9088f6c1e5c78420eb78bd8478532a6089181a26d9bdad2eb4721ebe3b02093de4c8eca2b8823180f0ae8e51
DIST linux-5.4.244.tar.sign 991 BLAKE2B
777eafb4445f043a94936c89bf5da610abbd10a4ba307ff9affdf74344bb5dcec93fd8a0aa8160afdbae67b732af8131740a6e8ecabef0360fc52c475a847ca1
SHA512
85c9b095616bb45705b741f4d0eccabfe50d0571a85362c1c36575f464011c6c5949344e4b170839e603f2dcdc73ab7ca2a47ff695b41b93fcec18bf4a46b2ce
DIST linux-5.4.244.tar.xz 113008872 BLAKE2B
2837a01c9879fe2975330f051815bd688308cfca91ff29038db899c1749964ed68773ff72e78e2dfa065f3d763401a83c880b386debd90ed6cfce6e30ce79bfc
SHA512
eb1b7bee8b29103b3678cb6b3a66401d68c4b2f2c69ea603a8bae920e14655dc41ac21d79fb9593ab479668eb669f0e4a1af8628ff33f5b91db2c820f9f80cc8
DIST linux-5.4.245.tar.sign 991 BLAKE2B
37fa9d8b93c228cb96e163b95d82bcbda8a0ca725553656935da4f9cd8d2d877ac74ad749c928f7ffb1a5e16a26fef5c3b4f2cb7fac7eed245597df420d48807
SHA512
d5991e7a52aa3201330c4afb0b02aef6e374ffd9cf82d6bf92d38c1418d3ac49c2b6b7f828915ade5682a33a4a1066dba5c30621639b14c787365104e03cbcee
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.118.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.118.ebuild
new file mode 100644
index 000000000000..f68caf0fd433
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.118.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[@]}"
+}
