commit: e42d258492a7a1dc1398bbe2f383e031afcb955c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 5 19:35:32 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 6 00:12:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42d2584
sys-kernel/vanilla-kernel: Bump to 5.15.13
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.15.13.ebuild | 129 +++++++++++++++++++++
2 files changed, 131 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index f9b3103c4ae2..c51424c92fb9 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -27,6 +27,8 @@ DIST linux-5.15.11.tar.sign 991 BLAKE2B
42bed55a97098e8af2c9f33852b94806710e2df1
DIST linux-5.15.11.tar.xz 121955784 BLAKE2B
37a264e50069e5b195b99a355944893e42c6fc05eb5fef7907855de4d31c693421e6fc578575ed141534b52ab9105dfd7697bdfec238cfa88e16a6c41f138ebd
SHA512
5abe52981a9f493174afb908bc1c1a4901bc522c38c2da7ba15d5b907f06f9c4a684a47436697d79df8f598e166064d46add5661632a48275e0268411563f6b2
DIST linux-5.15.12.tar.sign 991 BLAKE2B
2eabe426cd804a5515a2fb2d65c763322d313ba81432ea2dc931172d592073735dac74615828dbf2b07d5fa66a562606cbe03f697578444c95c5b78cddca1910
SHA512
267a8f1b5813dc9c0c24b534de9890e398656bb4cf96294f3934c88297eaa36a773d9d89ef41c19ac411ef86aad9ebe463de0f9fef1c1b5df8b372852b64c526
DIST linux-5.15.12.tar.xz 121949156 BLAKE2B
6e201ffe5832a998b9bc8f63e9fcbf7f0384d4e4abb1a68c2299b8362b51ddcfbc35639bfc836a84202bec3705f5bca1616396c16daa05d778659d286f63b6a8
SHA512
8b79f30c26a865578d771b0c1a8273ecbf19135e4844210cb31c81784311601b8f7adfe1b3a9bc75c6bed99dcad9a5ff5e1976494b64f0de45be3a6570336890
+DIST linux-5.15.13.tar.sign 991 BLAKE2B
bc12b1eea7a7ba1bbd135165b320c4cf775bcbd1ea6d95ddeb1a55a1b43046c691b26b06b5232fcff39b0fa9ccd458d6f92380080050925d974b845bb66708a2
SHA512
beddeedbbe2a69f78bbb4f324bde11a64d8eafd50cdd8acdd35ff905cd1d1ae8b652f14adaf9dd104a1d17b608bcf18ce0b2685321c672160c75205cb7c54e25
+DIST linux-5.15.13.tar.xz 121958852 BLAKE2B
ea8775ffb1e25107b62dfe7acac4e9098094f7e1cd9846566cdf9fc1f0a6e2520f27dc48ce85c29e91032eb21a6f6682f6698a91b02b9424f2d895b5c9b468ec
SHA512
0775216f9a5f828b23bb8f96810ac65d178aeede0d1ee258a01b6f83f4a145809ab6699fa07aa07721e118cf0b608ee98885fe76be07b8707a2f9cd1c0833ae5
DIST linux-5.4.168.tar.sign 991 BLAKE2B
a581b74de0296ef69cd10686381571aa3c2e73b59dd495e78a7ba168dff85f7af3a3b7719419b767fe0b8380a904248d624bd1e17712327d2ebd62335943f8dd
SHA512
bdd0a88b6199d57b3c86521e58a356a35273007fb421e5d3b80d40e4b9337c30fa1b982dba61673fda0ddc9e3107b8da5cbe4916364fbbe035ab5026befe1c74
DIST linux-5.4.168.tar.xz 109188452 BLAKE2B
72e7da0a2a2d2ecef4b73b268db09a7cdb7a0e76cbbbfd7111ec727593f8eb60026ecd8102bedf9b13b393cfc9fdd4b5297ed4c48869152c09581d763e156552
SHA512
119856b47f2fb2d3560fedb60fc3dd432e5b150261c9d959e5e9426f7f6e03630fcade800b8e97fe6fc6edc717bc6a0a296c875c0dc771045b65d20b9df8a510
DIST linux-5.4.169.tar.sign 991 BLAKE2B
9f1deaf031eec59ff36d5cf72b9154cda6fa9f4c90f588e7f59d9b2b12990e30d329ccd4127b52a52aedbcad06373f907e0903f0bfd76be98c78f135dee78cda
SHA512
0683df80944f76eb8b4101237371fffd310f329662e8464452637e2fd46a86ccb4498d0e7781055c425e6ff6590e582b7641e8277ea22ac4084ed5b591352c45
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild
new file mode 100644
index 000000000000..f7731de3f3a6
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.13.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.10
+CONFIG_HASH=4882b85cc85fb2b7df396c4d671cc6432596eca0
+GENTOO_CONFIG_VER=5.15.5
+
+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/mgorny/gentoo-kernel-config/archive/v${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 ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+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
+ ;;
+ 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[@]}"
+}
