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: Thu, 25 Aug 2022 15:30:54
Message-Id: 1661441433.2a2380990e5751dc6a4249b52d4aaabf1b988e7a.mgorny@gentoo
1 commit: 2a2380990e5751dc6a4249b52d4aaabf1b988e7a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 25 15:26:43 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 25 15:30:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a238099
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.4.211
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.211.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 342feca837d7..e4ea14cb48c4 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -28,6 +28,8 @@ DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddf
21 DIST genpatches-5.4-214.extras.tar.xz 1812 BLAKE2B f82f9d703ed7fafa1abae01e9ab15db88b318ef84254360d105490bc727244795064fc6b21fbf771626da9adb62aba44a170165518fae58d8adfde7319e1971c SHA512 a3d8f94e4d9b7e5c29be7c1b336273f89ed38bbd4c21e6b34a51421ef71581a6e8ecc15751fe0bd7dbc1c98a754d1491304383f21925c0018b6e57891f76f303
22 DIST genpatches-5.4-215.base.tar.xz 4945872 BLAKE2B 7a0e2098f86258afe07e27a460aa8602f62fe646c918668d0f1bc03307e009ea275de198445c19a5e0727c459bdd00379c1bf86eab44265eb73a072e295b82ce SHA512 dcd26f17ecbda5b2918e98f5cec369ff9e98fa323ae39f0172bf771cdb2125312d93bbc2f1d5f46cb9ba381ff9d0fd339ecc0eac8000db90c8c2b0e07016c313
23 DIST genpatches-5.4-215.extras.tar.xz 1812 BLAKE2B 26646412d59a947f1ed77792269296818ed1189aad3f30748e877e947119bd87a6a916f3ecb61a6effaa7346a31e1844eba123144e5055e5567e0be315578225 SHA512 bb45c3f3c617c9446390c15296e02ff0d01d67d96ff8e941fe14a1658e2e6845f2918f2c716cf7739dc5a0bf2dcfabb19f55bb77f51ee8a7b34c5ed2b263a959
24 +DIST genpatches-5.4-216.base.tar.xz 5015752 BLAKE2B fd736588b9cbf9ba0a48ad838a17eda669e56d9d0ec4dd903f5bcd31ffa2c428d14ebc7bc35a709b3da7bf7f22403c5b01a9314dda60ef955d7674af836e2481 SHA512 62cd9deb29f863babbc9dc5116e5c5bcb34c0f29325276da80fc9b040004ba9fcfcde380779bf8ea8039f3098da88c59e7fdcd2d0f6d6aa5034df59ac9b55914
25 +DIST genpatches-5.4-216.extras.tar.xz 1812 BLAKE2B 7dfc1025fc395883debc819c3fd5840c423d8b3f1973104906545086d35a966551fec967da9ec976257e231c4270c7b091e7641353f89c254c974b848607e5fa SHA512 aaa70a72cfe0989f5ebf2e3f57cf55c6faec4e2c605fef7ecfd425c47574765fc0a2ad5a7b9fcfe33dd70060b52d4dcd44d2849fa0fe203612c0ebacd2b171a6
26 DIST gentoo-kernel-5.10.135-1.amd64.xpak 67502330 BLAKE2B d138fd2cd1ff26e3256277b8fd2b45037983b0956947d64b112e639cb555ca1c4de055abdbf96c12d00eadc6e32a607ed1bbb45d9b3374a67385d5889b433fcf SHA512 5bfdef5d83ea108f12b21cd480f1b35bed751c56c42347e3f54a4f73bc3dac14be61c2133ce581e3cac685c9a4ff40d5f26c79a0117c4b1858df35c0cbd24816
27 DIST gentoo-kernel-5.10.135-1.arm64.xpak 60985844 BLAKE2B a8e22cec67675594160e7f661a3952e59a0c53338164f70b23b9acdc8a304b1414e188fd51bb96de1972422654c966a78add201f38d3f2f3de3f2745d934ea97 SHA512 c5189162285035a036e23e5075554dd5aab1e8db9df6425f3409455cae61dd5a43a97fc3a47f287699399242ec4f841bb35b5e5f441d491f7de72e7448082326
28 DIST gentoo-kernel-5.10.135-1.ppc64le.xpak 55988769 BLAKE2B f77eede27c91ce30fa556abc8a2e7af42aa984d8e5b973d0e9f3fde77c05790ce891d44d76d6e8c7fdbff608e3be80871b3afdda3b30c36abb3127fe9007c28a SHA512 05a09e9630c427b23905cff1074d4007ee0aa4391752419dba4e0f3dadc6fe913b394dcb76424e303943df54fe14a7ac8fd10d9755cf77dee64f2672c87b3322
29 @@ -88,6 +90,10 @@ DIST gentoo-kernel-5.4.210-1.amd64.xpak 61539075 BLAKE2B 96bb8b29f443ea35291e19a
30 DIST gentoo-kernel-5.4.210-1.arm64.xpak 57952623 BLAKE2B a20d8fb5341ac1cc29bc3dadf1f801aa60e1c0c3f6dc945e7d2b353fb280a8a5f6a61d8382665a4fed9623d5f4e4c8d4bb235352e73bcd4de18a826b39820327 SHA512 39a22556df9e0ecb2d63c20737feeb208457338c0dd8b2594df6bab79630749b324c91895b52b95c86ed58c6d485a30932d4bbfc47e6b08aa0624753665797b4
31 DIST gentoo-kernel-5.4.210-1.ppc64le.xpak 55243633 BLAKE2B de0876fecf91a05f9267e9e1b523ed99282ab82c04fc2f8213aebbeb175492287860c273b09593745361ecb1ffeeb68a16232f9378c3a85c1e9aa885851401ea SHA512 b81e51ed7767f42a0fb721834bff72fe0a1771b33a1bd00d5ce29fdddbead480e1150d2a99df00e40e8c7b2e2724e9ecba32c34cf90a074217a8ebc9d11e52b9
32 DIST gentoo-kernel-5.4.210-1.x86.xpak 53326404 BLAKE2B 76034639128d131774462f70fd2e4db8b215929b583ffff99c5c8d9d567d1178e6350476189eca092bb685531c1c7b7a183184ea33b4948e24245bfb3f2d7000 SHA512 74bb91b738cbc51002aec54e9f59e01330a761b07de928ba93476b9908db025b4d0d5c994cab47f9c8d46ce4ebc66fbfea0b7e10d3124166297a1470ed3d70fa
33 +DIST gentoo-kernel-5.4.211-1.amd64.xpak 61552101 BLAKE2B 155a613cd985a819a8c62ed82a882b6da8a2ea4a4e728533d2eb499bcd0abf4202a8f2d2b0337c3bc0e7e082ed6e6a4ea7f8b394b50fd7b37e493bf53171664d SHA512 40d913186bcb8829f55bf9899641a4064932144cc16595adeaa2262b35014996c1dd0d95a54d8e6968d83bf24558eeeed87f09b2b7b99c55a157d5f37e098d49
34 +DIST gentoo-kernel-5.4.211-1.arm64.xpak 57941206 BLAKE2B 2ab52e0a114fa683d9ae6c0cac7d196e409cf00b61ccab1e7abf8ed0ff274d4514c03d0162bef4a79b1f9ceee5b51e647ded4be3d006f55111ba56020ade0f9c SHA512 d4c1439f8ed418aa4b073e9c9ae0d8b0972fd652244e489d6fa9b222b8736bd4ce110f0f7fa1182c3b658a07fcc1cfb5523b27dd13f3f7e7a33a164c5765118a
35 +DIST gentoo-kernel-5.4.211-1.ppc64le.xpak 55270077 BLAKE2B b322db72bcb47b2a3095290e4be922b11723256150eb6882beb19a64b1b47a5fa8dd033da887964411f8e5481e573f7d00842a0bf959f455a6b36ef3f56610f9 SHA512 900ebac4442e3c92e09d33818d00e9869ebe821185a757f62a030eb3822190b91c2f1f672e66192635ae2bab18505ec5860f400db08c5f14c3d916f929a2de71
36 +DIST gentoo-kernel-5.4.211-1.x86.xpak 53322109 BLAKE2B 4927986f3107fa2ee714028a354542ee52a19037889fe7c475c4f086e46fee61794a4b01cfad297533afbb1276d881dd7ea84764f9875301d3579af08978edf9 SHA512 caa4a5456f26490f5029b7c2ca4afdfbacdc0919ee285b13dbe2abf7ece3372a4093ce3651d1e9b1d63b7aa35a18d13231dc177f0230816f2bfa3f24df8000d9
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.211.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.211.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.211.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 +}