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: Wed, 23 Feb 2022 17:04:19
Message-Id: 1645635842.c339b6eb38728b9d5799b5bbee26ed40072a493c.mgorny@gentoo
1 commit: c339b6eb38728b9d5799b5bbee26ed40072a493c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 23 16:59:45 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 23 17:04:02 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c339b6eb
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.25
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.25.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 ebc446104057..d948e16bc49a 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -6,6 +6,8 @@ DIST genpatches-5.15-25.base.tar.xz 1018612 BLAKE2B 493b8c695f2bfcdfa36712143ffa
21 DIST genpatches-5.15-25.extras.tar.xz 3876 BLAKE2B 17a20913e907e6b6a87afdd7775b7f9811bc3eed5374b957244242fdbc655519606063656bb8e5f51ded3168f73e99832d0cdf66e830811dc1e5ea0c0b8a2582 SHA512 1b8f4424996351a70c26f5a90c2490078c1a8daa80da578e2e3b3d1c4be6a4474d40cbd2e6fae8b1f1b9389cdaf2257e01a14ac6c2f7ece8a883d745555a686e
22 DIST genpatches-5.15-26.base.tar.xz 1059876 BLAKE2B d3a7b03647f3ce4a10ac4b75e52723d26cd56f880ca786883c236b3569c7312555ca57325a039bf9713cb44b930190b2e099de6ef9d677a9cd5e8ef9179fb52e SHA512 241f1cf431626fd0f406f5a661363a29293a23057c58a4cf63bce6383d126e4f276be371eda670abec8699036d46c1896788f1f56d47239fdb9eeec6d5c8a51b
23 DIST genpatches-5.15-26.extras.tar.xz 3872 BLAKE2B 84bf993010dbdf678e9c42e5807bcd1cbf6066d0ffacad81d8a3d7c16c65cf0b59b219e691aca1fb6932e6aaaed9a0eabcea8921e8042e5e6f57d0ae45e53826 SHA512 55cc9f5f2cb30f2b81b7815254d2932f851f5691fdc92c5a01b3a8977392ac9eebcb77b826571530ed435c4504560dcaeeab65e0c51c35c23599876b4992bb62
24 +DIST genpatches-5.15-27.base.tar.xz 1109928 BLAKE2B 4f6113b0b1c378bec52a94c420265c3454b4b46dca3ebe25cf9bbd3d65761ac2d1bf14a5f60afcd974ceb319036c4e84adf247632bd93174dc144779d1169f8d SHA512 77f39c84e78e64ed221a813292a3391ba1252c7bb5206d78f2e2c4b8fa3e6f082cd327ac45c30851840e62288f2958470d271d9ad2afbda2fa9f21d4b4f07c56
25 +DIST genpatches-5.15-27.extras.tar.xz 3872 BLAKE2B fc757f0d4fcba7b53aea34736b7a0cc0a7ca14b73bd9c249ad2c89b283475f3b53e4391870a239bd329f00e55c056f05cfc270ad00d57acd69cc26331cc20931 SHA512 102dc6ec977e184ec07cc3cdc2a39285f291bd3e3a344b5e53935f90319efcb5ca70ea1936d5d37ffe03f66148aad4e240508e3cf212d483abe145c21e6818c3
26 DIST genpatches-5.16-10.base.tar.xz 464508 BLAKE2B d590a7041f6309674e8000c735a232bb2f70d872863e4122fa5a8cc8bc0e68b641685b4bfb10c81d286124084eba2f6815e9d650978b52fa2fff70508ee361bd SHA512 cb591c67a3253b35d2d8dcbd229231507d28cbf2c1dbc2f734ba7e0fbfbeba6ca400f99bee6c9b94c90fad5facc9ee46c85fa4178087865d2e942a0717878a60
27 DIST genpatches-5.16-10.extras.tar.xz 3800 BLAKE2B 79c288854d58ee20f8377be8bb15ecdca30b27fbfbbe314c2db7260576036258202f620d2ea2c2a6725fca1fe68fa1a158b207d36ae13630b3116397c3868cc4 SHA512 34069ffcf17636489af7d6df3e322926f566f43396297867c2b1a512fa884062bf86d50675c313ff29ed68f6fdb9039748fcd14c9395e29e9beeb166f45eb25d
28 DIST genpatches-5.16-11.base.tar.xz 516420 BLAKE2B 3e3d1a7ed60355a6d0911742fe1fe27961bd6efe16c25bf700ffc9aadbd8d02860d8b35a9fa3de61bd6d59024364e698cf4d78a7abe2eefdadd79b5aa086778e SHA512 d513a67f55edd3ea469b36ecf93eda8f623fb2f899c8cb373ee5092838283fadda029db6d97687dc27b734634e666106c054d0f35498af086aadab4aa59a2e7d
29 @@ -32,6 +34,10 @@ DIST gentoo-kernel-5.15.24-1.amd64.xpak 69148874 BLAKE2B b2d2425c7a1d2a0e2f5904f
30 DIST gentoo-kernel-5.15.24-1.arm64.xpak 64079551 BLAKE2B 0927eb56e49b6d02d9299d08a050e1b63bd1edcb879b06d34e0dda2bd87337b7d94a7574cdf5fdb195bf0649503e9bae9ee453a8ca249061517d4a760f4cbd72 SHA512 850a59cc24873e05ad3920140095be0a30837192f6bef284809a2ec7f88921ceb7386ab5c883d4038ab07f99229abfd52bf67f1f1274edd393c6ded7413d94ec
31 DIST gentoo-kernel-5.15.24-1.ppc64le.xpak 57915153 BLAKE2B 1319ae23e1b33e5f0896196fc42986fe216a09363e622f44ce26f07d8e3b3c76ec323a18773fb598bb7726fffd4fa0f2a90d6c876aec397d9e7d913d184f6193 SHA512 c6df955694a167bc1f3d10f1f2571439bf5e9cba942d6c38e782b1d28252e6146fa458e9c19a3761578b631a8ad61e7ba23169f1c5cc5f11f95ee47de73a5e74
32 DIST gentoo-kernel-5.15.24-1.x86.xpak 59889148 BLAKE2B 347f6ad367a3f7e9734db959f06b986425bed90bcca8bb590024dcc89347b15b686c7c9f06a3d77dc2652f1da306eb6bef5b41bbd4f793d6438bee2ce863d082 SHA512 3255e4b4cb76ef321a71f522a1b2b5c9d03bdfd02e58569977f1523ce61bbc04b267ff4761462736459b281a575bb411168b14a72db97e9bea2ac9dca27e8cde
33 +DIST gentoo-kernel-5.15.25-1.amd64.xpak 69201263 BLAKE2B 8c77c7d23f0729601c3fb4251bc4d9494d59219a45c63cc809f3475ad6b0cafc2b76b24a2be8d8e306f848d34862dcdf1fe40259727815327e634b15196fc61f SHA512 a690a3002b43ff3dd136d56ea7934158557f11502fa33ebe9964d14c4b4bfb41b85b3941adbf3ad29774e5e6a9f51bb9acd46fbe7d7eb0a4ccf41eb4350cc7c4
34 +DIST gentoo-kernel-5.15.25-1.arm64.xpak 64070251 BLAKE2B 94145b7f0a13057d09732d0e51ac3a6918d038939e494faa7d4f9a800c56db7893726f43990666a9b31e53dfc9655ee115aa573f2365b0c5e4ecd3af2668d009 SHA512 21030e0e53046fee0957e8384f9fc18d7821f70e1b0a6e0347f0347dc9bea436049c8c50cdabffc6064802d635aebf96683267bfb0edf692d3d616523c85a5af
35 +DIST gentoo-kernel-5.15.25-1.ppc64le.xpak 57925554 BLAKE2B 38badfca386a1ef8db143de5ce57fcd0c5fe6b1ef9c23919a012829cecb964ac5f94896a197524c9c792a6c840ee41e5690ed83f7f592c8a9aa33250c68c2ed5 SHA512 9493ba5f1aabf4e35123c1681f03be156fbf1f1b036c299c90e118e53094e5645fbbdc218228d93b26757db236ee1a5a216fe6347fcb434aa11c67f7fdf4ea71
36 +DIST gentoo-kernel-5.15.25-1.x86.xpak 59922155 BLAKE2B ad2c294b1c903f3c0fa48a503864ca775c3102c9798889122b9381dbd9347ef4e9fba4f3ae0413f42174284ab93d19902edf24072702cc819f7a30b23f740bd6 SHA512 6b9ea6002aa67881512c1d8b92d35afd398560bc016daa075afe65e183ebd99705e98f52f7595a35e14aac36a7c763d18239db384c3c9a1ed4d4b49a8ac28fb5
37 DIST gentoo-kernel-5.16.10-1.amd64.xpak 69568600 BLAKE2B cd01658393cce36ec09b2b59db73fb7b05d9cfd46094c6aea7b32eacc2c3cd9974c4056a7650a195853354c8de56a6bf42d2b9debd6810fb20e2b09094da7cad SHA512 e68ac4f34d0bf30acb8401f8f8c9c1fd4c93a3b9f36d071196ff1a42cb6b2b8ed9fa0e04b9376fc82de6b296958a6e49facae8dcad3e53fc6e89f0bbff246423
38 DIST gentoo-kernel-5.16.10-1.arm64.xpak 65046002 BLAKE2B 3b12c8e5c621124b0ab72bbdb58e1c054ede41859fbdda8c510ef12d3d52c2db17bf64e95b509a29ffe8cea45c8ede86073d9189e0195d1e4745d3810bea7f1a SHA512 6c89091febfe2ede589caa68a9526daf8cde16870dbfa508c3395afee36f6470c329c491767a6a4b2be6c83454dc26431ba0776fe3090aebf4170fb092a43e5d
39 DIST gentoo-kernel-5.16.10-1.ppc64le.xpak 58450194 BLAKE2B 0e95432237a2a1e98178b7a41a23abb43797cf12709061f8bb50e98c0315563e8dbe9c6ead57dea72ef0f153a906712b3ed5b02e15167327975341febeda0778 SHA512 450da33416b07fae2d6759dc0d6f59ac21e61ab2f2d7a2cc0df41459de11c040996ae52311882831ffb68839068e4323cd6ea5fdbcc08d7e4d09088b0d46708d
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.25.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.25.ebuild
42 new file mode 100644
43 index 000000000000..d8e0fada6dff
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.25.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##*.} + 2 ))
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 +}