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, 20 Jan 2022 16:12:11
Message-Id: 1642695115.6df20c1deff1ac88b40b19baca5df66e9bbfe290.mgorny@gentoo
1 commit: 6df20c1deff1ac88b40b19baca5df66e9bbfe290
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 20 16:10:20 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 20 16:11:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df20c1d
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.16
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.16.ebuild | 131 +++++++++++++++++++++
14 2 files changed, 137 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index 86eeb922ab33..eb43cb2b2401 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -20,6 +20,8 @@ DIST genpatches-5.15-16.base.tar.xz 681884 BLAKE2B 49b0e8eb54e610648cc101eb889ec
21 DIST genpatches-5.15-16.extras.tar.xz 3852 BLAKE2B 8e4e3c1404ca66fd2e0c5587d08f000fa40a68f11e7717b1ee5b2c74ce28269da0ff0dabe59235ca4d2581e71bf3b642cbf0346101bba1c6ebb4b214cfa452fa SHA512 5ab2818e93612703d5c39e37eb9f7dea773a104280fcb1c09cf643ef24c691c337cf139d2f59060597f3cb4528efc31793bb577e8cae4ea7d6d3a6a4686bc83e
22 DIST genpatches-5.15-17.base.tar.xz 689440 BLAKE2B 518d67ff7cde6796dd7018ec15e403c094fe029968ff9454cf3595158c1e49215f6df9ed7f7e9fec3e4d4991b32aa0b268699dd4b0da2386167675d48d377776 SHA512 fb9880b15ee392f86e32304f135a46dc10497e7eb61f47c187ab80af5712940e89d50a32b5451669be08ed28a8afb27519cb845d8252ca406e13a187f4296079
23 DIST genpatches-5.15-17.extras.tar.xz 3856 BLAKE2B f9b45f83358962c168d971bed4c73ff1e2c0aa66174f42744babb1ba549a2134cf299dcd33562d2d7977aff9428019051ecbb212e0f9a687a098ccacd8683d6c SHA512 f0c9fb8d40150d8d5ab801d0eb08fc39654dc97e1d08bc6c32c3624cb717f65b12dc387ca0a0422f25216ccb43a0b07b3cfc0f50b7201581b0a9ab428827b2bd
24 +DIST genpatches-5.15-18.base.tar.xz 697228 BLAKE2B 01a377a9c1f2709ad2cde18e3094d37ba2414c7c3d949f236d41f5d36e8c4513331c4859740ec34bc8418d6fb2457fbb7d9f7c64f6f596795e1abc9a02c9e340 SHA512 14a652cf64e8e22539a61f14af715fd1a59644875a8a61473b5eb66bcc7b5f4bb34602463b208114bb4dbb73f159932983d48c0567a44b5090b9ff8f52920eaf
25 +DIST genpatches-5.15-18.extras.tar.xz 3852 BLAKE2B d3521142bf5ece893429ec7e1b6aec724fff15fbba2f80e9fb092af4d40bc258e034226989d2502ee258faa0c7e0aacd885499d22f4317060d61cd916e00e7fa SHA512 f1a98d3875541ec4b8f3461c1af8a9b37fd4f5a64e7d717e906f851bf4e976e4509df4b8cb67b9e210215cc33924d039599cecc8f4892dcbed510e00f8119df8
26 DIST genpatches-5.4-172.base.tar.xz 4281140 BLAKE2B 438ad10331e709a85f1ee2a8907a982cd545579940431220f763b1f68280d007d344627b0d1cf4406e2a439b76d20497e1f4aa6d103bb5569f119bc5174c545f SHA512 faa28b056e48873b41b78b540afe7db3200020f85f1ae516f7949f3cef453eccae9b6b8631d594ba8b1dc1b4d6b55b1e9c9379c4880eb4697bed956b0217bef4
27 DIST genpatches-5.4-172.extras.tar.xz 1784 BLAKE2B 9d185d1ff33c56417bf9cfbe33efc6ce4b743a0ab9bdf419dbee14cde34d7c2d6d17884ace56880f75cc28a16b7e18a5e7b87f110c64bc7c84ceb81c7df85831 SHA512 cee6e49804ebc200dd7e308d2a59bfa0e381428caf69678bb6d406357a86398327a354bc2900096f82a77b47beea7fca7e5709cb390fbc1e0b7575c01d062024
28 DIST genpatches-5.4-173.base.tar.xz 4294304 BLAKE2B 7622b34b82e901d2823f84ef4ccf282a9224dadf5a5248bbdc9b1328aaf476b50df5ea6d359af64507c30623d57a0a61f9205b5d48eb1137a404ef2ca4ec31c4 SHA512 34ce4139ccc9119546a88efb71f46b1172039f536e5072337270ab93b83429b2975a3c9cf4f112f280e62eaf506e62b48f775a4fb772a1a4de8681333be76a02
29 @@ -73,6 +75,10 @@ DIST gentoo-kernel-5.15.15-1.amd64.xpak 69117640 BLAKE2B f70e5078599931acac6dcc8
30 DIST gentoo-kernel-5.15.15-1.arm64.xpak 64054916 BLAKE2B 1ab13fe482b73ff09bf193e1608cde33687bab71a1b299a8a7f4901a1ba16637600f3c5552da815397278cfe258aa717efa1a6627c5e649676c818bfdeb80c89 SHA512 9a7d29f2e0d3014c100cb53b852206e8fcda20da2a8bbe9625eeea0963880bd25e98f8db766698238922b066fedd9e3ef2b243474ddd18ba4a2ec4fa8e9fa121
31 DIST gentoo-kernel-5.15.15-1.ppc64le.xpak 57833311 BLAKE2B 8287b29261abeb7253a9101d280e09bc9bf625c7c8d6a1cd913726802e0993a7b663bc458f1865b5919a84e31e53db03712bfb38c64a39a492b954bac7494478 SHA512 0900ac695da23946a8f8fdeac3a89d5353bb268c284e602b238dbcb547b0b20d92fccfedab3566f03183524fbe45fd55b601c2f5ab017ed4e48a69aa782a929f
32 DIST gentoo-kernel-5.15.15-1.x86.xpak 59888771 BLAKE2B 8b5d77460c9566268a52f2a621ca2831dcfc81a93e275fefd71e6e2f09efcd8457f996311d73282d8bc26b8778652b26bfa7266518b80a4d8ba58ce93b009f85 SHA512 0a5c430d7a2c46d5cbc18bf27507833f3bda9ccf96cd289fd9df52f23e842075f2702d2339859f91814794de8a8a89f282c2991e27dcb29d4f88dd1bb4d5bb14
33 +DIST gentoo-kernel-5.15.16-1.amd64.xpak 69106038 BLAKE2B 78623923862279db4eaf1561fac7caf5e880a7a76a7abd636b25143f79ab0a1a84efa41bcddd0b85d080be4537d7dbbf7c7e7cee761b25836adbcba90a18846c SHA512 3251b45a41c696c047414d7eef2a3cb694d79b5de677b273ef32e45d785cb64b31a2418a621f1f2c306a9c7df5dab9278323671a6ec454085d1b63fc5cab0136
34 +DIST gentoo-kernel-5.15.16-1.arm64.xpak 64049610 BLAKE2B 0d1ca4fc9a688627ccfcba8c5df1834e3788c321a46d9beb8e03521f786a2b5d8d9c5a5d53b45cae81b50f12d33cfff023ac1dbbbd0267d67ab0cd0cb37c925d SHA512 ce6b3741a01df1fd724d92a1543f71a09564230ada4b552bb05eb7480123db4406e25898566080ce81122fb64e94cf04fd161f1d04788b73a641cb213cf677c7
35 +DIST gentoo-kernel-5.15.16-1.ppc64le.xpak 57775378 BLAKE2B 54cd093059112ef1f92eb813be1717757fc398e6c5e8b5b1e961c43c4f585aa385eddd339c73dea161b623194e66df915d580576cfb52199356c18db7245bebb SHA512 ecf60dd546c5a1a63b2dc66f4e368a7a5797b193f382024c372af0a53fc6d1dce33e9e79023bc593fdfb9d0ecadf1e48765852b790024f3b0ac01e696d8bbdf3
36 +DIST gentoo-kernel-5.15.16-1.x86.xpak 59905344 BLAKE2B 6ee3a539d9a7c08f0097a02386aa90afcd576836ecdbe39c9411ae9fa44ccb944e22314cf187362e0116fab6d55c08230d75bdfaf205ecd1ed819aea7e8f81b0 SHA512 94ef702bb5c4c78ed9557e74f1e3acab60a5855f9c0ecdc24e811e61845d5eaac22eb502d9e287ab2a0fe9b591ffe8fad0c0fc53eb484c737fb1f2a0b22a0a7a
37 DIST gentoo-kernel-5.4.168-1.amd64.xpak 61384671 BLAKE2B 8097b6fde83c1e607a04ad2deb91af06a29fed92a0262dcac3cff54a0f46677664a7e5eaedadc2b56b8aec58baf037c4afe2e89d9235a9325bed2177b1d16784 SHA512 a954a1dbbd5f4f600be6a9540d3de48c5ede39fe1216e278ed43180edbeab648ef62a230711912b3f4d756ec31c4b6f20c8642ff0749a8e3c70071e35983ecb4
38 DIST gentoo-kernel-5.4.168-1.arm64.xpak 57633627 BLAKE2B f5e6f9a4105b358b01040d947ffd32f56b7a8ee7cb121be22ca1785bfc3ebca3a75a396093f1b7e1a560931e8c8d9c15dd63f73cd8a78c9b6658360390ee6217 SHA512 707148a9f1395482d5752c1dca293056f989415ab277cd7e33bd540c75df71b42cae97c238a40dd411a168e60cbad340ac48ecb037985b3d465f1dbaaaf3b57b
39 DIST gentoo-kernel-5.4.168-1.ppc64le.xpak 54973828 BLAKE2B 825973a2c3e2ba373ec3085bc7dfc8a84ed2f8e8950a5a9307c9f732d1fe2defe0a9152b51334b87e36ff43ab95af9158b38d1e008fe7a34f2bf5cb1e4f05a9d SHA512 a6eabb0b08d3309d6ea0133048d6fa9d988fdf2e5e0ff2beebbc40df5c6b76256331862b499e079d3f550b0f8bd9539592cd6fb4c16a01efeaeb6aa9e8e3a7e5
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.16.ebuild
42 new file mode 100644
43 index 000000000000..fc9dbc62cb30
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.16.ebuild
46 @@ -0,0 +1,131 @@
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##*.} + 2 ))
56 +BINPKG=${P/-bin/}-1
57 +
58 +DESCRIPTION="Pre-built Linux kernel with genpatches"
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 +S=${WORKDIR}
81 +
82 +LICENSE="GPL-2"
83 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
84 +
85 +RDEPEND="
86 + !sys-kernel/gentoo-kernel:${SLOT}"
87 +PDEPEND="
88 + >=virtual/dist-kernel-${PV}"
89 +BDEPEND="
90 + sys-devel/bc
91 + sys-devel/flex
92 + virtual/libelf
93 + virtual/yacc"
94 +
95 +QA_PREBUILT='*'
96 +
97 +KV_LOCALVERSION='-gentoo-dist'
98 +KPV=${PV}${KV_LOCALVERSION}
99 +
100 +src_unpack() {
101 + default
102 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
103 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
104 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
105 + eend ${?} || die "Unpacking ${BINPKG} failed"
106 +}
107 +
108 +src_prepare() {
109 + local PATCHES=(
110 + # meh, genpatches have no directory
111 + "${WORKDIR}"/*.patch
112 + )
113 + cd "${MY_P}" || die
114 + default
115 +}
116 +
117 +src_configure() {
118 + # force ld.bfd if we can find it easily
119 + local LD="$(tc-getLD)"
120 + if type -P "${LD}.bfd" &>/dev/null; then
121 + LD+=.bfd
122 + fi
123 +
124 + tc-export_build_env
125 + local makeargs=(
126 + V=1
127 +
128 + HOSTCC="$(tc-getBUILD_CC)"
129 + HOSTCXX="$(tc-getBUILD_CXX)"
130 + HOSTCFLAGS="${BUILD_CFLAGS}"
131 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
132 +
133 + CROSS_COMPILE=${CHOST}-
134 + AS="$(tc-getAS)"
135 + CC="$(tc-getCC)"
136 + LD="${LD}"
137 + AR="$(tc-getAR)"
138 + NM="$(tc-getNM)"
139 + STRIP=":"
140 + OBJCOPY="$(tc-getOBJCOPY)"
141 + OBJDUMP="$(tc-getOBJDUMP)"
142 +
143 + # we need to pass it to override colliding Gentoo envvar
144 + ARCH=$(tc-arch-kernel)
145 +
146 + O="${WORKDIR}"/modprep
147 + )
148 +
149 + mkdir modprep || die
150 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
151 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
152 +}
153 +
154 +src_test() {
155 + kernel-install_test "${KPV}" \
156 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
157 + "lib/modules/${KPV}"
158 +}
159 +
160 +src_install() {
161 + mv lib usr "${ED}"/ || die
162 +
163 + # FIXME: requires proper mount-boot
164 + if [[ -d boot/dtbs ]]; then
165 + mv boot "${ED}"/ || die
166 + fi
167 +
168 + # strip out-of-source build stuffs from modprep
169 + # and then copy built files
170 + find modprep -type f '(' \
171 + -name Makefile -o \
172 + -name '*.[ao]' -o \
173 + '(' -name '.*' -a -not -name '.config' ')' \
174 + ')' -delete || die
175 + rm modprep/source || die
176 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
177 +}