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, 31 Aug 2022 20:47:48
Message-Id: 1661978858.0c08c6016b1beb567a5207daaa01c9f8351bfcb7.mgorny@gentoo
1 commit: 0c08c6016b1beb567a5207daaa01c9f8351bfcb7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 31 20:47:00 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 20:47:38 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c08c601
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.64
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.15.64.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 fff1f0b62786..d92508632430 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -4,6 +4,8 @@ DIST genpatches-5.10-149.base.tar.xz 4094572 BLAKE2B 45a25b910fc88f030d97ef58709
21 DIST genpatches-5.10-149.extras.tar.xz 3868 BLAKE2B 2667cf3c9d447c855b6b6cea4b9100a300077fe74eae84b69fa0a6ee861c787e44e96518bceb93f1c2be83fd8f04251ebfca673dcd9da4ebf2ab98041a3dee4f SHA512 73bda9933661f78482eaa048c1467d1f3acbef606676547d1ef3c64c5ff95475d6d40153a47f247868a2cbf697e5a4d21d58b57b3be6763ef3de869c31b5ede6
22 DIST genpatches-5.15-67.base.tar.xz 2856328 BLAKE2B a92c3afb5e0a6605587744c68b3bec4c63848e0c09469d99080258d97d3e96a0adae175600d7dbb00e566f4383ab00c6981585acf343111218aa21e503901f7d SHA512 3d100c04ce9e440177ff2156b8ce0c0443414963a47fc1c51a86a08cce998ad0b6289e70455ecd2965009226036486c1b6ee3768b1782aaad976cd144f9b48cb
23 DIST genpatches-5.15-67.extras.tar.xz 3936 BLAKE2B 168a92a9db40e6014864a96aff71fb87b351d7127c5eedc8e062e753ae65d7ebc628e9b0eded328f17e88562592d80522ccdd31a549c8104aee51e2833f81134 SHA512 0f2bdfa87ec2a610870089c903b301dc86dac52f4969386074a439be90674c4835800cf9250d8844b1ec3df88cc8dc0b31e4582ea309b7c817066a1341c692b2
24 +DIST genpatches-5.15-68.base.tar.xz 2897744 BLAKE2B e1aebd74737e787df999aabb0153b7aab4b5df05d049e9a6260a3bacf8e827b4f767fe6fe8d07bea71a0e5ee7655d864da67736c17756ec1119a66fc58a4b82a SHA512 79996709882f76cae25639f273f2829d5ae671714f699008d7fbed68595e7cdd93e9d79c801e9f1eaf6ea89fbfe9df3302773e6f728f8cb5de4bd69b36fea65d
25 +DIST genpatches-5.15-68.extras.tar.xz 3932 BLAKE2B 34fd77b8464322ad369de5b86dd8dc83ce7510bca139d4e6036b0b2ab34d1c80698b5f965e44a09dd25ee3b4d80abbccc5920e7984803be2451281c74ff735ea SHA512 970a1e5a03f786d05bb1ae9217a467442f16344fffcf2c77a2572c6db656b0fcd5b3329eae193999c47bbb45c8b02f0fd9010760ef74a6aacc474729f0ee9369
26 DIST genpatches-5.18-23.base.tar.xz 1206204 BLAKE2B 12a7b9aa7d72f27e64c4cb8f5607529dcc7d535a9375768e065d97d0b70b0726271b70dfa4ea019bb42606ddfd513b70357b2bd5ad95548c9eba9f91041f27b0 SHA512 9a459e3e8cb4a3285f782516fbc176a4a73c151281bea2258f049ec0662b806eefc54cb6e9151cc968e3a9c39789062c207d514920559954db9a10b53a1c2f0e
27 DIST genpatches-5.18-23.extras.tar.xz 3924 BLAKE2B fad401fd783c72bd695425a106813ce8396c6d15154fc627fb456b16f6ddff1f6326f54e1399c1369b6da5e3f57da89bc9e769bcbb5d4b612465fe187145ea17 SHA512 c25a09e1e2ad091e5f8480419e921e8eede512dcc6aeb46792a92844948eea5890c5ae8d164ae9834356e00216d3978cefe5f07b046cbaa30dfd4af73a1ddaa3
28 DIST genpatches-5.19-6.base.tar.xz 595780 BLAKE2B 87db7f493d421ed3f0991278f16aeb984485ef5f5ef390d18cc37b27e2dec27704c1575e5ef0a475da6a5e87d68a119899d4a827c81a368c255d45887ea8a681 SHA512 2af94e970216f5297ad791496d6245fab8a0c037d5dd57161f2428dcc9c742414f0073c35be515bf6714a4962f7cc13a023e590e15902c6d68921e93a8bfeec3
29 @@ -22,6 +24,10 @@ DIST gentoo-kernel-5.15.63-1.amd64.xpak 70784280 BLAKE2B 6f1c431dd478c0613b4a41e
30 DIST gentoo-kernel-5.15.63-1.arm64.xpak 64186381 BLAKE2B 09f288e2d2dcce3650b6f55ac185e7b0f5e8f61ef9ae8b103c26b3f34047ad4995c8a43fb937e0d4c5f85bdc08923774248f7a2deb0ae7173e57288f0e6db219 SHA512 b9d473bb67ff9546cfd4b86bbf558f96ad0fc72d810bce1c8e157ea5a6f83227f3aa6f4016d17576fb03b4aaaa38cfa63b37588d49554ba4edbf1d77127f2025
31 DIST gentoo-kernel-5.15.63-1.ppc64le.xpak 58094860 BLAKE2B 1b7e0f7435d8b99439d9a0da608d3721e60796d21ac8cddf7a2dda4970774c9a36148ca98bf06a027fc0ad027ecb1679db232bb343aba8556e77cc565c799d55 SHA512 368c6f13db28341fea141038587d528ae1e0e5cd0864bbda55ae82070082988e9c861ba7e36c947df81c0475616b8a896207953c536b687d9228b30011b74feb
32 DIST gentoo-kernel-5.15.63-1.x86.xpak 60131207 BLAKE2B bb3f0fcdb48e20214ddeda84fd57a1f753249e79b2581e8f44914c05736eea3638eb573e43090a99303882d8c5d034bfd17d0f287fbee836a290859a8036508b SHA512 17ed092f7f1706ed69a10a850c6f964ffb1c49a36d45c21dc36eea529ef6d6c619d334c1a55e5906c48e951b5b592d9e4f5b205456bf881fdc51fd448fecb745
33 +DIST gentoo-kernel-5.15.64-1.amd64.xpak 70812783 BLAKE2B 8e48507ad47fe72a7a452865427124f355eeba187ecfcf2437248d31cae913f058fb366e2485898acb56f0a7ca501060c47ab7b8813b0b522bbe88413f3a6261 SHA512 00e942505dd58ad1407c8b1765c8e81f09ca9bbb6b86458f5c47ce0d63f19c132c723283e608a0e8f5e3c561b56235cb49200e6fd96624664e5d79df83437fb8
34 +DIST gentoo-kernel-5.15.64-1.arm64.xpak 64210219 BLAKE2B dd3fac15e4753ddb900750c83747d1216c487f9dd0c69e3a4f0af98f1aa81dec8502ca8be33b2d015abf4633b160ef87523904f549882006b12f0deb4314e0ab SHA512 167aa3868086fc411d3d6bfe493f46d5f8f675a04b3ae8f1940c8ac439f1ec127657f2f7f6c3530ea6319b016491edb2a2fe0d50de2a4569ac7427b1db5a8b98
35 +DIST gentoo-kernel-5.15.64-1.ppc64le.xpak 58139911 BLAKE2B b882b0f9f391d15d1e11305d853bb20ff5cd014b45671811fcd2346429e15cf4e14a207433eebd1bd148d1c2a2fd696e3c7e8d44b654ae9333fa2b46e422bd0f SHA512 ba9e5c0141f44661dfd5c680116f53c01e36349c38f58db7c5599f080e8a26d53a6513ef4ccfab82b5d61d7f941ca71f77e4e244b76a337df43aa3d81a63b6b0
36 +DIST gentoo-kernel-5.15.64-1.x86.xpak 60122805 BLAKE2B f8917689903f846e0a7f4a5d9810910c2d7701cbcbf048c01f6f95e0932e4191e590df4207bdae22f1c01c785ddddcefa4411a3afe52a3a3feb04774117cd64f SHA512 5f1c6fc2f55a0616a6a5452da6782870512b0dc3adc7419cb34debabf46ca1928763694156a1427e49fc4aeb5c67c53ef5a525f89133141f5ffec2e9aa99db15
37 DIST gentoo-kernel-5.18.19-1.amd64.xpak 72942561 BLAKE2B 0717daf1b59d2104cab1f879df588ce3900d34c5819d952bf322bcce3910688b7dfb590dcee73e493e6c9e32b5b59f8067456ac5dabf63f08685e9425c00c5ee SHA512 e0eeb797c0c9123847d291b9cdbaddf125a747d3aa84bf755a6e6b09fde936c211ab6ce632a294b0b88f977f962b3fa974dd5685bf658ddd14a11f7d0b881b35
38 DIST gentoo-kernel-5.18.19-1.arm64.xpak 65272358 BLAKE2B dcd3464d63d93e74ade936979ed4cae9e44edd2607ae252ede6f60980902d9ea222d346ef9007a391ff5f2a856062be8261c8e7480605238925228c467931028 SHA512 eff2578748b3da40320adf59db967778e3e5a31d568436ee119bea390a756c050968f7f60c7cc33c5ae270d98d31cdcc9c39fb5ce0cc1b38eda8671325669b09
39 DIST gentoo-kernel-5.18.19-1.ppc64le.xpak 59519114 BLAKE2B 9fbe2f5d5f7737901f23ceed8c6124d17ba6fefad96e49b2868030c089822159d857a7dd3c3aaeb4dd15a3f96a8c84afd869bf1da4f06942c7dfdf2dd70337ca SHA512 9c055379dba361cc4433a7972cf49b16f61fa3b35272449e4481e5bba0db6a098a8361b6c4df2c667618c4592da12c39eeebfed81487a4a8fe223a2c4d5ee52a
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.64.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.64.ebuild
42 new file mode 100644
43 index 000000000000..0787e9b25ee5
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.64.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##*.} + 4 ))
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 +}