commit: 83ec5691e80689c0877e95865bcf28eb931d3ff3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 13:08:51 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 16:55:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ec5691
sys-kernel/vanilla-kernel: Bump to 5.15.69
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.69.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 0c019f01fda1..8a429d0d28c5 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -22,6 +22,8 @@ DIST linux-5.10.144.tar.sign 993 BLAKE2B
ce08aff313d51882830b63cab9758752a4dfe6c
DIST linux-5.10.144.tar.xz 120471208 BLAKE2B
4965029be62c90fe9eb9ae3ca5a4c904455c36963c108ace3bc21f12638899420b1c6c60fcca3f6876e6e947c5228b3996440e511fcc2f460cf27100e762e12e
SHA512
dd4fc03c4fe65d1d3529bc428adfbb025afa8c913c482a0730650f6f05488f17a8e97677a8e238d725952c39b05ff156460d9679e7bc6e810eb450cf2d0b3a7f
DIST linux-5.15.68.tar.sign 991 BLAKE2B
04b977efcfbf7af3440ab18308a3ff849f4294b5d4d12695be08cc60cfdd4fe9f48fbd4d1218bbdb2ced9d539bf15b9f9050c92f258669967aad733d67a69c3a
SHA512
c4928e896e59ce19d63ffe395b77f85507b329592e79b2d6f285cd48e7a57726d3234e529f29dcbf277acc7864aa63ea604a2fab08c7c3e74c1f0d3c046f196f
DIST linux-5.15.68.tar.xz 126445616 BLAKE2B
b97474cbe59654ac29a5f514c08a85db9ec330f58e08de53386d4fcedeab3845d6ea5b55e478a49fa94466eda296f80c7835704e2a13d1d56f6e38ed51953ca1
SHA512
fa62e3061a84c7fe79eb69e7c4fd4bf77aebb11ace53fe2bc5a63629a99115d9c406992166ae84526d8854af57cd9cfd173191877ea6639a5fc3c2a60ab22931
+DIST linux-5.15.69.tar.sign 991 BLAKE2B
437ace51d1e348103c3003148fa75033f23e5ed4d37ed9a75771a066a2dfa56bc2ad455872f1736e3ff9bc7398807ffffe8fc4d15bfa585b7e4a0c0eec92c213
SHA512
34c46133123ccb339c4318e442f63bcb508f0c2696c5bcdd4999a2b0a7be47116736dff6605278d549f3b227c943b3d5844fcd42e9bd632f6053aea7784f2f5f
+DIST linux-5.15.69.tar.xz 126457768 BLAKE2B
0551e6c4fd2f6e528bd56a9e728ccf50ed3cb8609db9dc5fd785e2e89d6267cf3df390a0f68db8c1c48edc12364cccaee3b5d397cdf3994b61fb8d5e32687e50
SHA512
580fb75d44a2ef9b7a24d381540c21fc68208ee1e683683311c64e3d47ba7bfe5e7a29a563c8cd631f09d425de13d51605ae41b40523b0388ae1ecaa6d1578ea
DIST linux-5.19.9.tar.sign 989 BLAKE2B
7a91005e18985c3cd7fc9b2c5ba6e25f756b471479865b83e2c5bfeb09ac0a452a5a580cebc1ae542fdb25e6fc020f20d1716143520286cede0f344b0070e912
SHA512
c9447dc702ec67da6b6f5aae43a09178796959f41faa9ab4770fb2a1b16d2844c9ab09cee09c1c41a31ec0db64e41d0a43ecc392889ddf539923cf5c0855eab2
DIST linux-5.19.9.tar.xz 131654068 BLAKE2B
2f42b30510e8b778e78d5945b8cf0d5f67e95470414043128470108251a10a5a67841f5f508253a3bd93ebc4203a93e9947dcf7f4aabbe37e09390e7b25b52b0
SHA512
6607af5e83e57182426e22e00db1fcb7ed5fc197457168f2befe283a6710d6a83fd423b914f0ba9e609d9502f67b8690354ec74fd2c7eb855538641a11d73607
DIST linux-5.4.213.tar.sign 991 BLAKE2B
5266f3850825ba2eb12b2dfd2d61c22550e55da2bd2e1e970fe462bf3ddfb4aa1c156e414efa22d8ef3cf73d625532aef1ea8480f9f8d87d09ead700f616e268
SHA512
4a469aee797ee108c4bbe140010bf976aa8daac98e7b09071d68667f875f8a12c9a1b1bf3350ba9415aac55d9d84e95102b123a4240fa3d61f3f9a83f7c89fd6
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.69.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.69.ebuild
new file mode 100644
index 000000000000..e9d460c7094d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.69.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 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=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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[@]}"
+}
