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, 03 Aug 2022 19:51:41
Message-Id: 1659556291.ea9faa88459612327565cf54f9dde0dae269ac9e.mgorny@gentoo
1 commit: ea9faa88459612327565cf54f9dde0dae269ac9e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 3 19:49:05 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 3 19:51:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9faa88
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.4.209
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.4.209.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 4aac2c91ad3e..7e9f958ac0d8 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -52,6 +52,8 @@ DIST genpatches-5.4-212.base.tar.xz 4910124 BLAKE2B b09dfb8e041beb3ba5813e3f93ee
21 DIST genpatches-5.4-212.extras.tar.xz 1812 BLAKE2B 8016640dadf0add8c91a6631fba836b97173243f900abac4c12e5ae19d1c63e19d21f25df2f22b2880d18cfcc83d002fce7014a26d9f4f3a4bd788fc084db403 SHA512 0f5e5f8b6ad6538bf6850c506019fefe4e95a36f7f568b0c5188ad2c0c06fcb904287452e5692bf63480c321b24a6bdb2db9adeecd3a181c7260ca74f34fb5fb
22 DIST genpatches-5.4-213.base.tar.xz 4933392 BLAKE2B ce7ea84b52c60d4ae9cef1ddc3abd3f37de0ad5d7344645b3e4376db29d45b2acfe7b7b89e557c6265b4abbda9827fc68d4ef7c63eb418d3707166d7ed50586e SHA512 6107308eb5f3a0b1b079297fa7815a335620a2a0023250f1c4a92c84dfcf2ab7afea9388906e93fcc21d9ef85f350d638a8d245c29cca5b38968b71ce1a4d06e
23 DIST genpatches-5.4-213.extras.tar.xz 1812 BLAKE2B b6812b7e126a55b2079832ddce8c9ba09aee71b8cfcc137c5d0e553a7878e9fdc6e57e64b3670123cb90661d52b3aa0818fbfb7d3d48bd0521c0a0f46ee420e9 SHA512 1deba84aabde4c35213ab38e0f40fe1aa696470bcd5a6f103635d0078726622574ebdbb5caeed7d1516ef45a326052b2ac9d4f6ef2dfb0e0f84f837f9a350927
24 +DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
25 +DIST genpatches-5.4-214.extras.tar.xz 1812 BLAKE2B f82f9d703ed7fafa1abae01e9ab15db88b318ef84254360d105490bc727244795064fc6b21fbf771626da9adb62aba44a170165518fae58d8adfde7319e1971c SHA512 a3d8f94e4d9b7e5c29be7c1b336273f89ed38bbd4c21e6b34a51421ef71581a6e8ecc15751fe0bd7dbc1c98a754d1491304383f21925c0018b6e57891f76f303
26 DIST gentoo-kernel-5.10.128-1.amd64.xpak 65795239 BLAKE2B ccd03c20e469543532c3df43176ab3c1dd84919930586f3e90f2fcddd6fa6b8b19531ac9b94c7f67f55acaf052ae0b11814d93c4eeec7aedb2a13765165d6fa7 SHA512 cb38dacbbe923640bd0ac679a2430d890cf3609c066196c801b562ec55e59491c1549ddab48f00d2c1e4304310fd7d45108eeccea7bf3c2667712ca8545354d5
27 DIST gentoo-kernel-5.10.128-1.arm64.xpak 60993645 BLAKE2B ab40edf44057745e141504d4043d1702fbdf51d0278dfc3803800632e80e7278c347cdd3d325608e0e948b2de3e4ac0bafa824800ce486f360163e29bc0a3d4c SHA512 da31c3a1c5095f28c4824588aad43d6ccf219b1c249ce0665566f732e8920f052fe916609bfa4dd5cdf1271c601c0ab67f299068da38ca695a4b14757a6d401f
28 DIST gentoo-kernel-5.10.128-1.ppc64le.xpak 56022338 BLAKE2B ac21918bdfdbd968899393e0a323808d0dd7705a7cac07057f76737c794160ea274f78acca2abe5244228f97343f08253c365bdefde74f2e7ca7ba6086e747d5 SHA512 05f3e3a6f20d1dff3fc8c1f12634e417261a55de47df189b3b9cc28ed7ce5f1673b19726d68dd00c1af4980c46769d029d83094efd98cd8865970f00b41d69c6
29 @@ -160,6 +162,10 @@ DIST gentoo-kernel-5.4.208-1.amd64.xpak 61740219 BLAKE2B dd7a28cbb98f3ad74b15abf
30 DIST gentoo-kernel-5.4.208-1.arm64.xpak 57941209 BLAKE2B c83d98ce2ad183b9346af2263fa357bba4bb5abf8096030624ea94316b9899ac290b4e220f0bd6ec10aaf63a589503c730fef1a0ce0e701f0c59e600cfe04adf SHA512 5880a45f0da6376ac2f02595dd21ffc932febf641d5f66d14adf64d9bf76ff1d510f107a86a80d81bc85806538eaa607afa2d8df42719924afc93d7adce9f6c3
31 DIST gentoo-kernel-5.4.208-1.ppc64le.xpak 55204548 BLAKE2B 770b0e1728e0379a1e1281e6757528a8ba83a8161706d90b49052c59757e2c0162793d21cc42ac2b1dc639fa16b16d5a4b21895af9ed2862752ad761098098d9 SHA512 b19fdcf7a00047c911242349f04a345d29a78f11fec914f86ae3f7765643529a314f3e1e1b3cfbc4648fbed338f07e5e4999c98bde866878256aa2f6ebe843af
32 DIST gentoo-kernel-5.4.208-1.x86.xpak 53382429 BLAKE2B aa1bcf2df9ba30f734e263d443e1de72c7e32bbf8f417f699273d55a05ca77359d01fdb9fa3b1cfb0e2946252591d75e05942e5898246d0953e784412a33292f SHA512 d9907f0fa39b12134515b303df9114dc01f275371abb5c5aa77079ac583a0160e7d1431b46767604ac68bbf8f3fed0b9bc0cc8231264996d20357e287f1cd4b6
33 +DIST gentoo-kernel-5.4.209-1.amd64.xpak 61550465 BLAKE2B 4bbb9fc28663096cabf91f9973049aee5ecc9e7fa80fdd821d06bf2279d1a690e375932bb18c5a86628de71c7e117f043b926ef3434a2330c46cb7007f05cf9f SHA512 abc9a88b8b99f50cb882a96f293c892dabad914903b74c859195e703b5d12ae72e87166d1bebccfd339aa6a1665ed6ff0baab84b856928ebb7dd53348da754c5
34 +DIST gentoo-kernel-5.4.209-1.arm64.xpak 57941118 BLAKE2B a0696286b4b7cf9e12408351ba008ef13f1a82e15cbd0c60a2f79e49068ab1b7c8bb9f8628e52539513e7a77972e284878a12fdc82c2b6893e39d5185e5b1980 SHA512 fe7e71321b5cb48daa388c4fa003ab302818dfda5d240a88d2d77fd77cb01ce0c6077a0c1d7cbf765758483ffce20751616dafa2b402c095741cffb86436dd41
35 +DIST gentoo-kernel-5.4.209-1.ppc64le.xpak 55272363 BLAKE2B bd869e67557e3326a78f019b6df449e6fa2f91d5312931ec8533061e7132f96d27200ef1e6217de5cdddeb327227a8f2ef4d7ecb92a88b495b1861eacf6ef8ea SHA512 5639a97831d86aa82dc0bfddb7fb01ee56881ead03e6509d3f6984a49183982322b3054b3ab7cee30d3222f795edbb8e79041c13c30a95bae2f148432b8fab51
36 +DIST gentoo-kernel-5.4.209-1.x86.xpak 53372138 BLAKE2B 848146fafb6b0405be32e59a2d7325668e4df197bd2e769ec73125ee3c66b65e10c505553dc6f77aaf20160205b4fcf1d45b666edf0eb17e593456ea60614d06 SHA512 6a80303f1ddfa53364ffa389ee9d2852001143afb6b8f3ca682df49b5cb44c3ffdbde80b63333f4eca65a391259cd1a4abfd90958675446bd0d05152727e92fd
37 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
38 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
39 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.ebuild
42 new file mode 100644
43 index 000000000000..0b7942d6ee44
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.209.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##*.} + 5 ))
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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
63 + https://dev.gentoo.org/~alicef/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 +}