commit: 2814a2d0facd3a2c138a2702fbc3a6366d7e8dd5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 14:39:15 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 19:16:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2814a2d0
sys-kernel/vanilla-kernel: Bump to 5.16.15
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.16.15.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index ab95502ba993..2467bc4d3214 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -34,6 +34,8 @@ DIST linux-5.16.13.tar.sign 991 BLAKE2B
4553a9d234ba1336d90be0337b57b86385809759
DIST linux-5.16.13.tar.xz 127576900 BLAKE2B
6631cd1c19819a4cb2ba747eb62590f0f7739ef8c00302a78cffc0af907fbad135f3cf2934fbf403940c3331b015f8dd9bdf0362315feab7a3ff45076ed04515
SHA512
427140bb0da00e375299944da4dea992773e707c7c416e426e40397ee6f339a745a5b98dee0d9b36096dde6e9a18e5f45b462857782c6cc5aa3e5690b6019c79
DIST linux-5.16.14.tar.sign 991 BLAKE2B
86c4ea68d91d9faf8efed5922a33d783e7c292b4e00d63cb97da3ec0a056786f9eeec698e5c7021f96474c1ec85d9552379733bd8f88fd7de572ee1118e55b20
SHA512
63298e9ea02247ca59e5eada0dfd2e549893d71092664321eea0b62a296e2a066b42d00a3da41a221d9ec672590c578456d12271e0bb964621c793406b0b8721
DIST linux-5.16.14.tar.xz 127571576 BLAKE2B
151fa2d87c04de862913c360fb8bdb4d2cf4cbc7ca9777b97ee3f03005e8d5ef72b307fa5787ae53157291773158bca6b499cb1e71f6dc5098f424e15ff6c948
SHA512
3daf1b5a01cbab632492e18a8e71aaf2085545f4944ce587bc7c27e86a0a739d0cbffe7890ce9c5bc863b3c5083281bca6ed4df8d3c69d60c6dcc210cd86993e
+DIST linux-5.16.15.tar.sign 991 BLAKE2B
da6ec5424d30e6781ac1fe3699bab8002403366f3876fc23370bed39830d359761ae7cc0e4a9e101237aa1a8404052507166255149cb208dc38dd93a2c3614c8
SHA512
c97028b06976dc732ef57108a258059275e7c6cfa6e4c89e1d30ba53b0dcd450ee1849b95d7eccd9d9d6e16be77a38d9ea82ad7880f84658150e13101378043b
+DIST linux-5.16.15.tar.xz 127599700 BLAKE2B
5b14c19cca863da26f226b30f7a04d5767c90a882f9ff06241659f54632410868863a00e6ba91d82272e315d20238d3edcb7d4b6475bcb0162dfc47b6890ecc5
SHA512
6f0245740ebebc6aa687c5fb1226aee492d543fd202f88963a488cfa609e30d3d1116c362638be83f201cf08380b9c696a1d2ccb1e0934f84dde14eeb9b4ca25
DIST linux-5.4.181.tar.sign 991 BLAKE2B
4ec0715478495d20c64caa05552dab3b7625147f31b0c5457c9e30d97efa309b541adf4b638bdb65b98f5324eb0486607a995b8ecd4f6fb68ac2cb433c62a685
SHA512
7a79fc9e600a5bafa7212087e81e902c3be8cd9926082224fe770ffb7f861663120c5099201e512db8d485523a79d8273e3f52f31302820247d47141cec255da
DIST linux-5.4.181.tar.xz 112896524 BLAKE2B
b450b38597c4a94c18ce5a347cc184bac0e5846f30b797c5cf06bb5186411a870ff573f7aec97c5612de10d695d5bf5fb63953e091905cab9fcc3c162b5154e3
SHA512
10fba413fe8da1b569d1366bf99d18ad3b5765abedb81931f4d00b40daacb8797e122bb2fbc1a739f1d9999e01e0b920faa58be41e2010a625c1d58f1b54e288
DIST linux-5.4.183.tar.sign 991 BLAKE2B
a56523b58f38558061c255d50caa0add22328467829751151af6525ca624515e7cfddf50073b8ae9c5d58c6776ee51aa658fca28e3b9788c58795d762ccab77a
SHA512
9f47cfe7333857f9c8b37fbd67be682f86153a83e6d6b7923788c4ca2fd15f26d133359c9d1af99f8e12ed9914f5e483a8b5e698a83049fe572fa4a0d50e23b0
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.15.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.15.ebuild
new file mode 100644
index 000000000000..1eccf5c622da
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.15.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 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.16.8
+CONFIG_HASH=f38101bdd0124e3ae7c3116b66f7fd1cd76e5601
+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 )"
+
+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[@]}"
+}
