Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
Date: Wed, 07 Jul 2021 19:35:31
Message-Id: 1625686514.2cc4e6dc301ddcb254f65e34cd64a5e3d39f8f7a.mgorny@gentoo
1 commit: 2cc4e6dc301ddcb254f65e34cd64a5e3d39f8f7a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 7 14:42:44 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 7 19:35:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc4e6dc
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.48
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 2 +
13 .../vanilla-kernel/vanilla-kernel-5.10.48.ebuild | 102 +++++++++++++++++++++
14 2 files changed, 104 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index ae636973af0..864ae094774 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -22,6 +22,8 @@ DIST linux-5.10.46.tar.sign 991 BLAKE2B 59c326a6c54fead30828fdfc17759ec883136b8d
21 DIST linux-5.10.46.tar.xz 116363464 BLAKE2B 43ba518dc50ec98eae0e73f10cbf9883b65d825cd5ec4df16650288f5c383349448460db8e44e40bbb2872d2374320bee9fd1c5f7673cf4633b6eced275518be SHA512 f9dd7e507952bd16a7e20bf5f7c99a2bf921e041834d12a7297910902dee5336f3170e43bc81b632b1d34926ea941f60a3e8e5e679f5ad9bb329d02ddae449a8
22 DIST linux-5.10.47.tar.sign 991 BLAKE2B f0399021e8a5c19d7d871fb62a97dfba2b4431d0d0d2a09a1d8764ab332b6b224a0227f4ace19a29dd43e73a56df048a0e69e47837559b699cc703a793653820 SHA512 7632d72b182f13ef9e639118d0aad863203f91f140ae6ab9201b18bdbf14326f03a4a95ad51253e7ba2214c134b4d13652e33c88e13817edd889d81687039c38
23 DIST linux-5.10.47.tar.xz 116362372 BLAKE2B 6cfe773c5004d742e1f47f8ec408cd37b8183de5662370437b62a53ccb7960dc97499a90e41d94c8ff25207c4cc9428ca9fe6e15388e4be83ba34e83bb2df9da SHA512 80760ce0e55f146b1434cb21975cb1b3f94a6fa7f5c8edd9e534084596e8262ee5945f2b25b98039d9d405232083f995782bbdaafbb7b387bb785eafc3e2e9c8
24 +DIST linux-5.10.48.tar.sign 991 BLAKE2B be367b874b4e24d84498e0d427225ed8ed33719fb5e698af2477d25092b4768586360f625141439ef52f459ee86d4c00bc5cc62eccf0d80663506077760ffdd5 SHA512 5928797677ffe2a6f045855d623720ee5ee4aac49e4693bbcf5392a976e9ce05553ea3c110f29133a35bb67444b4239652048af0576a9a5ec9148108a6d9182c
25 +DIST linux-5.10.48.tar.xz 116361056 BLAKE2B 176c4ab03ef0df041eb98e03c1907e8b46ecbfa5ff77c95fd638e9123cedbd386bddb9bf884f682a78fa0292e3c2e4740bfe2c152e98f8c8079eb135d5ee729e SHA512 18958e0af1b6170e7388fe3bd1669af266980d7d8678ea2198a4828a1b0d261754a1c16e1044d5230275205395a34bfe943d868ab7e084b1a547123f7f9421ce
26 DIST linux-5.12.10.tar.sign 991 BLAKE2B e13957f787397e09e04c1fcca75af58b80f0340150c9c738628826c17b77efcf14ad65a45363193c2fc2780630b1b8315f427323e2b15f65ca1ee0294300da49 SHA512 0113060125fe4a5015c0bcec82e873db3d5a4a5ea82764f15509f0abfd51af34b25adec164d2e765cbe3c059caf71a5047881cabada9599cfba6c947ae4dd6d6
27 DIST linux-5.12.10.tar.xz 118148040 BLAKE2B b40ef5a11ca435299899e8131fa72af147455cd8ebee4c0e187572b1f628e66d2b6fbb318308bc911a598d8303d1ab3622d52966deaa5c48d59dcd65f4f58687 SHA512 b7f897582fbce307f8d24c4a1ea490050afd7d1e1af24ffa621e863238cb9ff8f1c1a378392a546a5880c9db50c8420504a052ff67d86c9ae3f82145d9f5f42b
28 DIST linux-5.12.11.tar.sign 991 BLAKE2B 4b01328a96e7dd0ac1487ed4d8d3f5369af6ec2a886cd0a6acb456271765c1e45aeb620b0bf61867973e3fb03a53eee0b0efcf60755257f696fe2bce8e8d3233 SHA512 67dd3f239f23686a5c9749c3122d549570403d71b95587371b56172077fdfcc9955ec70f64b6c71fc9869d55de5515f903235a21904840915a83e3b41f489b2d
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.48.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.48.ebuild
31 new file mode 100644
32 index 00000000000..12c958a4bb2
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.48.ebuild
35 @@ -0,0 +1,102 @@
36 +# Copyright 2020-2021 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +inherit kernel-build verify-sig
42 +
43 +MY_P=linux-${PV}
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.10.12
46 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
47 +GENTOO_CONFIG_VER=5.10.32
48 +
49 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
50 +HOMEPAGE="https://www.kernel.org/"
51 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
52 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
53 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
54 + verify-sig? (
55 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
56 + )
57 + amd64? (
58 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
59 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
63 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
67 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
71 + -> kernel-i686-fedora.config.${CONFIG_VER}
72 + )"
73 +S=${WORKDIR}/${MY_P}
74 +
75 +LICENSE="GPL-2"
76 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
77 +IUSE="debug"
78 +REQUIRED_USE="
79 + arm? ( savedconfig )"
80 +
81 +RDEPEND="
82 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
83 +BDEPEND="
84 + debug? ( dev-util/pahole )
85 + verify-sig? ( app-crypt/openpgp-keys-kernel )"
86 +PDEPEND="
87 + >=virtual/dist-kernel-${PV}"
88 +
89 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
90 +
91 +src_unpack() {
92 + if use verify-sig; then
93 + einfo "Unpacking linux-${PV}.tar.xz ..."
94 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
95 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
96 + assert "Unpack failed"
97 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
98 + else
99 + default
100 + fi
101 +}
102 +
103 +src_prepare() {
104 + default
105 +
106 + # prepare the default config
107 + case ${ARCH} in
108 + amd64)
109 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
110 + ;;
111 + arm)
112 + return
113 + ;;
114 + arm64)
115 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
116 + ;;
117 + ppc64)
118 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
119 + ;;
120 + x86)
121 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
122 + ;;
123 + *)
124 + die "Unsupported arch ${ARCH}"
125 + ;;
126 + esac
127 +
128 + echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
129 + local merge_configs=(
130 + "${T}"/version.config
131 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
132 + )
133 + use debug || merge_configs+=(
134 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
135 + )
136 + kernel-build_merge_configs "${merge_configs[@]}"
137 +}