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: Fri, 08 Apr 2022 18:06:13
Message-Id: 1649441142.62bf60cf572b89b9368937a7a894c40ddb723eef.mgorny@gentoo
1 commit: 62bf60cf572b89b9368937a7a894c40ddb723eef
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 8 17:43:24 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 8 18:05:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62bf60cf
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.33
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.33.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 bd3c44b8d737..de1689600608 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -2,6 +2,8 @@ DIST genpatches-5.10-117.base.tar.xz 3165564 BLAKE2B 0e41b33af63a5b6da920d194166
21 DIST genpatches-5.10-117.extras.tar.xz 3872 BLAKE2B bbac7edcded53e4205c58e1404692b753d57f306b98bfd7e718206e25a947b2e1e565ae33712b64f9b24333df30c32c975af71c5a9d11bfb836216a27dfdc782 SHA512 b192de56c873740d963fa6689f7d9dc177b25cbaa2847adff2d3a5ea7c6c541161c4518f389f7a5f2294b878dabc0d06844bf4e45cffc87ce8f9649d55a4312e
22 DIST genpatches-5.15-35.base.tar.xz 1306764 BLAKE2B 5ea5655e825b9196663a7bb830ef34d74da7c9f922f7a71b46f7bc8755adacddd3b55f57e85b29532d6936ca481699ffae36642401e34293b4c6a445abb92db7 SHA512 50030f2dafba3e7fd16df7a6dd275fdbede772273009d1f1055dc904dc7afe947e92e9a32274c337938edd35073adc2e101d18a6ccd39529461d703af3e20566
23 DIST genpatches-5.15-35.extras.tar.xz 3876 BLAKE2B 5b14c88d66ede25e8417bdebc3c822d2f3755a13f21cef8a95088c97bba42a44357c98d13ce5a40e3aeb128ec0716540e893b108bf1f73256cb45250cd7ef43c SHA512 bdd8c5a700e9902cb7db17094fcc220eaca4774639d73e8496ac061fbba9fb80f6aa136aa9e87331a636af6146737fdec3c21249da7a18b5fec4d82de559e24f
24 +DIST genpatches-5.15-36.base.tar.xz 1545664 BLAKE2B 367785e90aeba2a5498c5a17443429bd6650ab40390db6feb349eb54431e36ddecdfb031785f74355e5cdd7105636bffc8c0a86821ea36ee257d40cc0fc54d31 SHA512 63191671b4b41fb4a45d0535782bf638976e520e227ac6e924ce7e783e67ed02c8f127574f263d9373cb5d79591f1de209d09ceb47ba6ce34acb57c6a991857a
25 +DIST genpatches-5.15-36.extras.tar.xz 3876 BLAKE2B f89575d6d88ba1299252281092d13235643cfcdf2ae99571a3e813e39b1609fc2faa85dd07b81be81223bd0e83cd0a1c10c1e84be54a6c4f6563b901d98e673d SHA512 9127a39fc8ebbd78274ff838625eaf5c5500c1380a7cc84356af6fdff161123000f30f91ed31a0264d49ab08353a004e8cdd67ff08413a272e2f496c36e41988
26 DIST genpatches-5.16-20.base.tar.xz 772164 BLAKE2B f29e052926e6c72417d93b7e114f7dd688def99891508b358414ea3930e3761d6e79e7d09722c4479ab7e0d495d53cbc1084270f8782a579d4ed56f58caa157c SHA512 00a034d6a2a79daf856c0cf8e6dd30753d89b95fb9de9a5aff4f5a0dad651eb53eea24aef7c582f866749ad3fc533ed7087f7dfd11600fef8cebf85d2cc9c58b
27 DIST genpatches-5.16-20.extras.tar.xz 3800 BLAKE2B c815ea22d067c98f82650726a6c8a2e937c7bddb8b941e9d54c3014f4d8ea173cb1e54e76e23b6f767ae247fafbe02a8def6f39e5c6523e8c8cb12f098b8a34e SHA512 788ad08dfb0639c5ad42bb761d99bb534fdc5a9be54e9cededf90e0da34f13089b82609d8c7ccddc6fc1a28b913d4012c0e44b6768c84927e582f3a04be7ae55
28 DIST genpatches-5.16-21.base.tar.xz 1076736 BLAKE2B a5c6a42aba796d3f6fac0bdff544ee952d1cb63374864fca43a4fe57efb09407b8aafb54a692298173b66b5d267b9a8fdbafe614f48c1af4b4ecea2e951db975 SHA512 3a2df76cefcb1c8b6b4e65c82328a499757db5e50a33e9fd68b7d6044981f73f7cd0427b582b4477d1207898e3e2344d2c4c1afafdef17dfccf9e787a17b6dba
29 @@ -16,6 +18,10 @@ DIST gentoo-kernel-5.15.32-r1-1.amd64.xpak 69326816 BLAKE2B e26042a6d9b77d98d2d4
30 DIST gentoo-kernel-5.15.32-r1-1.arm64.xpak 64197193 BLAKE2B a50633bb2a4b3c7a1ac5df5b38821b7df24f15dd883169b6e91c6d934508166fd6236c4dc3640b0bef994b7aa97551ba9b9aea8ef4e6ebb80b9131c61945045a SHA512 c4e922dd2bf942c6be335387e4266a1ed3d27ee466f7db3b4de24774e20b68e5fd2f62c5a3cb2f84db7e520211e1dc6f0c9f27040039da372cc37bafe06ac15c
31 DIST gentoo-kernel-5.15.32-r1-1.ppc64le.xpak 57890732 BLAKE2B 7e5ec0913bf2cd77bbe726e48bd236867a7f963777ceb2cf5dc86a410e98e4c5af5888a75f304492883fbb821813a8d6428664d21c55af1a36e7ab7cc9a7ae0a SHA512 c77e1e4108b06a46758209bcacd45bc42dffdfdc273290774550b8dfb1c7a4bd287db95dba4dbcf17da88db9a0a6a04cc14a20f75dcb9f467d7549dfdf9fb33d
32 DIST gentoo-kernel-5.15.32-r1-1.x86.xpak 60053260 BLAKE2B d56a5675c36c7e5f70661378298a1ddb33212a588f50f588676c4ccd59905b9510dd4da6a4c39c9f6504ddc0f82405670b292ee33b67a52ffc0c26a8124a5f1e SHA512 d0736c1abba8361d192d4dd43ab25e62ddcf7027df5dced00f8b50ad157d8aad4e8b141aec68fa903e4fd6f69b13544ba8a41c768c83a41b9a5aca2fe24b30c6
33 +DIST gentoo-kernel-5.15.33-1.amd64.xpak 69321065 BLAKE2B 42e3e874c8344f55c5370944ec36eefeebfc7eb5f41837b92807cd2402aca38aa950987226e1e31f41f72c06a3e37624f8114fdc613d2d779bbef241dd9b9973 SHA512 50431b774294925f2c1b6138630749240df725d02a03437bb39ae3d29f492c337ee5a81d3ae8cd05f683ec0a5cffa9b64229f9124a482703a713f545858004ed
34 +DIST gentoo-kernel-5.15.33-1.arm64.xpak 64181038 BLAKE2B 95dfd3ae97df5c2ac38486e7c0656523fd1c80ceb2050953cd219ffddfe5ffc05d48e101743f55dcb3c10bedef7664aefe2cb40fd4aa4aebdaedd1ddc5aa02cb SHA512 69d33c74983a9b2f02c5c9ae59632a832e9b2fd5dba5122489b1b1659cc1694abe02c5e5bf2e82e85551876c924eb47a56d678f2f0f4ad707fde030aab789397
35 +DIST gentoo-kernel-5.15.33-1.ppc64le.xpak 58014461 BLAKE2B 124f450bca083f41e3c87aea30e124db911d332fafdbef83a573e943a66cd776b55dd4ebf9518ac453f9823d661fa9a602c70a452b7a2babda494daa71848c27 SHA512 75783c00f3d5675d14d5a858e27686e822c9d6c205b45390742f71c3ffb578bc18c0fed69fe5d4d9594e672cd450a0ba5c078562a45813db8f7a5e9779d0b508
36 +DIST gentoo-kernel-5.15.33-1.x86.xpak 60008701 BLAKE2B 194cf9abdb39617d9bf85ce2644749e6e064f8394ee95d9a5d6d72afc9630e38a295ab745297ad7aaee429a387f09064393b16e169b76766d83e2feb06a203a9 SHA512 8c19af257e9cd5b5a5edbe429004d1916c0e22ca3747884103c162967882671069fd3c7389111badf74f8731336bf1302b995273696f6abf6301a02bb2d15513
37 DIST gentoo-kernel-5.16.18-r1-1.amd64.xpak 69748607 BLAKE2B 89d9d6116eb5c4039f14dfd34876b7cd9df4d5c0ececed5eb1926633b0da76a715d9acf08462c9b8b55fa00dc484ba3f6acb3128246220f68d9cf16e82c86b8c SHA512 aad75b8cbd79334314578dd59925fe26ae63ca167b2f66470626db0ebdb2a31c30f7a309e4e6ddf0d3af461d4500316cea878af2796edf3f2a8cd79927ae6f3e
38 DIST gentoo-kernel-5.16.18-r1-1.arm64.xpak 65173357 BLAKE2B 16c913c63557801659384a31767326968b309ba2d2966b7da59daa654226b7257aa9c9446f0268fa6671f3d687660f7c98bef8845f76b717d8b72737060dfcde SHA512 8dbc0fe7827cb095103324b81d038f6289120774c1b532fb0067afc1f795ec7ab9364302261d58aba9407561f56341c13f3976ed98b6951d5b998a47afc185aa
39 DIST gentoo-kernel-5.16.18-r1-1.ppc64le.xpak 58464396 BLAKE2B aa8027e24e84fc4272eb3bdf90c468b3964cba65ecd2f433618b506f63fa9f6f62b07ae7550ad8041a9f37816f6e96f02becb60bf21fc15b251a409d9520f47a SHA512 a6ef4ec647f8a10fc915394ee4f98f53f41ed11fe188ac7b942be68c7f035d0a2bc843e2096129923248f22f888836856bd5fb1a7e89daad06dfb2069e8416bb
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.33.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.33.ebuild
42 new file mode 100644
43 index 000000000000..4e3b06459b34
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.33.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##*.} + 3 ))
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 +}