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, 22 Jun 2022 20:01:24
Message-Id: 1655928071.f97101b2ea9dc80d2cb5dc92999457f3ac2d643a.mgorny@gentoo
1 commit: f97101b2ea9dc80d2cb5dc92999457f3ac2d643a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 22 20:00:03 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 22 20:01:11 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97101b2
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.4.200
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.200.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 29129c32a8ea..672d0748efcf 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.18-8.base.tar.xz 440848 BLAKE2B 8a965867409cc340b13687eec9c739
21 DIST genpatches-5.18-8.extras.tar.xz 3924 BLAKE2B 3f575b12166621c67c9cf6ee15a76af551a039d142a85678abc10829e9a573641be8557b9b606352d46fa4d123e95071b2946447a6f53afef5b37eec5f342cf7 SHA512 7aab8d9d18dfb6129ee0e995450c9d9d759545a9fa2cde1d26dfc03d677b9133a310f3943cd77b5981830a6a1cff59463e85759ef5cd68bcb2838dd96104f590
22 DIST genpatches-5.4-203.base.tar.xz 4798932 BLAKE2B dc918ca3e7538b66b87a8bd8d2c673f56b71706d913007176de20014a2ebe38889541aa3441af7f4d6db69044779a1e54dadc122e59d180c15fe5131b8056aca SHA512 975dd953d5baf0e72e5718dd4979657597adc380559f41e769e94d294a08b272ba06080517d134a3b2611a6d4779cc3d8b423d869b7dec5e6c43af0634996871
23 DIST genpatches-5.4-203.extras.tar.xz 1812 BLAKE2B c4f67f3fcd08b6d845c7fc6174a747e805ee2614ddc2733771cfeec8df5535a7e0a6b8c3528b23c7cd1127765094deb565d3e1b96bda5d1882510cdce4b050ea SHA512 029f4ba2b1fc2c581d343e9847b926ffbcbcd1c0a5cc45c28f35f2ca1572cffaf6ce75a9bfb42d2cd94f6a93ab5bdb8a3297636ddeb4be4afc66efa87a55d7cc
24 +DIST genpatches-5.4-205.base.tar.xz 4658076 BLAKE2B 172fc1760b7636d6d2de9014c36f792e7e85f81d36748e7fed87f6784647e3488acb401c26abead8703319616c83ed09bebaceb47f8f179b91ef3af3a2b4dc37 SHA512 03a2368388de8fa0977f0af58234060d2ce156d23fa5d954e49791182ad78d2bb66c7abe319323f184c3d344915083c961c8d7646f2ac7faa56d85a21fcb7c9e
25 +DIST genpatches-5.4-205.extras.tar.xz 1812 BLAKE2B 43a42c678c8788065209ca46d4e621f4f73493ea40c37cb39871a7850547572cd1484f56e67b08e34a94fcbf247f827a750d93c4cfb126bfa1a8bea852afee03 SHA512 95340a3d7098b312a7df149b98fab683d57c0a06e3a2c77facc6611e61a97eb8e820894a5cb5171b54d5f7b276ade96a83a229e60103047e2e67838afe518090
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 @@ -23,6 +25,10 @@ DIST gentoo-kernel-5.4.199-1.amd64.xpak 61557691 BLAKE2B ca249eb416d775e208023e5
30 DIST gentoo-kernel-5.4.199-1.arm64.xpak 57705946 BLAKE2B 882c6b7b3444c2acc04379cfdf9d70d373c04496f9c16788e1b150851c7f64b76bb02e1fa5b77051ad50eca623e0bebc3066fa398622d82b24b6535158817cc7 SHA512 625852a1a45afdf0436025fd1984a243ab4b2de1e49bdfc323b568f7c7e0798d4e88677fff90cb83b4ab25cf311cd7d2cd818484880c9e64dbaae414495235ab
31 DIST gentoo-kernel-5.4.199-1.ppc64le.xpak 55122976 BLAKE2B 75bd061e50e6528beb4436072b4d13c9f224ff56e05c08ec971af8d03a4b8a0e93bf1654eb82e78403af7e247d532a707fb5a8af9c47aa4b7996d5ee839a8ad0 SHA512 d10eacc72d067ed7546c6622248e2dba8a713794457cfa1b2e1ff318fe8d48793c3e6e46cf78101191677ac656e5d9960620bbe0ac4d721a36111d9f9bfe8de5
32 DIST gentoo-kernel-5.4.199-1.x86.xpak 53305530 BLAKE2B 8f4b0cf3d03e113d1591d146af74d8b3753c7bba2d3b6ccd07887b35737490eaf629eb1bc137a8b10537fadb349a6c2ac4ede5579ab8fd2a6645b9ee6a2f1022 SHA512 90414676397445c2f25e7469f140efc1643912eb0b3d855c901178b0b7d5ea37d564b316a22f9c8e8f1893a5f4387eb5171aa4698903ded0880937dfc04048a0
33 +DIST gentoo-kernel-5.4.200-1.amd64.xpak 61492508 BLAKE2B f4da67cc164b3c6487329300236049c02daaaf413f009738636822d44274fc0374217ed082e17e301200c5773607a55dcbcca0b7285537a1c4e87e1626f023e2 SHA512 a6072110acdf09f8fa1d446a96ab56ccbf276d220e7a970d5a99f2ae48bc43d31e0f28faad8df7dd44cb739a5f9f5aa06cb3258af7c93a4efb9bf3db2f39dbc4
34 +DIST gentoo-kernel-5.4.200-1.arm64.xpak 57634591 BLAKE2B be19c7faeff935a788ec86e757ee68e1a808062ebbcc4e3604ff0ac32d4c81267e5709eccc0c03d4dd0ebc67d2091e57e1357ec1e51b199b10b62029b579bbb9 SHA512 66c426cc88c768d2c4d4bc43a22318042a2dfa143b8040ae1a7cb4d9725e989a86e65c927e448bfc217dc79817c5840b02b664b6ea94468e28b8b3ef836d0204
35 +DIST gentoo-kernel-5.4.200-1.ppc64le.xpak 55099454 BLAKE2B ac1a3e7d2154d92844505bf6a73e2183a5894500b84bea99457c80bc9c31570305f2f66f96833354f813bab87b0d7e317d1d2a08d7a78e50f69680692cc4c66d SHA512 714996d9c68c14ceda70d04a3d14ffe7be8b23d880c5383f1d60f1d01e3d2774f556714bf6b9a74e3316c1a50de92dfe70f0b59dd325184457e3f58a65aec085
36 +DIST gentoo-kernel-5.4.200-1.x86.xpak 53257427 BLAKE2B 9e2d5c5609c2932980ddb32b969a069ec25d82ed27063ec967dac778256e8ee752ac98419f983c0f92ec9de03e1a01c7d802bcf876953178c81ed804605a2372 SHA512 1e0a194878cd527c5b0c625617703f19e872a49d74725502ef2a14d8ac3c9b22dcdd86442eab5f9dfd47b43142b9db2b909666cb991dbaf5e15faeeec70fa091
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.200.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.200.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.200.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 +}