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, 18 Aug 2022 06:18:55
Message-Id: 1660803521.d4730cd304070cca15f8633ef12816268c776ee0.mgorny@gentoo
1 commit: d4730cd304070cca15f8633ef12816268c776ee0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 18 06:17:37 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 18 06:18:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4730cd3
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.61
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.61.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 56b57c4de8da..3c9e1fc4a399 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -6,6 +6,8 @@ DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f12
21 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
22 DIST genpatches-5.15-64.base.tar.xz 2531728 BLAKE2B 9e4501d9a9e423b50d1cea9265dceef035879be1f16b9745aa7bbac8370f7f79c4e6c36fc2f3971a7d766a00fe6bab585148433601ca0ed30b40ca4a9a870406 SHA512 70d7c3f805b0ce6a9cd8034f0fcf22db203621c7464c7eb158a0d7a01dfeafe313934119a639305d02da25afc1852aa29d16d9d0de3d0101bc3bc4a0af18e8e8
23 DIST genpatches-5.15-64.extras.tar.xz 3932 BLAKE2B 3d6407f9f8da0b68072b93f74e33255c8c33523f7101a2fb9ca5ec4156f6f8cedb558a6cecca2c46ca8775869a06805ab21962f2fd7d1e974ed1813f3c0fc59f SHA512 6dc7dee3aae37c5504857188fd6957ef85765ecaa5bc17f70e172af66e3ba9d005f27aabbe9171b848f17c9bff5acedb42f01389ae1b6866dca44a1b6611d4e0
24 +DIST genpatches-5.15-65.base.tar.xz 2795292 BLAKE2B 75100ab05b0b1a8fcd2df2176f6e8b28758cc518919de20f6be4f764a6351b589242a61d7229c05f1e1228338a74c16cc3c8523a0cc7cf991d9d03f6fcf543a7 SHA512 e87e718e39ecac03229d607cf7c869819af06445f86d63a3b5e478b2968d6e9811ceed189f146bf4b99d8fb21b3d9100e3a09a03bf270b521afc227f45792617
25 +DIST genpatches-5.15-65.extras.tar.xz 3932 BLAKE2B 5e530c404d10e8ce0a228377a18ad473b2bf17e68b4214d7de676ea872fbce439ef08e610dbe7a33ace4721dcb5b1bec1b0672e19bafe00d7b9a1812934f51b8 SHA512 0df7125b6bbe48790a2f9c3cda7f273dede01c2ff532fd494014435040f58839f07ec0f9c0ba9d4f21738fc969cc8e59c3d1cdc23238db6f2d5d1373bdb6cdda
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 @@ -32,6 +34,10 @@ DIST gentoo-kernel-5.15.60-1.amd64.xpak 70797308 BLAKE2B f1b03cdb40fad00add7e464
30 DIST gentoo-kernel-5.15.60-1.arm64.xpak 64204876 BLAKE2B c52b3857eaaec74d72798a975597e5eeabf85a87c5712ddab18437219970f4d5f69e2b2418f0cd725fb714e7b54c165e4a6e3a04fe22f590ef1e29b770d3f3a7 SHA512 98bbf7e5092afe5f4163488abfeab6804ffd89538e03bb62f26bb3d83c7ed843dc2068fd8e9535bc1418b6f412cfa2727b9218110e968b278fb4fbe4e018252b
31 DIST gentoo-kernel-5.15.60-1.ppc64le.xpak 58046287 BLAKE2B d559a1301f5fbfd181555577aa8920fe9b0f7b0dcf951772ce1f86e578a5c0807d4b6209c47517fd8594594831c0ab48ae72909d4f7505db4a61b51c5dd0a615 SHA512 b6eabf9bb15678afc165e9ffc74c96b5e16a9cfdeabf62eb3e868c49f7c7eec3d44e889be0223c0bab57853978e0146ca7c52c53fd01236e755bd46c42e8f456
32 DIST gentoo-kernel-5.15.60-1.x86.xpak 60117817 BLAKE2B f74cd729b8d1378c6c7d431054632400089e1e86ff67d1f3080dcd509069e63fe3e6b0d60d49729774336a128e78a92972cdb4defa50f3a7101f0770d772689f SHA512 b052e220de708d7822a06015ee4f0d5582fdd87f889a21468d555a8fe900ba4b940fc8513bcc6265b336fe93b8f9f54031ceb02a49e42301510879170dc0f5ff
33 +DIST gentoo-kernel-5.15.61-1.amd64.xpak 70781040 BLAKE2B 79e44041b813c5d2948a047a2a26a9c017eeae0b4b30e23f3a8e0bb300f2a0867b11c9d9fa58aa8bae7fb265f279fdf366fe3ae9d0640d1c06da84ee016c8772 SHA512 ebef22e230363fdb7efe4ffd1a85d690120858f7bdb8900d969feab9478acd8ab5837b62c32b084cfebc59a7be0ebe5f3a749c47cd8d904e8345832de247c16b
34 +DIST gentoo-kernel-5.15.61-1.arm64.xpak 64236098 BLAKE2B 25e8c8f506f3024799696d5ae8b6f3d97e0ada5f65b2f244d3a922d7348a528e3dc5b0eab4ba3cbe31c3582cff53744c4d8b9fac23d54d8a1d309cca26d3dffe SHA512 6dea290820795046efbfaba31aab34cc377a471324a367f815e964807a6f7706e087eaafecdbb7640580c113a2b3fd949c90a79a832569e137d9a079ce17bd92
35 +DIST gentoo-kernel-5.15.61-1.ppc64le.xpak 58209981 BLAKE2B 2bda57f94365e8cc3a9bbd203b08fbecdbf161470929e861597818f2b6da043a35aee74ce000a736feb14cd948d00a43ae95d1558cdd31bc4781d737be4319c5 SHA512 78ea818b3e8e1a1307e6b647f8aed280fdcff993198f18f1ab840d1b32b40f20dd5bd23ad16a61e2dc12aef6a0d7c34e7b52a6b0b6fc3928ec8fdfe615e0b117
36 +DIST gentoo-kernel-5.15.61-1.x86.xpak 60124404 BLAKE2B 2c14ee86470f98aac1d4d8bbedf875b4ad055b2bf29ef5107fbe478a7e2d942e012e95d6fcf32b5682d408a3fa97e6a90871f2f097c0c76fc075ed2ebe8d243c SHA512 618a30251a4c5ddd5429348c12e30509e7c63f1b16427b834d3d05659d9154e96d5d7f3a587a201e80b91e4a8e3266bb144edb3bf68602cfa4b3828a7d9456a3
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.61.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.61.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.61.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 +}