commit: 17eb6892e209e3680a8c110ce06c1e3227fc807f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 13:24:54 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 17:24:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17eb6892
sys-kernel/vanilla-kernel: Bump to 5.10.112
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.10.112.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index c7d04071e996..49ea5dfdab2e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -33,6 +33,8 @@ DIST linux-5.10.110.tar.sign 993 BLAKE2B
6eb5b7cde06aeb1821b244cf5d15b2e22dd9697
DIST linux-5.10.110.tar.xz 120375944 BLAKE2B
1500f1b5d7916998675556eeea025dd946f75d36ae469b36105bb16e4ff8e07dd35364cc2c20a730fb5922b87d7cdbbfb0978900dafc4b19be3ed15c8655fd4b
SHA512
e5d606025b3b3b1560f567790801ca85cbd91619ba76fa9345ad4070ba52b4d672f2e960809321869fc59a8206d4819c962fdf24331cabef1a4299e50311ba22
DIST linux-5.10.111.tar.sign 993 BLAKE2B
8a79ef4de812f204750445ef67cec72977c8357d914e9437bf9d98db7ac16e9d56d136721442d4ef7e1079359690974f61198db098d5a84561f9a52d327d2725
SHA512
895c516da4ba76f919b3031022c93c16c5c43dd22a2208731cc88db466c1f15460419908d3074be1baea7495badbe61641c2ae2202e8056b8027bae7154041a8
DIST linux-5.10.111.tar.xz 120394556 BLAKE2B
7178f552120c992943cc6d903b908955983cdb0623f1961c8b8c80b505a20da7447506bd6ec37141e7802ee4a5a65993fd19681636bc5a776417dd76ea7ca624
SHA512
4ed666aa63124919c932f98cd0a328df0c5423a5486321a0a11da92d02dee79856823e32469da7998b448a645536ae0d67337868993962e81d04058ddb6f8a71
+DIST linux-5.10.112.tar.sign 993 BLAKE2B
b2cfb536a4533e0add641331d1403ad653bea5e68d9875e77a7314c322040e3fc8106b7ded6d0e5810dbb348a953f5aff0fafab5da8f8283cbeab50b6789a4dc
SHA512
546626fb22f73eb9023a61556e30558888b83ca29c4656e78902746a7631d5c99de931a639d126b23cdede942a9f6a046e13afc4b625c34f8d121f63fc4e3f96
+DIST linux-5.10.112.tar.xz 120409860 BLAKE2B
380e1c4cf7b846e5fc95f9d773b561c020fd6bfba5e21e050e29d069a9a34c41b882bfe27d58e3acb0f2330718d08939e93e7078376fe49a72b3e05429a51402
SHA512
95c6146b5b7b51ce9ea586162b22237f88ba6a6008867e14f7975daf24056a3bcaa482e050837baf18efa4da5dd06b9159e591e2d70f7c55f6dfa23c607b1df0
DIST linux-5.15.32.tar.sign 991 BLAKE2B
3aecd518f4fe5e9135b802ac280fc2400f3912360dcfe0a5cbbc377a99bf77a55588de1974ae7d99bbbd67d50172b3a5a644b5376b1ba67ed97cf3bb414a856c
SHA512
5c18849083f2bc17d1419282559f3fe445885ba412a60cd7c70336341f1b3511e6687ac420708748f0e4b1ef2632c19f4fee1333c0565826b851a7f1b4dfaa57
DIST linux-5.15.32.tar.xz 126254900 BLAKE2B
37db43d3fae8d56cfc9b4f9bd3a76f450b401cbe643c89191de4ab442cc0910fa2d67f2cddd2069d517fb426f6437ff7e05b43ff2a314da04f883d25e354dff2
SHA512
6d8955a6b71be155b153db0a43f75822f1f30f339445958828e1611648c8c6e0001cb118e9016a7119de80c28286b3e060da675aa73174a7a262fc8b537aacaf
DIST linux-5.15.33.tar.sign 991 BLAKE2B
8ce39ce46dc10afa8597cad4a29d16124afcc2309b8cf9fa67c2fd5860ebb7b1f01a472e3507bb3dd6fb9b503a9c422bae9d88c4c1cd138e51396c9103711bb5
SHA512
be6b63c9bd61e45f254ca75bb863050bd2835ff3d5917e49cb1bc9569f27782a6005b0e07ddd17c60ff77d94838c7bc6f06ca9fd192c609941263aa6b6660695
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.112.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.112.ebuild
new file mode 100644
index 000000000000..f79327e40cfb
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.112.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.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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/mgorny/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 ~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[@]}"
+}
