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: Mon, 09 May 2022 15:01:38
Message-Id: 1652108482.cb61fc05f12fd8808e75eeb015ecf527514007ea.mgorny@gentoo
1 commit: cb61fc05f12fd8808e75eeb015ecf527514007ea
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 9 14:59:29 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 9 15:01:22 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb61fc05
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.17.6
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.17.6.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 e9ac63e1aadd..2283424b7e26 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -16,6 +16,8 @@ DIST genpatches-5.15-41.base.tar.xz 1716640 BLAKE2B d2a37f5bdbb541bad670240ee6fb
21 DIST genpatches-5.15-41.extras.tar.xz 3868 BLAKE2B 11487f062c49431af029fadde1f01a95386d42e1349a658bca314bd26d356eb82d0292ca68ac34d4ba4593a25d7422458a7dcf306431dbe46e68c9306bd8ec82 SHA512 3153848739687683f02c65d1dc87b4aa27d0fead27ac9fee28acd2f8d0fdc118473445059bf756650512c5f3fa79b8a4a70882c2ab2d4329c4d7aef982e5e4d6
22 DIST genpatches-5.15-42.base.tar.xz 1756168 BLAKE2B 953621740d74dd84876e46a3ce9781cd5df8f7ab37588e386045196af57d8d000b120b810b762ecb9d52729e63433c0dcd8b8fc2d938fed05c33705bca907227 SHA512 4f45522c7dc0e5c1b9289cb09199f640c2bc124fb306ac64e9de1da56de123b118445648dafa7d3170e1c8a2607b6ab1d34dbde4a3c1cf1ff7d21d932a9672ea
23 DIST genpatches-5.15-42.extras.tar.xz 3868 BLAKE2B ec9eecf22597ad8217a9fde77067bdfc3e7e8bf5bd502ca71750193d8353b51e6371b7323b66afa8dbed6a177e2d165a2eb2eca0e06d2943b474ab74a5256834 SHA512 71155d6b1130fee0484b0171f72d2f627b65cad8a02d5047de9d180ed01c2002958020961c925b4c0b6a415ecc2cdc481c4820dc1f9f8a8443713a6a21c3a022
24 +DIST genpatches-5.17-10.base.tar.xz 649500 BLAKE2B f92a3b4880da7a922694efc984e9dd711288decd2c3e20476036e59a09179b99250ce03a3471acc69d03d361ace416688280c5577ded2188575fdf731504b625 SHA512 b068dad762faf36618a06f245097b4f3752af2ac983afe73b673e7d34e39cf4cfd6c2a1afaef4178317c199731b522bb3037be01b737db9e6ba344551f7f9dd3
25 +DIST genpatches-5.17-10.extras.tar.xz 3800 BLAKE2B 547c378d7326c7a3f5f8f748ea440e5f8d822e36fceb7966d9b8a2dd6370c645231c9b6b73f6a92d60324cd0fa1b523f7a3beb88701f4424c4d89abd669a054f SHA512 0290d3ca272624ed230ae5418cf31bc846a59cbb9c0657209f7f2de4af447265aeea58c08d2f0b4ab2f25624230eb4f64f82723f4019c903484fab141ba12b46
26 DIST genpatches-5.17-8.base.tar.xz 558192 BLAKE2B 8135b5dbc28154d346f1e24d915e1d80098764186a28638a147d3f840c431c7a44b00f80166d1acbf4181ce295c2655be4b7939919158ff2fd65174bba7bdd7d SHA512 3577093fa8b8961fdee9e52e67c0681055f26db4e5861ddeba8146cab3e63a1ca97287114feb79deb8a82518d7915cd213af01c18735207bdb705985f276dd5f
27 DIST genpatches-5.17-8.extras.tar.xz 3796 BLAKE2B 149f398df8860fae67cea4431affaf4a8ef5bfbe570434e5c7878c3bc1f8fdf8a56fb069ec79bc1fa65a5e0189a302162a1cc44865739e52a1af6db74cfb86b4 SHA512 14a850ca0481eb66da3419841b5c80b25bd00da30454b3101990399bd9f8551682ea82006b3a223fe91ca2c977a45aba983914943d375ae4c73904a2f5a318c2
28 DIST genpatches-5.17-9.base.tar.xz 594204 BLAKE2B 56e2423bb67d9e0fca4d065fb3ff02fa68ba3ef62769f14f7add89cbe8f637dcf3fb3acf7442369204588419989a4111d0fc0b245638f692495b51d3d769e73f SHA512 0cc46ba8854b2a0f949a827e67edbe4d941eafd76ae86ffdeb485d5800ad40c560a3130ca9f050336762157dc61bca22d39b82f3d769a3b434a32f028ebf4b21
29 @@ -72,6 +74,10 @@ DIST gentoo-kernel-5.17.5-1.amd64.xpak 70381462 BLAKE2B 5963b55a72c6ee2e8976e468
30 DIST gentoo-kernel-5.17.5-1.arm64.xpak 65821091 BLAKE2B f6bb361e3e5f846f35e10056010e7f047e6fab99dff6d642b542f42bcd83381d6843b813506edaadb910532bc312deb26826f4bd81c403f197948d44b753bc68 SHA512 0c048a346e9557fda8bee450d38a564c6b5d4c467542dd02b9a5e75ed848ca24a6e16cad0c6607ad40b5c58519274f526ba1b814d72a42628df254ab3089c528
31 DIST gentoo-kernel-5.17.5-1.ppc64le.xpak 58867203 BLAKE2B ebc8acc29a2497aedebdf2a4f634aac307ee6cc5080c41eda4c589e5730b1138ed311f132f41360160b60ac1704f530b93accc1039100b9166ebaf469eb17b4e SHA512 e8df98c61f510cf743ae31cd32a3f15e2cc748aeebee82ec2ca3fe31239a4d56857e320b110ab82011d20a1cabcd926b2c4f00b6e973600f3958fb821a127374
32 DIST gentoo-kernel-5.17.5-1.x86.xpak 61096137 BLAKE2B 8991e94efe7efb88569d3b2f7c693b8275a355a5537f70e513113d28f79ff87c576e9908f678713b7bca0e6adcdd7d6e6a8c910d4b3851c0763d578662c2ac97 SHA512 e1b7a4b485ab52de3c2e898864361353177d584bb7e141c08fae6c1daf0c5d667778f8dcd247e3a2ef5c2c67bd5b2518bd89e392e0f9e35abf0acdf38af78ce9
33 +DIST gentoo-kernel-5.17.6-1.amd64.xpak 70380758 BLAKE2B e0f4891687bbf721a0151c01f1db6d5f00bae783b61f7e3ae47c7f1c7b48aa396658d549f9dc36ab9d991e7e5b2827bfcc909d22c691bdf8c98874285bfc0352 SHA512 5ebf7257a88556b11ec62826951c1dc208fce3c0e93ee012af841133f3e4f52ad6830a8bfd14b5f27bbf240e3ff3a0e3703b7f9882983bcbd5623e8f3a0805bc
34 +DIST gentoo-kernel-5.17.6-1.arm64.xpak 65816361 BLAKE2B 3012c37bb1501a90deea2d890737880ceda17b6f7eb520f00d3702007ee710f33744e31453377a4295e4c6a4a78490822c2431801fba76d845c2c33a208836cb SHA512 3bea384878c64e55663694774f6586d5bc6fcdc3c92a59b0e8b25f1be7c763204ae7e74b633dc18b177790bdd0b0b29cb90ffb3ed20ab071d16b72875f194c3b
35 +DIST gentoo-kernel-5.17.6-1.ppc64le.xpak 58876236 BLAKE2B 12f454420a90474aceedab0ffd46fb850652d7d61b4d850aaac74dd303bc2ddeba0bfdbc714393bc5cbd1dfed0d4eebc84dbf380a912cb04b7385c7652aa7131 SHA512 a4c255e3d34d0e0523413ec52dd820f406342f1c1521b7e0988436636cdd04ebdc2c9286db616b71a623dcdac6148409d99fd21fc62bc46bd5ac47d23750c8d8
36 +DIST gentoo-kernel-5.17.6-1.x86.xpak 61094556 BLAKE2B 7d481593c002c0d9499a4f8a3c2d2ee328b144efc2ea3b6f8cee4af3133ab7b739574e9d2db88f18c7b142cedd4ae81a5cd7adeee851b9a0e34d65c5ee459f1a SHA512 61dc4be203dadad3f5107762ba7d80fcceb4c32831ffae57d413a830804020201963882c36e2867da83232cbd1ff88a971f2819ddc6e663f2eecab3e472088e0
37 DIST gentoo-kernel-5.4.188-1.amd64.xpak 61601422 BLAKE2B 99c6cdc76e5dc2d778ae57fa4a09f06eb35208f167ec93028c52d72fc61d8b3c672c082210790646fad3c0e752964a05319e2fdb24c92cbafc9017c336caf920 SHA512 3ef221e440b9d5a1f7bf6bb4d58bd4dfa021d20dc230accb16207c27007e8e51aad73e36306f3161bde740a228c66b9d3133bff07d3b9e05421577bde30e8a75
38 DIST gentoo-kernel-5.4.188-1.arm64.xpak 57741944 BLAKE2B 95b3a954db55df7c00fe0bab94b82e98237f39bfa54df697d94de151ee66ab6107b0f0fa9c954d785b69b801ed589a53da5d0f8777873df3e7e6a1bd89867843 SHA512 4a293801db3ab0cb18f51067d23d5f59aa50996362410a5ccf510573e17b6d611bb328c11e0f91bb47a66c0b773d79000dff91cb76faefd517e410967eae6ff9
39 DIST gentoo-kernel-5.4.188-1.ppc64le.xpak 54984206 BLAKE2B 51d1b01bf56ee1491cffc11910e5bef1af473d129e640a071e73a44c490a703d509e5d9343d207953e5deaa89e9831490a4edcc7bfff30b69f37a875d3931ce7 SHA512 beaa920f5b6acd7e58b980e9677b980b2daf0413938bedb6b30efdc5652c5154dbe12af57fbd21660466e76063ceaf98012799400ef163086545500d79753dc7
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.6.ebuild
42 new file mode 100644
43 index 000000000000..457d69d62ddc
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.6.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 genpatches"
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 +}