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: Thu, 26 Aug 2021 19:31:49
Message-Id: 1630006292.9390cc71a2e3160ed054e6f33e4fe82da37b7292.mgorny@gentoo
1 commit: 9390cc71a2e3160ed054e6f33e4fe82da37b7292
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 26 15:32:38 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 26 19:31:32 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9390cc71
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.61
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.61.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 d09d3ffa157..1bbd3447258 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -23,6 +23,8 @@ DIST linux-5.10.59.tar.sign 991 BLAKE2B 9d5e4c4f80a71af3e882bd381d2ee57c76284462
21 DIST linux-5.10.59.tar.xz 116403980 BLAKE2B ea6c05bf9d288ed5e1b0d230262e1e0475ffd93da11f0d9014d3e216d33018116cf860182d70f09ede407ff06b75a6b86fdb8db50175f9764fd54cdebcde7d96 SHA512 a0b3b73a51bedb6413c86f416d63e25305116c8bab6ab494d92aad36b7615a50df95c4b43c6f4c4d4a9b808b1e0afc02519382d8bcbf4c48bbba80e753ac617c
22 DIST linux-5.10.60.tar.sign 991 BLAKE2B 9c29c9d981e5f8ca8381a3953ed430117380a15505182d7854d681783b29d8ec444e8ce29233b63283c462bf95419e71db9932cd2dc4261321de5d1caf6abbb2 SHA512 8b60c36b97cd427f20e8e82cc63de7346c88a3081e38f4a6e499c53b72d9f2297f1cbbc08e6da112a3f37afaefcaeed22c70e51d7c91ff271a0799e0ecc31b86
23 DIST linux-5.10.60.tar.xz 116406216 BLAKE2B 4b7d3cee0055c03ebbd7c79b1d6a6098f25c2205ab8daa1dd8ac416ff8c16f6026099cb906b61bd93ca5ef2b9fcd958a54c76265f61c439cbe5b75c6e3953345 SHA512 d0cc61498eb762e4f1d7408f721b946e0dccf4748905ba7ec320ad6b91a9042fd2e08a4742a3b3766bc1730152eb7e02a71ce64f935ec32384bd0cc1dade6f93
24 +DIST linux-5.10.61.tar.sign 991 BLAKE2B a5ff9fd5fe3831ae30cd92aa8f92232643fea3b6474e204493af1ace4de910255e8a94988a05274ca7b1342735160dc9ce41a71ce6b168924069f2e7eff843e9 SHA512 0fbf1b1b15ee4d981f0a05d39a3f67a3dcf4d32d61b7bf83d92423bea0ce95e34680130f71f8c12ab738867dc67d7a1f995b79044f0d5fcf87657ae7f2720496
25 +DIST linux-5.10.61.tar.xz 116400968 BLAKE2B 7513b33472fb0f3cbdaea6fbfd094f325303c407ae15f20f724b0ef07d24a82a1931b5f109dd2a8db9bd3fcbd8103535113693a83dada9420671abafd38b9a12 SHA512 1b3123288b82afe9f760fa5fa19c518c6e7c5ac5640659136a0a3277375ae891ebe85fc52f75acc5cec8be5596adc5adc421aa5445eedca485f0ab24f4abfd8e
26 DIST linux-5.12.19.tar.sign 991 BLAKE2B 881e8f5df1f9503e7ba58b84351b2e4f0e90b63df2b14577bc65cca76f72c6a97f8ba2bef87c46a9d88a714bcf010f7b706c1bf57a68896390126c5902710a1f SHA512 fafe83c82fb1c7f67bcf8402fe4eb3363087324c7ab11ff15892021737685d945fc2ccefa78088f2645570bd763a6d7d846d7c1ff4f998d9af92f5f3e35cba48
27 DIST linux-5.12.19.tar.xz 118204168 BLAKE2B 88e4c32cf196662a6a24e72b978019d6f8881a8523918029f4229a995c5fd957a5e01f42de9f53c7980df7e3de5ea6b069cc2c5f93852e615fe8fe78a1b131c6 SHA512 2d010d6d75052083300b1a629dbec25a39f6314a1871ed355133bb59946453915a2265f4ba26e60119ee0d05abb9859c5ee7d8fb8dd816c476ebfdb76d3399ef
28 DIST linux-5.13.11.tar.sign 991 BLAKE2B aca5b5f10711842ca5f6c7d4a81eb83414d99dcbeec6944a2fe74d0488acfabd0f538b9432b884d52f7a8f18f3277c494e106e1ab6e009b2bae51ae7173ddb7b SHA512 2cfc7a3a464796b4fa376bc908e95e4435e4073ab3d532f4cfbc252eb75699524c079ca7af63bb4c301819ab3afd57524ad5e46bd7121c491ab8cf22f72ee3b9
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.61.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.61.ebuild
31 new file mode 100644
32 index 00000000000..12c958a4bb2
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.61.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 +}