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: Thu, 25 Aug 2022 15:30:55
Message-Id: 1661441435.355221bf1fc4c8ed1b7c17eae3ed20d1825b4bf5.mgorny@gentoo
1 commit: 355221bf1fc4c8ed1b7c17eae3ed20d1825b4bf5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 25 15:27:44 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 25 15:30:35 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=355221bf
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.63
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.15.63.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 7aced247538f..3c97a88958a4 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -14,6 +14,8 @@ DIST genpatches-5.15-65.base.tar.xz 2795292 BLAKE2B 75100ab05b0b1a8fcd2df2176f6e
21 DIST genpatches-5.15-65.extras.tar.xz 3932 BLAKE2B 5e530c404d10e8ce0a228377a18ad473b2bf17e68b4214d7de676ea872fbce439ef08e610dbe7a33ace4721dcb5b1bec1b0672e19bafe00d7b9a1812934f51b8 SHA512 0df7125b6bbe48790a2f9c3cda7f273dede01c2ff532fd494014435040f58839f07ec0f9c0ba9d4f21738fc969cc8e59c3d1cdc23238db6f2d5d1373bdb6cdda
22 DIST genpatches-5.15-66.base.tar.xz 2799948 BLAKE2B 971d8676d351bd8203076bf9f325b60142d7576e3a9373bca9ed1f4960604a0b9275da0707862365c194bd5fe7370aaf3b73a876185d88ae8d2c52f79f2c5fc6 SHA512 3dcb3909e8921f845cae61a61485b69941560e603f4067564e1cfef684dfdb0d963b511a4e5d120b67fee659d1beb9eeb1f6ca5ac08b39544bd7239d9e407f8f
23 DIST genpatches-5.15-66.extras.tar.xz 3932 BLAKE2B c8b7c822a3c1ecb3080ed90f0b137091ab8f8dbc0077cbc7cca6cd29a3a21ebfbefdc927bc46bee4fb75312e04047d62ecd437e971dd1b66033082b81c9519cb SHA512 0616ca7294543ad4fba7cc6e5722181cb6822f1fddbb82b45ed53633cbc50e7795beb78ab675d81479c2ef984d6497070451a15acc6d41c2f4c5c5eb96ba49d1
24 +DIST genpatches-5.15-67.base.tar.xz 2856328 BLAKE2B a92c3afb5e0a6605587744c68b3bec4c63848e0c09469d99080258d97d3e96a0adae175600d7dbb00e566f4383ab00c6981585acf343111218aa21e503901f7d SHA512 3d100c04ce9e440177ff2156b8ce0c0443414963a47fc1c51a86a08cce998ad0b6289e70455ecd2965009226036486c1b6ee3768b1782aaad976cd144f9b48cb
25 +DIST genpatches-5.15-67.extras.tar.xz 3936 BLAKE2B 168a92a9db40e6014864a96aff71fb87b351d7127c5eedc8e062e753ae65d7ebc628e9b0eded328f17e88562592d80522ccdd31a549c8104aee51e2833f81134 SHA512 0f2bdfa87ec2a610870089c903b301dc86dac52f4969386074a439be90674c4835800cf9250d8844b1ec3df88cc8dc0b31e4582ea309b7c817066a1341c692b2
26 DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
27 DIST genpatches-5.18-20.extras.tar.xz 3924 BLAKE2B ddea420397d5b64ac5e964db6b2d863cca0a4fd46a3969af7f24b7803b0f07278b54363c1b43fbc4f305ac4b44e5880d5af0bb10cd2a0a08bc0e4fbd51c9e35e SHA512 51203e404cc8084974725f78dd521f5d7864f40380bc1f45596b8754a57f30535e32c3984c01a4d12b38b6118eb1448126f96042d8a2b5007167428e09761726
28 DIST genpatches-5.18-21.base.tar.xz 786248 BLAKE2B 60d007f0ad81b8c8af63789f98613850edc92836672a743bf543c2e7078b666a41f4f277d5b9f001a018811733f266d87651198e3c087c00f8bc8239b2b89236 SHA512 0018fdc5805dff2f92b0f3c2e78e0a30359eb5a02b8b24cc4ced7c42d90e6fa904e8b43982ffdf9bc5c55b9faed1c003bfd6510f3f9c8042180884aa3a87ba2b
29 @@ -64,6 +66,10 @@ DIST gentoo-kernel-5.15.62-1.amd64.xpak 70877540 BLAKE2B 07eed0f434a1534926b003d
30 DIST gentoo-kernel-5.15.62-1.arm64.xpak 64210797 BLAKE2B 2a4056032c773762600ad568afc55cc6347e751589e56e08f9d8e0e9ca7ddab69d5de516759e9285758b36ab307c6f1eb1f5db20ebebc8d93f4734649ebdc86f SHA512 f8134d2e9e55505619504dcc2c69cec78605a79c1508cdbabb7302eccf0f53fbdaef2453386a689897139c9b55fff5bdf260494efd47393eac64388976534098
31 DIST gentoo-kernel-5.15.62-1.ppc64le.xpak 58143030 BLAKE2B fd7a4331bd748b28beabbb7c9247b07c90b097ac18a86e59b7c1a5ee574d8d274bc3e957764a2fcc2aee5b79dbbaa47dc5731887ef3f213d80c581bf5a6adbb9 SHA512 9117e35d2a154f5a82086c8ff8fb518206cd8c8e183bbbecbc772782afd10d6d8446e9202b6c7c65c1b28a0ff797c0cc84556ead15ba704d479da754032e0838
32 DIST gentoo-kernel-5.15.62-1.x86.xpak 60197174 BLAKE2B 7144f80e4bb532025d835e5c2fdf103426da265b65f39b1f9220fbf133fd2e3cb06eb0ea345e54e5fc674f95df3e0d8b845eecf9e130d20fb9833fb5fb14e285 SHA512 2c670c59a4487fc460f0b4b72bb765ff37f30c92048cf3145d229c3878e7d3030f9785e5300bb7664e65cef28bd33531486c1396fa64e0e1db089c78af745326
33 +DIST gentoo-kernel-5.15.63-1.amd64.xpak 70784280 BLAKE2B 6f1c431dd478c0613b4a41ef477f7fdbef24bbc37ded6f515d29e599539088d043179261aedf9faabdaafffbb0b774fa77b7b9f0cb880d0d5e5c8ac3f40fcfda SHA512 04646181e0cc75fbbba8c5c90525cc955331834c371615b023312ca178a15eeaf47b4b4f5319b43f75946c3582db47002a0730fb5179ae4939d61103d3d3d588
34 +DIST gentoo-kernel-5.15.63-1.arm64.xpak 64186381 BLAKE2B 09f288e2d2dcce3650b6f55ac185e7b0f5e8f61ef9ae8b103c26b3f34047ad4995c8a43fb937e0d4c5f85bdc08923774248f7a2deb0ae7173e57288f0e6db219 SHA512 b9d473bb67ff9546cfd4b86bbf558f96ad0fc72d810bce1c8e157ea5a6f83227f3aa6f4016d17576fb03b4aaaa38cfa63b37588d49554ba4edbf1d77127f2025
35 +DIST gentoo-kernel-5.15.63-1.ppc64le.xpak 58094860 BLAKE2B 1b7e0f7435d8b99439d9a0da608d3721e60796d21ac8cddf7a2dda4970774c9a36148ca98bf06a027fc0ad027ecb1679db232bb343aba8556e77cc565c799d55 SHA512 368c6f13db28341fea141038587d528ae1e0e5cd0864bbda55ae82070082988e9c861ba7e36c947df81c0475616b8a896207953c536b687d9228b30011b74feb
36 +DIST gentoo-kernel-5.15.63-1.x86.xpak 60131207 BLAKE2B bb3f0fcdb48e20214ddeda84fd57a1f753249e79b2581e8f44914c05736eea3638eb573e43090a99303882d8c5d034bfd17d0f287fbee836a290859a8036508b SHA512 17ed092f7f1706ed69a10a850c6f964ffb1c49a36d45c21dc36eea529ef6d6c619d334c1a55e5906c48e951b5b592d9e4f5b205456bf881fdc51fd448fecb745
37 DIST gentoo-kernel-5.18.16-1.amd64.xpak 72884888 BLAKE2B 1af89a98a01ac244b4b49f669f739a5040d35e1357c41e6477159a7bb538b8b4ed844a28d512bf1513e2234c20cad663555ef028b2d5378b364eca95d3cbbc47 SHA512 b654a185147259c5100a1ea162c9f945190e472014edeae6704ece63e9486b95c9dfa31e955f9576611d461095f2e309b58c1abc9ecb0dafa5bc1fe92ea0654f
38 DIST gentoo-kernel-5.18.16-1.arm64.xpak 65231934 BLAKE2B 0ca27c34a9dcde9ec1bec606ba86489f780e31e3b4357135d10292db04028cd346246d71e10a7c09103bad99a4fa7a2a19610e94890af06baf617ff52bc973b3 SHA512 c75d1c72db2f74d52ced1c46caa12cf25c81834aeed42a038dc049a54aa4f9e45ca51a419f55e021a065159f81c3e8303d5e03967dbed7de2102bd7ca68b3d2e
39 DIST gentoo-kernel-5.18.16-1.ppc64le.xpak 59491902 BLAKE2B 805bcb11a93fcdd8fa7e264025c662f46e555aa640838c25578084a3995dbfab2292e7056d5c52352a0060a8114a3d4ae8068f6f3896b46e61c563a6080053fd SHA512 83b37cb57fea22468398a40a04d222dfa2f784e2819bc5e4850d7223b78a72ce41cc2ff6f66f6e7d2fd495c1e7555a287bc143417d28271de0904f50cc22901f
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.63.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.63.ebuild
42 new file mode 100644
43 index 000000000000..0787e9b25ee5
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.63.ebuild
46 @@ -0,0 +1,135 @@
47 +# Copyright 2020-2022 Gentoo Authors
48 +# Distributed under the terms of the GNU General Public License v2
49 +
50 +EAPI=7
51 +
52 +inherit kernel-install toolchain-funcs
53 +
54 +MY_P=linux-${PV%.*}
55 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
56 +BINPKG=${P/-bin/}-1
57 +
58 +DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
59 +HOMEPAGE="https://www.kernel.org/"
60 +SRC_URI+="
61 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
62 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
63 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
64 + amd64? (
65 + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
66 + -> ${BINPKG}.amd64.xpak
67 + )
68 + arm64? (
69 + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
70 + -> ${BINPKG}.arm64.xpak
71 + )
72 + ppc64? (
73 + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
74 + -> ${BINPKG}.ppc64le.xpak
75 + )
76 + x86? (
77 + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
78 + -> ${BINPKG}.x86.xpak
79 + )
80 +"
81 +S=${WORKDIR}
82 +
83 +LICENSE="GPL-2"
84 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
85 +
86 +RDEPEND="
87 + !sys-kernel/gentoo-kernel:${SLOT}
88 +"
89 +PDEPEND="
90 + >=virtual/dist-kernel-${PV}
91 +"
92 +BDEPEND="
93 + sys-devel/bc
94 + sys-devel/flex
95 + virtual/libelf
96 + virtual/yacc
97 +"
98 +
99 +QA_PREBUILT='*'
100 +
101 +KV_LOCALVERSION='-gentoo-dist'
102 +KPV=${PV}${KV_LOCALVERSION}
103 +
104 +src_unpack() {
105 + default
106 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
107 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
108 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
109 + eend ${?} || die "Unpacking ${BINPKG} failed"
110 +}
111 +
112 +src_prepare() {
113 + local PATCHES=(
114 + # meh, genpatches have no directory
115 + "${WORKDIR}"/*.patch
116 + )
117 + cd "${MY_P}" || die
118 + default
119 +}
120 +
121 +src_configure() {
122 + # force ld.bfd if we can find it easily
123 + local LD="$(tc-getLD)"
124 + if type -P "${LD}.bfd" &>/dev/null; then
125 + LD+=.bfd
126 + fi
127 +
128 + tc-export_build_env
129 + local makeargs=(
130 + V=1
131 +
132 + HOSTCC="$(tc-getBUILD_CC)"
133 + HOSTCXX="$(tc-getBUILD_CXX)"
134 + HOSTCFLAGS="${BUILD_CFLAGS}"
135 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
136 +
137 + CROSS_COMPILE=${CHOST}-
138 + AS="$(tc-getAS)"
139 + CC="$(tc-getCC)"
140 + LD="${LD}"
141 + AR="$(tc-getAR)"
142 + NM="$(tc-getNM)"
143 + STRIP=":"
144 + OBJCOPY="$(tc-getOBJCOPY)"
145 + OBJDUMP="$(tc-getOBJDUMP)"
146 +
147 + # we need to pass it to override colliding Gentoo envvar
148 + ARCH="$(tc-arch-kernel)"
149 +
150 + O="${WORKDIR}"/modprep
151 + )
152 +
153 + mkdir modprep || die
154 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
155 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
156 +}
157 +
158 +src_test() {
159 + kernel-install_test "${KPV}" \
160 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
161 + "lib/modules/${KPV}"
162 +}
163 +
164 +src_install() {
165 + mv lib usr "${ED}"/ || die
166 +
167 + # FIXME: requires proper mount-boot
168 + if [[ -d boot/dtbs ]]; then
169 + mv boot "${ED}"/ || die
170 + fi
171 +
172 + # strip out-of-source build stuffs from modprep
173 + # and then copy built files
174 + find modprep -type f '(' \
175 + -name Makefile -o \
176 + -name '*.[ao]' -o \
177 + '(' -name '.*' -a -not -name '.config' ')' \
178 + ')' -delete || die
179 + rm modprep/source || die
180 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
181 +}