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: Sun, 16 Jan 2022 17:09:34
Message-Id: 1642352960.e4e1d22b3af977f6aee41683e3a589fa9f6359ea.mgorny@gentoo
1 commit: e4e1d22b3af977f6aee41683e3a589fa9f6359ea
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 16 14:52:52 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 16 17:09:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e1d22b
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.92
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.92.ebuild | 130 +++++++++++++++++++++
14 2 files changed, 132 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 1317042f4208..27fde36b2fd0 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -29,6 +29,8 @@ DIST linux-5.10.90.tar.sign 991 BLAKE2B c41b37ab6e42e5f89b2ca2e0ef84421a2419d137
21 DIST linux-5.10.90.tar.xz 116480464 BLAKE2B 993cd26adddc38a811bbfbd4acc1d595660379d1d55eeaf7008681f13e198571554116e85a88ab90fe945688695831d364a426959bccda0d15d9b01ebe611a83 SHA512 0b31b025a7f65cfbe4cd77b059c74a087109daf4c8195e17f91f725feeb074b12e7db0f8333906e8216511723ca5cfb55230873a4351867c1b4962831646a51c
22 DIST linux-5.10.91.tar.sign 991 BLAKE2B 6b649151e0bfd3774ba37451eeab2923137e152dd9c538a2e27ffad48edba78c86b5b3ee9e94c52095927d9c76a571d03ae13d04a7e7ffd923c636147539fca2 SHA512 f809d4e43f006f72cf30745a31f9a766b9187e90a4461b1fa77754f5e85275f5657b62fec8828c5b0a13a1730d493068cd4e01b33e2d8a5bb99319acff12c027
23 DIST linux-5.10.91.tar.xz 115074200 BLAKE2B 933d76a40a908733bdbbba17f06e346695d02bc281c715ca53a3a2d8a25b0f629f82b31962d631b19838d8e76e1634966c5631c904e791b6cedcfb0cb0b7d454 SHA512 11462ff6d874432f685cba8822132bfda6f5bb44f6c20125ecd601bfdc21cd28c263a441abd60beabb90e8e82364cad0499e6120e5ceac4433cdc6dfdd823fdd
24 +DIST linux-5.10.92.tar.sign 991 BLAKE2B 5bd4f8c89ea3659ed70aa60d2fbac3f86c23f949a03df3cf650c6f44c373d7b3500b246e20ede55b7bbbf75e9796c5d70a52c8687f321158242617704d1ce51c SHA512 3421adf5d28a877f8cd8e8a820252d757f28a911241517cb8831ce3f4d3e936abc850e3ea94792698b2dc94120b5a87e6367de941d23d92fe6ea233fe02db6e0
25 +DIST linux-5.10.92.tar.xz 120366172 BLAKE2B 81ded0d05dea5b9f3cf115c6694006dad7863435b0ca84f1d4f53172ba8dd9ac4524a2e6025e683e98ee728e726251b266432f8bfb0d096a9f593558a18a0a18 SHA512 57a6c4818a072426e01d666446e0671ac610486bb2790e8a52c825b5fdb059923e4931a3d11d64bbacb562c1f552e465a5569aec5404afb8ab11521dd6ad7093
26 DIST linux-5.14.21.tar.sign 991 BLAKE2B 159182d90911e738c0693c839441f679b66fa3e75c61bb55251552b1ebb7bf6ad018d66d0a83a8f88935b88c1f39fea1207a94f3fd4af3d1e5d148cf9293baf9 SHA512 1c2639bfec52b2f8cfc69504b7f474d1d7a96dc1793e8cd77a6160718a5f381c5e57e42339bd5361e83b86c84cda2500d18615bfc210bbe989c0560b275f4918
27 DIST linux-5.14.21.tar.xz 120726436 BLAKE2B ced805df81421f328e2e08d50a33bf6ba54092e95c84d7c1c8ec25ad909c183f82c9966a074c274dd0d13b069b87c12c6f6d5593faf3c0813c4369f90fc4a24f SHA512 0f428cb7273de5b440b610b1a3709563e4ed955afb4df084750a8b43c45e5b000a5906780ff7079a8324fac0a8b7ecace778ab8bbf0511fba92d4dad160d7f87
28 DIST linux-5.15.11.tar.sign 991 BLAKE2B 42bed55a97098e8af2c9f33852b94806710e2df15a9fa8fa2199a1f3be133b89b9505e79f3e9c9663fcc5482249334f34a1c7a9315fc40741ff7302a60c4c823 SHA512 5ff3d7d368dd4481e003b00ed926f601520f53de020a507c5f9af506679e57958db0967752a600ee80cadbb0b19d33368007fb1d3c298045b30faed964da4714
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.92.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.92.ebuild
31 new file mode 100644
32 index 000000000000..54ba5f449c7a
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.92.ebuild
35 @@ -0,0 +1,130 @@
36 +# Copyright 2020-2022 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +inherit kernel-build toolchain-funcs 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.15.5
48 +
49 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
50 +HOMEPAGE="https://www.kernel.org/"
51 +SRC_URI+="
52 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
53 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
54 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
55 + verify-sig? (
56 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
57 + )
58 + amd64? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
60 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
61 + )
62 + arm64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
64 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
65 + )
66 + ppc64? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
68 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
69 + )
70 + x86? (
71 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
72 + -> kernel-i686-fedora.config.${CONFIG_VER}
73 + )"
74 +S=${WORKDIR}/${MY_P}
75 +
76 +LICENSE="GPL-2"
77 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
78 +IUSE="debug hardened"
79 +REQUIRED_USE="arm? ( savedconfig )"
80 +
81 +RDEPEND="
82 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
83 +BDEPEND="
84 + debug? ( dev-util/pahole )
85 + verify-sig? ( sec-keys/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 + local biendian=false
107 +
108 + # prepare the default config
109 + case ${ARCH} in
110 + amd64)
111 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
112 + ;;
113 + arm)
114 + return
115 + ;;
116 + arm64)
117 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
118 + biendian=true
119 + ;;
120 + ppc)
121 + # assume powermac/powerbook defconfig
122 + # we still package.use.force savedconfig
123 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
124 + ;;
125 + ppc64)
126 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
127 + biendian=true
128 + ;;
129 + x86)
130 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
131 + ;;
132 + *)
133 + die "Unsupported arch ${ARCH}"
134 + ;;
135 + esac
136 +
137 + local myversion="-dist"
138 + use hardened && myversion+="-hardened"
139 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
140 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
141 +
142 + local merge_configs=(
143 + "${T}"/version.config
144 + "${dist_conf_path}"/base.config
145 + )
146 + use debug || merge_configs+=(
147 + "${dist_conf_path}"/no-debug.config
148 + )
149 + if use hardened; then
150 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
151 +
152 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
153 +
154 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
155 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
156 + fi
157 + fi
158 +
159 + # this covers ppc64 and aarch64_be only for now
160 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
161 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
162 + fi
163 +
164 + kernel-build_merge_configs "${merge_configs[@]}"
165 +}