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, 22 Jun 2022 20:01:24
Message-Id: 1655928072.b87ba73bb84a7e47c0f8563412eba70b05f3f590.mgorny@gentoo
1 commit: b87ba73bb84a7e47c0f8563412eba70b05f3f590
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 22 20:00:07 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 22 20:01:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87ba73b
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.124
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.124.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 672d0748efcf..55d614015fa2 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-132.base.tar.xz 3685068 BLAKE2B f46967d4a4fc013f6b7edb2e8ff427607a2521a53304bce80a371204f6a325ebb554db3a3e94178f1b6d4ee1bb71ddf254b7b991074378b080f0b2bdd01d9671 SHA512 1edf845da90e7c66d95d41d2d40141210cb7b9b786f29e5fc1c982d64d8b1a918f417364c6bc59f8b58ecfb8aa9b8e4df71e7752926ee68724a63b8c6213a14e
22 DIST genpatches-5.10-132.extras.tar.xz 3868 BLAKE2B 207e7a4bd474202ad112c450b49e8ef3ead28eadfd1e35916a7ed7d2439c9b435ca2a6ccbb56a6e761b59580751c85993d3ffb6ade8908b8f1993638ac8cfa20 SHA512 ffdf7573a027e5fae644ab22358bdcf74c7d023e28d3cbd08f01dfc02f6776956320cd1bf4e91568de64bb6eaa88682f393a257233b310133f35b2badb4bee46
23 +DIST genpatches-5.10-133.base.tar.xz 3705140 BLAKE2B ea0136c10a49158b3baff338a098c00729cce01d1ef0c1d08b7f2e225d3e10b4b039be9d5265b93d55e7069752d9c224797b4bfe1032ea10910a4e70b78c0121 SHA512 fd2e06fb495c020768d671925301e359008f1c51fa49fffbb1cf8dc23b5793ecd1b563d2729b312a9929ca8df9a5bfa2f3bcdc4e4a099d299f80f65de9055882
24 +DIST genpatches-5.10-133.extras.tar.xz 3868 BLAKE2B 30b7a0fc22202becd9b3517aff1f4ac797f6dd1437b108d5c694307641e158c68078514d7c2e32456162ee558659391092ee6e8e5cd0e7d620481563165605d0 SHA512 8e3ad4883726c772d2988ce9618c8fd1236760ca87c6645e1c7bab99fd540ae9cc1371a566bcfcb52bd816e3c21f5c83821b4e77831efe4f1b89eea63b3ff544
25 DIST genpatches-5.15-52.base.tar.xz 2177024 BLAKE2B 2fd4767dd3ae66cce6a179105389ce6e57ef0bf46f2ed5cb9a350d300472f813d22cdabbde4201acd6c76ca0c7701d09753351c12b4eea05fd1e93142ae4d526 SHA512 cc5fd2f260366f8b2715e09c4124d269b168bbacfd40ff36d6ab113419b30331ebd000adb01e5e6df4aff27487e528dc2f3e154b7df32d37e1f30f5c13e247be
26 DIST genpatches-5.15-52.extras.tar.xz 3932 BLAKE2B 8735d0c2d8e5e3a14f01893109e8feb179d6632e0dc3254b57d7545fb6280ca09bf9c2baaef7ec02bf337cb0f1a0d42f2e44dea2168cfa2c2ad20969b64a178c SHA512 c461a48096d46bacfc4a2d89060b6e72584d74b215b3ba5c969529bfb4330672c15b7e5f015492e5b1ef081942eea60342a7d413af3fe28f2fde730b41553ac8
27 DIST genpatches-5.18-8.base.tar.xz 440848 BLAKE2B 8a965867409cc340b13687eec9c7391bbaf26b770ba8d4b657b923226a539b7b68eabab6f12bae4bed09a0d198917373a6ab4f707831c652e2461a49f8dd4981 SHA512 057a00d62f4d8ba7be4ea26aeaa4bfbd5581b22ded85dae71aaa693621eda17532ac00bbeaaea1689f552ce2b95a04e9aade603f6236c2a265aa8fea8231c5d0
28 @@ -12,6 +14,10 @@ DIST gentoo-kernel-5.10.123-1.amd64.xpak 65756021 BLAKE2B 18bcff8a26baa8719d3e91
29 DIST gentoo-kernel-5.10.123-1.arm64.xpak 60973935 BLAKE2B 440f9bc1812b1ff465587c3ac5694ad488eb8ac55355d11fc2db78682439260a3ba3252292a5abc26134ec759a3c4898bf744276cc7f8ff369bffe63de5ac66a SHA512 ccf3141880e34b665ffc613b2281a618194a4f319c8b8485429e0189f369f0a2498ad55ccb0dfceb82e23f447b5f11b6a3a9a59c62dd38991d37325528fadfc3
30 DIST gentoo-kernel-5.10.123-1.ppc64le.xpak 56011478 BLAKE2B 5b7d540f05536e15f0efcc3af1a2fb774fb0f4beb68e1076c845337491b955692a83973bdc478f7862e34560f0eab63fc0865fa6014736af1436a4732b4f44df SHA512 f07f595ad0e65872121e2dba9c0da37b28db094e1d7904d5622a8dfa963e7593107261f40d5aed1d5dc1391595c9c44ef4931c78431b8e5d4593230793692bff
31 DIST gentoo-kernel-5.10.123-1.x86.xpak 57411988 BLAKE2B 7a62bf656271a2bde1e9eccfd10d0d4678096ca49c284e98b5d19e73308f65696c49b19a8a2b3894e78b1a53ed2a4fbec3e7aee67bec1f35a6cdf2f3d14b2ca8 SHA512 c89b77315f0c0a441633c1202ef972f74aeaa6da76552c16a4877fa5587e8855d4723e12efe6fc3ea5be11ea2aeabbcd19a0f99b023f470033dcdf20980dea88
32 +DIST gentoo-kernel-5.10.124-1.amd64.xpak 65750678 BLAKE2B 7c5aba8025747fb872d223ac5e988cde5e9e810c0dae2039f624e6a2612657713d5f66a4d52e8d946d237ab32a4cc3907d9a7e1bedd77aabe2fac612a0ae79b7 SHA512 afa24671a2c1393369ebb333367e8564ac0b0ee4a361fb7e498115d0255693e0ef985388e7eb856be8a2ffd5f4179e5c4a4c8ccd0c8b299d639b63ab0b1d099f
33 +DIST gentoo-kernel-5.10.124-1.arm64.xpak 60991795 BLAKE2B 9000d7ebfdf64ebfbc1619f547934c9c3d6fec43780b3445dd8c4302472617cc1e249c517a622eddb188fc583df60bc0422e81eb320cf2c866b83ff80e1a4740 SHA512 348291182f4c8a12f26e5a174f15d6ae68964aed66f4cbc2ea3e75c39ef9de577edaa406b603c9d10bb39231ed6fb3990246dc94f206d0c34157c03f5c11312c
34 +DIST gentoo-kernel-5.10.124-1.ppc64le.xpak 55962124 BLAKE2B 93a669e91bf71bf2ee1c9a857dbda561f372152e1c335146ba3438a29747f8686b99aebee32fb88cd44eafecebb3cdcea4d6881cb3a5228aa830a183995d7c5d SHA512 82afa602dd74fe82db24f0108b9f3d30f0ac06e981924fea577b25c013af58bf77443e22a8fde36f0ae9a57eccb08612e4ceb2f0a5355bebd40f9a055f710b2a
35 +DIST gentoo-kernel-5.10.124-1.x86.xpak 57414241 BLAKE2B 5f4e2a31eb347d4fe8755c3036671d46749ab664e4368ea8a4592ce675da5e8e6f89af69fb8d11cd329b8415ed386de772cfda3358e0e94758fc7f7cceb408b8 SHA512 5a3fdc49fce343fbb7a519a1c073d720cdef73c102f46a8d7218957ec4a1dadd8ad76bcdc86ac334d329ef3c55b7bc06d3b6c003cae403a8b3e806dd60ce11c0
36 DIST gentoo-kernel-5.15.48-1.amd64.xpak 69354442 BLAKE2B a95c782168eac06b73cbb26d34778a7f72a837addf9947f868356af45d0fe91e54cc17d44d23db03e226a04e4f890914ad03c29615d250b603bb54f21a703ae6 SHA512 6515bbe9b6191e9cebc11a7bf45c6d87110e26a3d142b1c74a559a88821fa5b9cafc8e948fc32b6d8f8c7f4cb9c1d618a7d72d811cb2565e043e810a1c90d981
37 DIST gentoo-kernel-5.15.48-1.arm64.xpak 64179857 BLAKE2B 776c33bf26548d64ef57a1e6519e03d7697fb3e36687c9d821f224398e87608ef6c19f03a45c5f73d2cffba03e7d5e698ba7b3bdf038a6a3da61d1253e81c946 SHA512 dfa64eebe6bc9ec9fe3dbda8903d4631c436ec6de5dcb549f320f439142f4b4e9a633b0be39ce3b5045bc9dbd44746e81fa9b60105d262c9d1f7aa6d09a959a9
38 DIST gentoo-kernel-5.15.48-1.ppc64le.xpak 58119260 BLAKE2B b651299e4c429a2c56ddeb4e5997c696ff78ee5b5197be7e86446615204d9f7450b695f11002d9424d2f3284ba11ca4113122d035e2bb28bb030f57b9d04faec SHA512 fc3b787f4dffe4174a7f033204e4c93fe03992ae33a9091736bc6c15fd3d7e828b1f6e57889b9c1bbaf3f7304ed8153ad6868d74267157dfa9172de007417785
39
40 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.124.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.124.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.124.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 +}