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: Sun, 03 Jul 2022 07:39:06
Message-Id: 1656833929.c831ebdf4ad8098f2ea0bef99a8cd1520600cb83.mgorny@gentoo
1 commit: c831ebdf4ad8098f2ea0bef99a8cd1520600cb83
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 07:38:18 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 07:38:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c831ebdf
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.4.203
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.203.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 70a40550db48..d737285c018c 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -30,6 +30,8 @@ DIST genpatches-5.4-206.base.tar.xz 4661532 BLAKE2B 9ef512d628faf560cd3d3e8c5c72
21 DIST genpatches-5.4-206.extras.tar.xz 1812 BLAKE2B 31f5f53949e888dbf848cd1f8d06710dc8c302511c5dc7352dcf69585fd0b2bf61dbb0dd3fd2a75bd48d05daa9bb6d878427cee8aaa489d1c1b51cc8e8972b2a SHA512 472aeb71289bd91418afdb43004124a6599b8bf336d2b5db1c340766277c0950b25b18196fdf26b5405797eab5e85855abf97fff0da4c312301c195710c499eb
22 DIST genpatches-5.4-207.base.tar.xz 4860968 BLAKE2B 66c74dd8794faca08608b12616e2e1b570f9615b329138d97dea9d708c448148340efdee61e892837aa47eabf3b69baf2b39ad62537e3b774b1d27a1363a2387 SHA512 254be29bd17ab2fd52a6dd84a317ad58677f6a1e821bafb5bc197b4cb819147315a23648b4f829989ee4a8318cb61f10b4e8b745d7d23ce2f395f9069a95933b
23 DIST genpatches-5.4-207.extras.tar.xz 1812 BLAKE2B 53da29109cf54563a505ea1ca636d5762c2030cbca87c3634efb2c0409345962f91be465e1152e9ad7c86e0def9a509574a90ad5316eb680bd451640409502e1 SHA512 f199548293ea31c20ddee22401afa48181ba5ff29a9bbadf6e6b70f3608efa94e2b2a8c1b82eaf921844bb3b50d5bf3be01f94d83218d821709dbda144c22149
24 +DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
25 +DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
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 @@ -95,6 +97,10 @@ DIST gentoo-kernel-5.4.202-1.amd64.xpak 61600058 BLAKE2B c6a749286af905c5193cc3d
30 DIST gentoo-kernel-5.4.202-1.arm64.xpak 57689830 BLAKE2B 725cf3c777e5d42c4134b1ddf2621a06f7c674bcd1ff87a8a81e43f80977259e2f690e416852d8ac29fa92fa4d2e5a1d6d2082f03f9c1263235ce8e5c253ccc3 SHA512 5c71db14007ae8a464628c9effa25166cd4bda5fa159618f09fac5810e8b2bed69a0c94f4ffaafded92ea640c4c61bafeb188148d341ba1a80cb9f8b89475eb1
31 DIST gentoo-kernel-5.4.202-1.ppc64le.xpak 55132605 BLAKE2B c7966d2f141eb2e67a970f21b2fcd896fa249466bbf77b129ddd5e5251f034259774f18e8b5a4d775db9724b8ee45bcfe8f30c6703b407502ab597cd5b92a09a SHA512 8d9f10f5c1a4c5787287db8e492178f64e8fdb45f439c8785919423f2f71d06a24c31dd57223ff2942a8877a64b9d452822d9aa62d3d9caee0be704d961ed278
32 DIST gentoo-kernel-5.4.202-1.x86.xpak 53313873 BLAKE2B e12dffda8574a02c612751dc7a0f58afb875d52ce39a26fe0c541222f4fd3dbc77696e83914754af4b2ff8565c6b021aeee787905963739147426281118c6d5b SHA512 f1774442c1e4479f158e149d6e4d2bef5b5dd9fc3d6b36a2e73092137a4e01b561ad4372e6a48778ef08c265a537ccaab0f296acc610ee22f3ff3d21c5b37176
33 +DIST gentoo-kernel-5.4.203-1.amd64.xpak 61567440 BLAKE2B 7cb004bf0d90e517a1636e984afb21be3408da74afcd4ccd886007dea5a221b33bde828ee8dad4e8fcf120d737be2d7ff4a0780f36643300209e69f996921112 SHA512 a79fbd6ce459265e4eda827063aee6557208c73094bf937959eb265d100a0533083e35276d6df77a8b8a7a05161b292232ac42b18b8a903232f2eb065192d0c9
34 +DIST gentoo-kernel-5.4.203-1.arm64.xpak 57698276 BLAKE2B 2bc0a4eba7ef829a4e705706b7ce33496b8a36d33f0808bc315df45b9d7a00e6aabda71274956b484d394f3431bb22be118c9b37711bd5cc74d6d1d6dfa0027b SHA512 d4849d69a3a6134d260945721b164d74604a4b2e590d1545f7444fa9cfac4f7d8419b8d77dd586c87a52ef4bad3620810993a7161083370e2438b9723f249d37
35 +DIST gentoo-kernel-5.4.203-1.ppc64le.xpak 55132763 BLAKE2B bfba496c86aeb1c0e0826e8222e60fa96a0c57b0b66af485c619eea277ed64fe590ffe0c7932da36de2c2f180772ec6dd5d1925bbdca3d52ec2c9e0ed0808113 SHA512 e598776a8d6cf90d6a92f12af3899a28eca53fe037906c0de5e57f5b8a128fdde98d9453b06e0796d4c4b8d27b5b211db1aa777a0f1636b4cfe73e26be96d9fc
36 +DIST gentoo-kernel-5.4.203-1.x86.xpak 53304279 BLAKE2B 3954403be6b7afb2b9f7e27532fe6a49d240243d8ab04c6262fdbf864e15c681c5ada7bbc44f8255b6a621683ed7e77446a14bc2712162e524c31636a063841a SHA512 e3923650e5bc15a1565f394495c8ccc9e715b53f9c45836bc38be09b9f64cb61a4672cc6163e6a313654d33657890ef6fa51b51475ded3a29763ee80c2d9b13c
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.203.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.203.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.203.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 +}