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/gentoo-kernel-bin/
Date: Wed, 31 Aug 2022 20:47:48
Message-Id: 1661978858.81a899fb3d6a52f5b987621ba3ea61ca6d7798ae.mgorny@gentoo
1 commit: 81a899fb3d6a52f5b987621ba3ea61ca6d7798ae
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 31 20:46:55 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 20:47:38 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a899fb
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.140
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/gentoo-kernel-bin/Manifest | 6 +
13 .../gentoo-kernel-bin-5.10.140.ebuild | 135 +++++++++++++++++++++
14 2 files changed, 141 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index ce7b4373731a..fff1f0b62786 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -1,5 +1,7 @@
21 DIST genpatches-5.10-147.base.tar.xz 4073808 BLAKE2B 0e1214facddef3b26bab742ca4164773162e6954996bb8e5137707c6728e0deacd4bd2679f276edc0cd03669a0d03a5c7744918efa1189877e38608dc393d065 SHA512 84f5bc607c10a08a03c8afe8617719827588b49ff9ca6401fd128806ec91fd6d07cfff6ca313f5a49e9a1b37b9aba2aff9bd0f597d65bb7c36236e148a04b397
22 DIST genpatches-5.10-147.extras.tar.xz 3868 BLAKE2B 1f12eea29cda808c434364d0f60ae931819a53d20bf632a12f140c47a001387987688eef1a90a31227a6ccfc217c5db3839d06527a7bcc1877d30c98dc47e21d SHA512 492274da82c010f4d7f33dcf623789a9be51ee711d19076657b091b1e91ed70ff6010aba5e7778c9769eaef28216baa01d3f373fb76c595db38b4763ff182740
23 +DIST genpatches-5.10-149.base.tar.xz 4094572 BLAKE2B 45a25b910fc88f030d97ef5870925df3bfb05d50bf95cb3cfdc4d98ed24c006ae026b88b29ec5db4087671c0a440a4c47132272e6ae965b1c336fa1c567dddbd SHA512 4898ea729def7fbbb14f04a578405a4e96e03e425de696db4d2bc86cfa6942c063f8c8cc79801f85ac38edbb5f0f5851073418bf5df32784ec7efd242318dd97
24 +DIST genpatches-5.10-149.extras.tar.xz 3868 BLAKE2B 2667cf3c9d447c855b6b6cea4b9100a300077fe74eae84b69fa0a6ee861c787e44e96518bceb93f1c2be83fd8f04251ebfca673dcd9da4ebf2ab98041a3dee4f SHA512 73bda9933661f78482eaa048c1467d1f3acbef606676547d1ef3c64c5ff95475d6d40153a47f247868a2cbf697e5a4d21d58b57b3be6763ef3de869c31b5ede6
25 DIST genpatches-5.15-67.base.tar.xz 2856328 BLAKE2B a92c3afb5e0a6605587744c68b3bec4c63848e0c09469d99080258d97d3e96a0adae175600d7dbb00e566f4383ab00c6981585acf343111218aa21e503901f7d SHA512 3d100c04ce9e440177ff2156b8ce0c0443414963a47fc1c51a86a08cce998ad0b6289e70455ecd2965009226036486c1b6ee3768b1782aaad976cd144f9b48cb
26 DIST genpatches-5.15-67.extras.tar.xz 3936 BLAKE2B 168a92a9db40e6014864a96aff71fb87b351d7127c5eedc8e062e753ae65d7ebc628e9b0eded328f17e88562592d80522ccdd31a549c8104aee51e2833f81134 SHA512 0f2bdfa87ec2a610870089c903b301dc86dac52f4969386074a439be90674c4835800cf9250d8844b1ec3df88cc8dc0b31e4582ea309b7c817066a1341c692b2
27 DIST genpatches-5.18-23.base.tar.xz 1206204 BLAKE2B 12a7b9aa7d72f27e64c4cb8f5607529dcc7d535a9375768e065d97d0b70b0726271b70dfa4ea019bb42606ddfd513b70357b2bd5ad95548c9eba9f91041f27b0 SHA512 9a459e3e8cb4a3285f782516fbc176a4a73c151281bea2258f049ec0662b806eefc54cb6e9151cc968e3a9c39789062c207d514920559954db9a10b53a1c2f0e
28 @@ -12,6 +14,10 @@ DIST gentoo-kernel-5.10.138-1.amd64.xpak 67522997 BLAKE2B 16679700f076e28ace3464
29 DIST gentoo-kernel-5.10.138-1.arm64.xpak 60960935 BLAKE2B f194c6e204b9efb8bf882681aed20519d3cef06dd91fc24d805fffa00e8508d0f39f244b10b896bf153a00b885e518fe766654f8d450ccd4f6d6715fcc12b210 SHA512 49dc2766fd8dbf7d77d93321e1ecffdae6217f95b7ba780de961fbb11030c16060e3a611cf85f7266e92b6bef7a55c96d22bc4460f2c441afa29809615311a35
30 DIST gentoo-kernel-5.10.138-1.ppc64le.xpak 56016873 BLAKE2B ccb39d42bbb9aab883ee9ed5c318d4ea1770ff969028a2e18b99bab07521309beff55c30b36eb189dcdc4259a5d8b9e083b37018481f501bef781ca0b080a818 SHA512 e148844d86e8a9bf9158c39067620226dfc5727acf7c8f21d7cd85b7c3b2123ec4d6ff727ce2c2890ef400b0b2fce0aedcb2dbe0b6fa5b140d6e2959a10a29ba
31 DIST gentoo-kernel-5.10.138-1.x86.xpak 57436076 BLAKE2B 0ad4e906020ee3086e0a4668bd623436bac3429f12be21fd148fbe4db4d47a34df04f802375ad5ae6776245b137c4e37eb4665985b55001957a2e07fb7370a97 SHA512 449ed2352f1cd7eaffcb90287a9c71a7789c714169ba4583ee6443b2bd848ef3ec4fa49f56c52c50cc137c2104e1bcb1ab4bc0ffaeccc285215fb36f29d0ae19
32 +DIST gentoo-kernel-5.10.140-1.amd64.xpak 67497255 BLAKE2B 3534d155dc7c6ca0d48027a223b786f17a681f0e3b190fe58585608fe80b00fdfe950a6e4f46c366cfb5e327b413a77adae0ac673d9b6529abd406916916e5d9 SHA512 a5dcc7ec109b92f5f6a1fc9e3ad7ac95056c6c4352fc97e227525ddcc6ca32c740069af14f13044b902e3fbca64bd4d7f2929c568419a6696b35cabb88cfe5fa
33 +DIST gentoo-kernel-5.10.140-1.arm64.xpak 60983920 BLAKE2B 7633539bdd48edbcd64e9c1b502809c218ef275b78c8872d9fce4e54ba55d136e1f180b2d72abe9a5eadfee1cbf84ddc582750d1265e5701d7affea9e4626bf8 SHA512 933992df82f049e175782826b9261d7f1b6b601d352d168b4adc0d7d4d02d5e49f99c24194c3927f3b7632e940049dbe432c2ae46df8a71256a5b5d8b9e76b87
34 +DIST gentoo-kernel-5.10.140-1.ppc64le.xpak 56010867 BLAKE2B 815b753f4f7640c1461763e8d0ca57797a73902b9c6ca1983ac4700b5c6f8f2154c5e3211f579e55d0cbdaaf371d3457fe061547d4bcdb3aa3dfdb07feca2c7c SHA512 f6978c38b27fdbc0592021edd664b9acd47c09d3dc0e1e150140cf8c94963b716b8460062a9d82a07537bbc9df07e46230f1a68a130afd1164c3dc64d6cbe88c
35 +DIST gentoo-kernel-5.10.140-1.x86.xpak 57434476 BLAKE2B c0f81fb4cf98c715373bdde36431515600e8bd52e7ab2499d268c88022091a16662ed8deb8513c2ae4346f843043f7f5750a720f599591c6e57da569add1f1f5 SHA512 a97aed96e990e07a5f357b17b6bddabea7b0382685216a88ff04f94314c91b93a9f12b81e9ab1863abef1e6cf361a4b65005ddc7907a8f3b6b7fb49b8aa43e9e
36 DIST gentoo-kernel-5.15.63-1.amd64.xpak 70784280 BLAKE2B 6f1c431dd478c0613b4a41ef477f7fdbef24bbc37ded6f515d29e599539088d043179261aedf9faabdaafffbb0b774fa77b7b9f0cb880d0d5e5c8ac3f40fcfda SHA512 04646181e0cc75fbbba8c5c90525cc955331834c371615b023312ca178a15eeaf47b4b4f5319b43f75946c3582db47002a0730fb5179ae4939d61103d3d3d588
37 DIST gentoo-kernel-5.15.63-1.arm64.xpak 64186381 BLAKE2B 09f288e2d2dcce3650b6f55ac185e7b0f5e8f61ef9ae8b103c26b3f34047ad4995c8a43fb937e0d4c5f85bdc08923774248f7a2deb0ae7173e57288f0e6db219 SHA512 b9d473bb67ff9546cfd4b86bbf558f96ad0fc72d810bce1c8e157ea5a6f83227f3aa6f4016d17576fb03b4aaaa38cfa63b37588d49554ba4edbf1d77127f2025
38 DIST gentoo-kernel-5.15.63-1.ppc64le.xpak 58094860 BLAKE2B 1b7e0f7435d8b99439d9a0da608d3721e60796d21ac8cddf7a2dda4970774c9a36148ca98bf06a027fc0ad027ecb1679db232bb343aba8556e77cc565c799d55 SHA512 368c6f13db28341fea141038587d528ae1e0e5cd0864bbda55ae82070082988e9c861ba7e36c947df81c0475616b8a896207953c536b687d9228b30011b74feb
39
40 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.140.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.140.ebuild
41 new file mode 100644
42 index 000000000000..da84e07f808e
43 --- /dev/null
44 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.140.ebuild
45 @@ -0,0 +1,135 @@
46 +# Copyright 2020-2022 Gentoo Authors
47 +# Distributed under the terms of the GNU General Public License v2
48 +
49 +EAPI=7
50 +
51 +inherit kernel-install toolchain-funcs
52 +
53 +MY_P=linux-${PV%.*}
54 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
55 +BINPKG=${P/-bin/}-1
56 +
57 +DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
58 +HOMEPAGE="https://www.kernel.org/"
59 +SRC_URI+="
60 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
61 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
62 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
63 + amd64? (
64 + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
65 + -> ${BINPKG}.amd64.xpak
66 + )
67 + arm64? (
68 + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
69 + -> ${BINPKG}.arm64.xpak
70 + )
71 + ppc64? (
72 + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
73 + -> ${BINPKG}.ppc64le.xpak
74 + )
75 + x86? (
76 + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
77 + -> ${BINPKG}.x86.xpak
78 + )
79 +"
80 +S=${WORKDIR}
81 +
82 +LICENSE="GPL-2"
83 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
84 +
85 +RDEPEND="
86 + !sys-kernel/gentoo-kernel:${SLOT}
87 +"
88 +PDEPEND="
89 + >=virtual/dist-kernel-${PV}
90 +"
91 +BDEPEND="
92 + sys-devel/bc
93 + sys-devel/flex
94 + virtual/libelf
95 + virtual/yacc
96 +"
97 +
98 +QA_PREBUILT='*'
99 +
100 +KV_LOCALVERSION='-gentoo-dist'
101 +KPV=${PV}${KV_LOCALVERSION}
102 +
103 +src_unpack() {
104 + default
105 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
106 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
107 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
108 + eend ${?} || die "Unpacking ${BINPKG} failed"
109 +}
110 +
111 +src_prepare() {
112 + local PATCHES=(
113 + # meh, genpatches have no directory
114 + "${WORKDIR}"/*.patch
115 + )
116 + cd "${MY_P}" || die
117 + default
118 +}
119 +
120 +src_configure() {
121 + # force ld.bfd if we can find it easily
122 + local LD="$(tc-getLD)"
123 + if type -P "${LD}.bfd" &>/dev/null; then
124 + LD+=.bfd
125 + fi
126 +
127 + tc-export_build_env
128 + local makeargs=(
129 + V=1
130 +
131 + HOSTCC="$(tc-getBUILD_CC)"
132 + HOSTCXX="$(tc-getBUILD_CXX)"
133 + HOSTCFLAGS="${BUILD_CFLAGS}"
134 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
135 +
136 + CROSS_COMPILE=${CHOST}-
137 + AS="$(tc-getAS)"
138 + CC="$(tc-getCC)"
139 + LD="${LD}"
140 + AR="$(tc-getAR)"
141 + NM="$(tc-getNM)"
142 + STRIP=":"
143 + OBJCOPY="$(tc-getOBJCOPY)"
144 + OBJDUMP="$(tc-getOBJDUMP)"
145 +
146 + # we need to pass it to override colliding Gentoo envvar
147 + ARCH="$(tc-arch-kernel)"
148 +
149 + O="${WORKDIR}"/modprep
150 + )
151 +
152 + mkdir modprep || die
153 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
154 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
155 +}
156 +
157 +src_test() {
158 + kernel-install_test "${KPV}" \
159 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
160 + "lib/modules/${KPV}"
161 +}
162 +
163 +src_install() {
164 + mv lib usr "${ED}"/ || die
165 +
166 + # FIXME: requires proper mount-boot
167 + if [[ -d boot/dtbs ]]; then
168 + mv boot "${ED}"/ || die
169 + fi
170 +
171 + # strip out-of-source build stuffs from modprep
172 + # and then copy built files
173 + find modprep -type f '(' \
174 + -name Makefile -o \
175 + -name '*.[ao]' -o \
176 + '(' -name '.*' -a -not -name '.config' ')' \
177 + ')' -delete || die
178 + rm modprep/source || die
179 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
180 +}