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: Tue, 26 Apr 2022 16:04:47
Message-Id: 1650989073.c11ea39a3092ad2ca118408a7b180e45b770657f.mgorny@gentoo
1 commit: c11ea39a3092ad2ca118408a7b180e45b770657f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 15:51:04 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 16:04:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11ea39a
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.35-r1
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.35-r1.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 164fa477ffc6..d40103859bcd 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -14,6 +14,8 @@ DIST genpatches-5.15-37.base.tar.xz 1619460 BLAKE2B 56c3671c4d6915ca183f92b19b7f
21 DIST genpatches-5.15-37.extras.tar.xz 3868 BLAKE2B 11ac96d133b2c44ca77eb51cab739195e9fb252a2a3e6e2ad241f9ef6568ae1cf3dad9b7411522253c1e779c048807d478d6bac71d7aab9a147dac5dd81f77a9 SHA512 f8f0b48e170f5170d44947e52d548fb66f302bd97e7414cfb7e4668b2af76b48be0d0d2552345f397ff830246472193deac056020f128d98fafe04128d1c195f
22 DIST genpatches-5.15-38.base.tar.xz 1659188 BLAKE2B 782c4471d6e2cd69db1320e1f13caa438a9b535bc91710ce46c22c06a48effb07ce5bcd023b7ab25f3a7ac48bfe92352ecea46449dc7fb2557c10fbf9d9b8b5d SHA512 4a5f8ecd7557fb9040b8a7d151cd2afcd3f8b15f4b8c1a7cc9d56c18ef21f900603a80d7d155e7981ba780597766f8612e45ffe3f1906104b478f49b9b5135f9
23 DIST genpatches-5.15-38.extras.tar.xz 3868 BLAKE2B 8e23e08f6c89179b1ebc9d6727e1292c012a495588ef298d3b0a9c2372a90c54683314e5975f9ec9ee2539ab6f4b03e33a37793ab5b2a7205feee416558d9ee8 SHA512 77077a57146e44f9b038e56e4f21c1fe0eb903bd415c037546f72106a8e7545085405cf15d8f31c7a318113ae1104e84c0bfe6015778fe482f822e671e14d002
24 +DIST genpatches-5.15-39.base.tar.xz 1659952 BLAKE2B f40154102f23ab2b7774a998c75633598ce83daafe720930ce151a4af2a6e3647da249ffa299c7abc95c7644f51b044c4e6ea7a2378deedbf09638243c6cd30d SHA512 7646cc2f7b9467cc56bcc3e0e80475f3137eca6633800a8160d66cc81aaa87968f9f5fa6b3760a1c0ff7351d77582776a2c1a24875933ec0001ec0caad8818ea
25 +DIST genpatches-5.15-39.extras.tar.xz 3868 BLAKE2B 155eed40c9018ae6629513a2db645f535c3917422cb5b48acc7b93a565a1de5916d81182db5beb8975478f317388ab81afc74d77abf73bf071df7e474abeaddf SHA512 bbb69afead295c9eb059fab679599950f3ae71741a8a6695241e00969259f99a1f51eb859497d1beb73813adb9693c19d21025daca529b17a962fbbb7bfc88a4
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 @@ -64,6 +66,10 @@ DIST gentoo-kernel-5.15.35-1.amd64.xpak 69341036 BLAKE2B 4e107e11bb930bb18f6ccc7
30 DIST gentoo-kernel-5.15.35-1.arm64.xpak 64204287 BLAKE2B 000aecfbba63b63ce2fa426c051f124b0e716d332101181c0df27dc2a10b9c5e8475f36508431f2412857c014682a61ad8d91c70232e29874a55f829d6461010 SHA512 6bec5a34ce3d01cf42baec7c1cd828e6ce613754d38469ae951c834bafa46532aed33c11e17fb94d69d717000e5f780be7918e288447a094c4bfc3887b54afda
31 DIST gentoo-kernel-5.15.35-1.ppc64le.xpak 57986067 BLAKE2B 5a4f15a648da75f8acc08a0a853fdd64f0acbfe89eb7da5f11764fdbc63bd8e9719596959144d320982fade4e500a152fa1a7dca839f68f7cc8a7e4fd2628ab2 SHA512 c5ee04782b311e86d6fc37f32edb58fd64cd81cca3d9d8313855ec87d9fd48f8681953c9bb4cdd8dedb34e053a7cb66cba7c698dc3473051196b305c5ffd56ba
32 DIST gentoo-kernel-5.15.35-1.x86.xpak 60027720 BLAKE2B 4ea3f0c1f24789a91cc7651af4d179ef66d4a79c8e481a0eae47adc197af4ae1fbc7ef18e9a524b59e0f616e781a9b3682d71b38bd365533e0b4ee033f972c3f SHA512 de38747bc6d7c9a5b6c4104d2afc21f2d2ae9951d92756990cc09c753bd7469eb3df9bf8ec1c2d423397a89313464a873de4398b79ca134d0fa30d3768186148
33 +DIST gentoo-kernel-5.15.35-r1-1.amd64.xpak 69310275 BLAKE2B da1a631d51c2b700b9c48b4c34e3b651a0bf9e15c2c4dc9bb5395cf04e384365a58cea0780bcfbab2ddb4122519e264ac0e066d7450c30db687d6ae479ec637f SHA512 42e877d7057380eeb9bf3d2147cc50e4e353583284703ddbb954ad83d39bcaa69ce9734ed600206488dd3b45adad202e57843be27080855d14441f913301d22c
34 +DIST gentoo-kernel-5.15.35-r1-1.arm64.xpak 64204123 BLAKE2B 858c894727edc9dc7b36cb881bfec5fc7d118465271ffdc9d9d130a929bdd09cc034ea461e590175914f0f898248a969a0f69b2278a1787b078f892ba6a6bf74 SHA512 b6b5818400d8f9d63203a4fad379fa2ba45f7863afedbf2e898295c49ba7bd63d4ea772b2f728641bfdef86d6db66ca42ae6a61db2eafecf0a6d91d54753e62c
35 +DIST gentoo-kernel-5.15.35-r1-1.ppc64le.xpak 58010247 BLAKE2B d39dd333c4e94851798258712b570f08e35966268c5e65c017973bda86c557a7fb170ab18e2a7ec6c7e4f246b9c57b4a470f42eabe0ebe515231c9a2aac69980 SHA512 2ba8ad20bd9cac8efc9c465ab73c75af4576c3bece94fdfc5fae39a0c55b3a22d55b76c7d8365138d713342387470c88bae286ea55d658688ab488d9c8ac9194
36 +DIST gentoo-kernel-5.15.35-r1-1.x86.xpak 60031652 BLAKE2B 0f33ae3baed0c10fb9dfe0297e21b9d754c8f541f18dbb4555f4f7cfc49cd709fc09bccb4af2c039e375dd42553e4a885971bf316c0380ed150e7ca4ba2cb2bf SHA512 f0994358998e6941054f10287ef5cb536adf536df52685583638b1fbfcce2c62cf2128431de24d9ab2dcdd7d924a22e797ac6bbb9a61a7d3ccbbf2812718255a
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.35-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.35-r1.ebuild
42 new file mode 100644
43 index 000000000000..7b2cba6c08d8
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.35-r1.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/}-r1-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 +}