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, 12 May 2022 16:35:41
Message-Id: 1652373315.aee565526e3670cbb12745187eb79071fef6e20f.mgorny@gentoo
1 commit: aee565526e3670cbb12745187eb79071fef6e20f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 12 16:34:18 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu May 12 16:35:15 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee56552
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.17.7
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.7.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 a8eb9434918a..db99196fd946 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -22,6 +22,8 @@ DIST genpatches-5.15-43.base.tar.xz 1785824 BLAKE2B 435e3a48c6d8b01d71f203e7373c
21 DIST genpatches-5.15-43.extras.tar.xz 3932 BLAKE2B e6ad29d61c10175e8e31c91edbef3056922aeaa50583c64770fb1df714dd6764099b213a85c109d1057bec95aa5bd4485e8dcfce196ce7a6a0bbb682a7475965 SHA512 f85e4a409d4240bbb17ac3e3ca38afca1fa1a3ff8b31e9e2f7b4d5dfe6a255be38073f3e2dc02657bc309229281862d066851d4f57cf7213d8500c7efe64af8c
22 DIST genpatches-5.17-10.base.tar.xz 649500 BLAKE2B f92a3b4880da7a922694efc984e9dd711288decd2c3e20476036e59a09179b99250ce03a3471acc69d03d361ace416688280c5577ded2188575fdf731504b625 SHA512 b068dad762faf36618a06f245097b4f3752af2ac983afe73b673e7d34e39cf4cfd6c2a1afaef4178317c199731b522bb3037be01b737db9e6ba344551f7f9dd3
23 DIST genpatches-5.17-10.extras.tar.xz 3800 BLAKE2B 547c378d7326c7a3f5f8f748ea440e5f8d822e36fceb7966d9b8a2dd6370c645231c9b6b73f6a92d60324cd0fa1b523f7a3beb88701f4424c4d89abd669a054f SHA512 0290d3ca272624ed230ae5418cf31bc846a59cbb9c0657209f7f2de4af447265aeea58c08d2f0b4ab2f25624230eb4f64f82723f4019c903484fab141ba12b46
24 +DIST genpatches-5.17-11.base.tar.xz 684208 BLAKE2B 1c1f7a450a1f30d18f8e3eb7cb2db8b170f503a1b17343b25130408725f08c6ce0db7fe91eddb1b8d562bee0b6e60360baca4429aa09ffc1e7257b531ea6ed4e SHA512 5e0f2c89b93bd492c49d36627e6c6ded98e49f210e4c4880f84717e4248b711b5bce3d0db04ae78a29a01a47b3a2ae3ae5949cc02d755a22d63e6b7117477398
25 +DIST genpatches-5.17-11.extras.tar.xz 3932 BLAKE2B 8f65276ac101924b918379e84da046a8fc56ba293ebf5c9ace449917e58400ef8ed5cd947d9de558ed95735996eba42e01053c8e71f1a3782696e1ddccfe22fc SHA512 d7baa2bbcf982ede22dbc06dd1a452759c876357ee65750b21bf5a6b22939e5a924311c6e2315f222a65386ec028399d5c82eb0a1b8a215757bcaad1d83b001a
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 @@ -92,6 +94,10 @@ DIST gentoo-kernel-5.17.6-1.amd64.xpak 70380758 BLAKE2B e0f4891687bbf721a0151c01
30 DIST gentoo-kernel-5.17.6-1.arm64.xpak 65816361 BLAKE2B 3012c37bb1501a90deea2d890737880ceda17b6f7eb520f00d3702007ee710f33744e31453377a4295e4c6a4a78490822c2431801fba76d845c2c33a208836cb SHA512 3bea384878c64e55663694774f6586d5bc6fcdc3c92a59b0e8b25f1be7c763204ae7e74b633dc18b177790bdd0b0b29cb90ffb3ed20ab071d16b72875f194c3b
31 DIST gentoo-kernel-5.17.6-1.ppc64le.xpak 58876236 BLAKE2B 12f454420a90474aceedab0ffd46fb850652d7d61b4d850aaac74dd303bc2ddeba0bfdbc714393bc5cbd1dfed0d4eebc84dbf380a912cb04b7385c7652aa7131 SHA512 a4c255e3d34d0e0523413ec52dd820f406342f1c1521b7e0988436636cdd04ebdc2c9286db616b71a623dcdac6148409d99fd21fc62bc46bd5ac47d23750c8d8
32 DIST gentoo-kernel-5.17.6-1.x86.xpak 61094556 BLAKE2B 7d481593c002c0d9499a4f8a3c2d2ee328b144efc2ea3b6f8cee4af3133ab7b739574e9d2db88f18c7b142cedd4ae81a5cd7adeee851b9a0e34d65c5ee459f1a SHA512 61dc4be203dadad3f5107762ba7d80fcceb4c32831ffae57d413a830804020201963882c36e2867da83232cbd1ff88a971f2819ddc6e663f2eecab3e472088e0
33 +DIST gentoo-kernel-5.17.7-1.amd64.xpak 70401580 BLAKE2B 5d0f987d09eca6443c6f61b2b13c13391bcaedff22c2ac9450f038d1006d17b2334947a5116417487c301dd74e1a79163cda35ecc1152b2dcd8338d394862ea2 SHA512 7f0ba74fb311946de5d2a0bc8a398e12e43de69000e7e1683c8215f2be6d13152c9793da6a12b8232ec8071b0003205ee54b89a091ac34a72297259aa0ce7995
34 +DIST gentoo-kernel-5.17.7-1.arm64.xpak 65831397 BLAKE2B 9d243c0c8d3403c4e13fda747df7c73e1127a34090b11aa1d3a41459fea1cb1df4ec14f6e7a14a25aa6f13af4f1e93b816e5e62e4d54a21715940996e376c425 SHA512 ebb97a89d20d174f70498482c4fb362153bfe28369aa3acffb740d761e65ceae0d10b7c31ff0bae45334b855c18dab0d96412c183af5059635451afa97300a38
35 +DIST gentoo-kernel-5.17.7-1.ppc64le.xpak 58829967 BLAKE2B 8594dac1da94ebd7e631597358e8537fd853452fa116557ad96f072b693c54c31b16277d7cdc91a456217079f26e64f2b02236f0aea5268fef9bff685d198c2a SHA512 7b5dc8bbcd57bcce88cce96373361cab614c40878cc708992b3ce08395ddc2d29e884992179c158b5523c1185177dbc01f86ed5f64d6da78d4c9ddac4e0b7dd3
36 +DIST gentoo-kernel-5.17.7-1.x86.xpak 61092777 BLAKE2B c19d38f83ea510c390edfda9aef779d0bf9ce87c812e7bd509270f0e9a3ae9de64d802523709c9ba145aa14793d359874a7e4d0f9918e5d977f093c6a915ff2d SHA512 262c055ebee770cc85246dd338bbdd565491ecb588e259a854dc1bc2896f4e19755d108003146145a667d944e1c300236406e900a0948abf87f9a08da670219a
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.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.7.ebuild
42 new file mode 100644
43 index 000000000000..0787e9b25ee5
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.7.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 +}