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, 29 Jun 2022 17:36:37
Message-Id: 1656524186.617991727a514e8ca62e6f44aca13657ae259d19.mgorny@gentoo
1 commit: 617991727a514e8ca62e6f44aca13657ae259d19
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 29 17:27:01 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 17:36:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61799172
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.4.202
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.202.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 07a4b0738c4d..5d7c97a0bedd 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -22,6 +22,8 @@ DIST genpatches-5.4-205.base.tar.xz 4658076 BLAKE2B 172fc1760b7636d6d2de9014c36f
21 DIST genpatches-5.4-205.extras.tar.xz 1812 BLAKE2B 43a42c678c8788065209ca46d4e621f4f73493ea40c37cb39871a7850547572cd1484f56e67b08e34a94fcbf247f827a750d93c4cfb126bfa1a8bea852afee03 SHA512 95340a3d7098b312a7df149b98fab683d57c0a06e3a2c77facc6611e61a97eb8e820894a5cb5171b54d5f7b276ade96a83a229e60103047e2e67838afe518090
22 DIST genpatches-5.4-206.base.tar.xz 4661532 BLAKE2B 9ef512d628faf560cd3d3e8c5c72773ec805e3f6a1f07de8f073a7b9eca3b4cb93b00fe0b78b581f43b121b5ad96e0c0791882c4f3b94e881db222e04dbfcf70 SHA512 c84219335a5a14d930290a2b9c07eae71baeeadf58de06814ef0ff01b157de123c619d4367745cdfeaf729125ed9c0e26922bf3741f53a31b90e74e33f766cc9
23 DIST genpatches-5.4-206.extras.tar.xz 1812 BLAKE2B 31f5f53949e888dbf848cd1f8d06710dc8c302511c5dc7352dcf69585fd0b2bf61dbb0dd3fd2a75bd48d05daa9bb6d878427cee8aaa489d1c1b51cc8e8972b2a SHA512 472aeb71289bd91418afdb43004124a6599b8bf336d2b5db1c340766277c0950b25b18196fdf26b5405797eab5e85855abf97fff0da4c312301c195710c499eb
24 +DIST genpatches-5.4-207.base.tar.xz 4860968 BLAKE2B 66c74dd8794faca08608b12616e2e1b570f9615b329138d97dea9d708c448148340efdee61e892837aa47eabf3b69baf2b39ad62537e3b774b1d27a1363a2387 SHA512 254be29bd17ab2fd52a6dd84a317ad58677f6a1e821bafb5bc197b4cb819147315a23648b4f829989ee4a8318cb61f10b4e8b745d7d23ce2f395f9069a95933b
25 +DIST genpatches-5.4-207.extras.tar.xz 1812 BLAKE2B 53da29109cf54563a505ea1ca636d5762c2030cbca87c3634efb2c0409345962f91be465e1152e9ad7c86e0def9a509574a90ad5316eb680bd451640409502e1 SHA512 f199548293ea31c20ddee22401afa48181ba5ff29a9bbadf6e6b70f3608efa94e2b2a8c1b82eaf921844bb3b50d5bf3be01f94d83218d821709dbda144c22149
26 DIST gentoo-kernel-5.10.123-1.amd64.xpak 65756021 BLAKE2B 18bcff8a26baa8719d3e91812f636dd543e15e7d524a049e16ff6866c61b3bb03041a63e0b95cd61df977e8551876a3a67da6826e3084daccd9e191ecc158651 SHA512 6248593ec6f822f3bb7e20332ff7d9300e2e1246546db5555685fd7e0e77c756e9725f73fc03043b8f817541e177a1a20fe5212d3cba9d2dee05adca4b1bca7c
27 DIST gentoo-kernel-5.10.123-1.arm64.xpak 60973935 BLAKE2B 440f9bc1812b1ff465587c3ac5694ad488eb8ac55355d11fc2db78682439260a3ba3252292a5abc26134ec759a3c4898bf744276cc7f8ff369bffe63de5ac66a SHA512 ccf3141880e34b665ffc613b2281a618194a4f319c8b8485429e0189f369f0a2498ad55ccb0dfceb82e23f447b5f11b6a3a9a59c62dd38991d37325528fadfc3
28 DIST gentoo-kernel-5.10.123-1.ppc64le.xpak 56011478 BLAKE2B 5b7d540f05536e15f0efcc3af1a2fb774fb0f4beb68e1076c845337491b955692a83973bdc478f7862e34560f0eab63fc0865fa6014736af1436a4732b4f44df SHA512 f07f595ad0e65872121e2dba9c0da37b28db094e1d7904d5622a8dfa963e7593107261f40d5aed1d5dc1391595c9c44ef4931c78431b8e5d4593230793692bff
29 @@ -71,6 +73,10 @@ DIST gentoo-kernel-5.4.201-1.amd64.xpak 61490388 BLAKE2B 505f983decbac8b915c774b
30 DIST gentoo-kernel-5.4.201-1.arm64.xpak 57629958 BLAKE2B dfd49ec96a3f4eb87a2fdaede289f5d90784c3f04a76b8fe1d651b79e470406e64b0b83f148de16e0003372ae876ca6acdc0021fe79f8e444a72a6fff9d72cc4 SHA512 ed173b3413fa6e1e49743bccd9b0fdd7ce9aff43638679ddd9a63f3a051f7458aa3d37c834062e8c8484806d7d8d9bfa0a8ad6fc1ae3060bb78c2ddab9bf7e42
31 DIST gentoo-kernel-5.4.201-1.ppc64le.xpak 55024732 BLAKE2B ee4f6b8f2bf957c1a464e7771fe9c912f49b5bc6b92073537660113d106dce686fa56841df1f31b9fb093deac9142bb85cfd4c7576bf9ae1f8e8f11b432f63d4 SHA512 c56967a16dcdd96a142012979da5843616cdf88cebf11ddf72f9798e6e1ee04993cc608ea3b843255d172c71e1fdd022e97bdfd7c8d38173f6263dada7bb517f
32 DIST gentoo-kernel-5.4.201-1.x86.xpak 53296941 BLAKE2B 0da99c798213fbc0b6bcabcdc14a64daa21bb0beb01492840fd90cdb88c474d0f07b86c77443e0fdfe7f7897405a9f4148f431bac9203720ccd3a705267707cc SHA512 4d695dd222f58addbd885bfb789032e2321032c6ca05f079ad7837a7fa381dc1793dee841a07f1ca6de3899f3d90571ef70b1cd64a952083eb6e542848cf623a
33 +DIST gentoo-kernel-5.4.202-1.amd64.xpak 61600058 BLAKE2B c6a749286af905c5193cc3d23f3a41aafd3274e7b378074b8344518884e4b4cef43378116777a2c3f74848f188a17ab056314967c2c18e063d250c3112f3ceaf SHA512 a96d07aaaf52306770a11e74a59bd6f17cbc88bb6ccc8e8e5a1b1d38f36155eb5458acaf692d54c6a824970806a881893ba8927ab0f2f2437d5bd092f3ce8167
34 +DIST gentoo-kernel-5.4.202-1.arm64.xpak 57689830 BLAKE2B 725cf3c777e5d42c4134b1ddf2621a06f7c674bcd1ff87a8a81e43f80977259e2f690e416852d8ac29fa92fa4d2e5a1d6d2082f03f9c1263235ce8e5c253ccc3 SHA512 5c71db14007ae8a464628c9effa25166cd4bda5fa159618f09fac5810e8b2bed69a0c94f4ffaafded92ea640c4c61bafeb188148d341ba1a80cb9f8b89475eb1
35 +DIST gentoo-kernel-5.4.202-1.ppc64le.xpak 55132605 BLAKE2B c7966d2f141eb2e67a970f21b2fcd896fa249466bbf77b129ddd5e5251f034259774f18e8b5a4d775db9724b8ee45bcfe8f30c6703b407502ab597cd5b92a09a SHA512 8d9f10f5c1a4c5787287db8e492178f64e8fdb45f439c8785919423f2f71d06a24c31dd57223ff2942a8877a64b9d452822d9aa62d3d9caee0be704d961ed278
36 +DIST gentoo-kernel-5.4.202-1.x86.xpak 53313873 BLAKE2B e12dffda8574a02c612751dc7a0f58afb875d52ce39a26fe0c541222f4fd3dbc77696e83914754af4b2ff8565c6b021aeee787905963739147426281118c6d5b SHA512 f1774442c1e4479f158e149d6e4d2bef5b5dd9fc3d6b36a2e73092137a4e01b561ad4372e6a48778ef08c265a537ccaab0f296acc610ee22f3ff3d21c5b37176
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.202.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.202.ebuild
42 new file mode 100644
43 index 000000000000..b6c3ce9ca64c
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.202.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/~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 +}