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: Sun, 01 May 2022 19:23:03
Message-Id: 1651432948.d394458b34dbbd4afa879ba7bb1cd4ac6806ebdf.mgorny@gentoo
1 commit: d394458b34dbbd4afa879ba7bb1cd4ac6806ebdf
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 19:22:06 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 19:22:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d394458b
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.37
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.37.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 89b26bea4e17..aa78bf7e1a57 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -10,6 +10,8 @@ DIST genpatches-5.15-39.base.tar.xz 1659952 BLAKE2B f40154102f23ab2b7774a998c756
21 DIST genpatches-5.15-39.extras.tar.xz 3868 BLAKE2B 155eed40c9018ae6629513a2db645f535c3917422cb5b48acc7b93a565a1de5916d81182db5beb8975478f317388ab81afc74d77abf73bf071df7e474abeaddf SHA512 bbb69afead295c9eb059fab679599950f3ae71741a8a6695241e00969259f99a1f51eb859497d1beb73813adb9693c19d21025daca529b17a962fbbb7bfc88a4
22 DIST genpatches-5.15-40.base.tar.xz 1691504 BLAKE2B 167dac62ff702ca7c72e5bd12afaa4c9e0fde9b07f1feb8d7450752d77677749013ced38b850ade4318d2063044eaaee8abf2bfd69d42c60b7c26739732d3828 SHA512 3c58f992406e559a7d6ea8bb7c4bf5487588a0ecc68cf56d6a0727f31a1f03712637932b2c189e05f77a8faf312af5fbcd11570ca80c8550e766e51057b04ce3
23 DIST genpatches-5.15-40.extras.tar.xz 3868 BLAKE2B 220c0f4eddf1c94cc1ffa86c8552fdad587b8cbce3275daca39e1e27d9aff1335fd714a4f618670f9fc1567c57211fe737a7e9ad43850dc15d3f35912bd7b781 SHA512 c0b8e136ec05007e3d90c185d14ecfe104558013e940d954243605d55768ef97605d7992596483f8614f4e800a95b191bd845644ae3e5a2379b4f74ed106a6a1
24 +DIST genpatches-5.15-41.base.tar.xz 1716640 BLAKE2B d2a37f5bdbb541bad670240ee6fbbe9bbf87d9041e86ff6683c92ba2566b2dc9dafbad7e254146f8ecb23e3ba32e0c0d6f2e5955ea4ea6bbdff4d7b8b74f1e66 SHA512 b9a3557fd641adad0fe875382082a8cb44f7b879d19acc57fefdfe78cc66f8d3d2ec7ca7fcdd125edb56a4915f63922ed2f7e3ff006017bbf6318a6eb0f06ea4
25 +DIST genpatches-5.15-41.extras.tar.xz 3868 BLAKE2B 11487f062c49431af029fadde1f01a95386d42e1349a658bca314bd26d356eb82d0292ca68ac34d4ba4593a25d7422458a7dcf306431dbe46e68c9306bd8ec82 SHA512 3153848739687683f02c65d1dc87b4aa27d0fead27ac9fee28acd2f8d0fdc118473445059bf756650512c5f3fa79b8a4a70882c2ab2d4329c4d7aef982e5e4d6
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 @@ -44,6 +46,10 @@ DIST gentoo-kernel-5.15.36-1.amd64.xpak 69325167 BLAKE2B 1c69ce6bd3c39dc17110e7e
30 DIST gentoo-kernel-5.15.36-1.arm64.xpak 64218106 BLAKE2B 70fdaae3a33d53f48542709115527fa056b7be94e6e30e06bfc2a20775c750a0b6e5afabcb8d9de84509add297411d102c55587f63f1ea36da82666651edcc0a SHA512 b1067b02a7363616f85326cb2387da065bb16b0ec606725e4b8152a9851bfe369972fd60c8a57b0e4e34978112b650fe132b6ac935a5a5e2a8a82a5bef0c8693
31 DIST gentoo-kernel-5.15.36-1.ppc64le.xpak 58001576 BLAKE2B 37cd7acbc89c8cf28cc2b81925436f221194d8aeaa9e70041504a8528fed429149b7c5bb060178db7f5a4a3fac989b373f989208ac5e94e21f09a7bd3048f621 SHA512 79d749bb6d2ac363b2a5e7d72d0292ceb80a260c6499cffd6b992243e770502c55bc0364566f116cbb62c33b52e44bc8a2d4969f0f6c887ce99b1a6193da4902
32 DIST gentoo-kernel-5.15.36-1.x86.xpak 60032140 BLAKE2B 153cb8db42a1b5fe32ab3524c1c78a023216078698b86df0bf03e62ffca3800da3a925edac4ad3d10870e916b920bd2e8f9539f6c60206b4369fe4cb83117ba5 SHA512 5d11c04267a8ecf14a329f95c8e53a3ca9e9e66f7d54aa72cc7762ea361e4a321f6879c53e1cdb4264389d6dab7e501cb29db6c7dc777f8a125e7a43b96537b4
33 +DIST gentoo-kernel-5.15.37-1.amd64.xpak 69301827 BLAKE2B c329019b0ac8a4d9630863931149d7a68388fa0292ff4a6ad774edd59db0f404e5b4fa20ff6142ed18a12843e81a1d3be1ba3be8b5c7cc5594f6d4c9594ff992 SHA512 56f7bdbf71ee84c3ee937b6b6d5e1f2dcb8d38329f33deb9c57663e7853d7a0d27c97c67a3a32355cc640925a980fd442fcf59e3268c7e5ce98e401e698ad42c
34 +DIST gentoo-kernel-5.15.37-1.arm64.xpak 64205021 BLAKE2B 8f2e9392108ffbd9e792901b0c038af2cd538fac50de145b065d0623664980b811b0f52918c1fc6188cd5e00c26d19fa68a1ae8a12f0ecb2aba475f61862ac08 SHA512 d7dcbcee057a5f482e1b7f8894b5ee822464c507c5445b4d55a49224f4119b9c7b66d9a065b934fc5ce22a8bbc998219d1e8aaa29bfddfd5f530548629357448
35 +DIST gentoo-kernel-5.15.37-1.ppc64le.xpak 57946205 BLAKE2B e82c51fed277b1296cebb6a42f938178edfaf212e861dc40b8d1371648abb74fd3cf667461eee1484db4357dda3e42539cd27069dc21c5b02bead6fb50945c99 SHA512 4c93455e2526e5258800965f3338f13fac1d72fdccee19a714c05242358cc07d24d256c340961540a80814be0f2667359d53765cb358ee741d81229370defac5
36 +DIST gentoo-kernel-5.15.37-1.x86.xpak 60025373 BLAKE2B 6fe278ac2c84b31aee4f185c388bae1317c448fcd2a8ae3fdf2931ecbbe2ae5416240045cedc7b2786f986019ca4a1f27684a12d413dd0d0e9e149754ce88572 SHA512 ea66fe94773dddc8fb351ccf9dfe6450e08df536460e517cba11fb2f1857115b81c48a621e010b18a8c6e74c1bf034858055b81f70b202058ab548b6003201c7
37 DIST gentoo-kernel-5.17.4-r1-1.amd64.xpak 70430680 BLAKE2B 8f246d8b11c900b9d090f4fac263d0a054a4bfe467f9f28abd416a78581d5fc89d08f6ade95f82f6bd182d7cef98b8d243f3d49ccfb141d0c61f7e583bd6acfb SHA512 cd5c00cf9edcad010187f6f8b022db0b3c52feb48830b74177dbfd0c2a1e901e125250a9a203b70dfd252677d1f944a25bb2e09ec1954239eaecba324ed64e0e
38 DIST gentoo-kernel-5.17.4-r1-1.arm64.xpak 65839972 BLAKE2B 36731d61f9f4a105123e367c24a8e902d1d48cc19c4414a72aca928ec4d96375720ccc45176d486849e80b4688f4cb6860acc2ceaf0aff479e8a75a3d62d857e SHA512 6ffaf431b0ac41713437b9ad48b9e15d91757c95fc0f17d8f08d92e931f3bfd9d57d5726c56d98022aeabc8358c1e7635a6992ae317450ab556549b03f0b3cbf
39 DIST gentoo-kernel-5.17.4-r1-1.ppc64le.xpak 58851867 BLAKE2B 0c0a974aabc5f147608380cee73642ee6ef0bf9c7f92c6b743d44d0a9444abb2cd13d1e8429ed3b0245d909cd0705564d83edae66af6bc1ae111250b20bc9f47 SHA512 e5ec809a2454d4668bf66e77b5281486ecb62c56012756e94fe48de06105d99a52a9187a0dc807a2bac44ac79dd639b09e85ddfc6d82922a6a8221c8f64b9bc6
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.37.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.37.ebuild
42 new file mode 100644
43 index 000000000000..457d69d62ddc
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.37.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 +}