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, 16 Jan 2022 17:09:37
Message-Id: 1642352965.901480604154d7792152422ca2c04a8c24931031.mgorny@gentoo
1 commit: 901480604154d7792152422ca2c04a8c24931031
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 16 17:07:37 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 16 17:09:25 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90148060
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.15
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.15.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 13c95c0255a5..9e6a034f8491 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -16,6 +16,8 @@ DIST genpatches-5.15-15.base.tar.xz 662744 BLAKE2B 8eed543eaa9a3c4778d4fb1968778
21 DIST genpatches-5.15-15.extras.tar.xz 3852 BLAKE2B 0329c5eb48a8a7abaa686d62fae617d2a4066577aeaebc787ed2547de293f7203576fbbe9075d6289c774a2c95f26c085b3011df84dbd1d36d6b652644db3656 SHA512 b5930766e7f7b0adbea14d44526f570e058d8121b14b548e50ce185c1c49a1c5d20d2cd9b21c196066b8291b782693cbe38cac9f822ec1c015729e3edbb787f6
22 DIST genpatches-5.15-16.base.tar.xz 681884 BLAKE2B 49b0e8eb54e610648cc101eb889ecd1eac2277a221e1329092502cf387504c07aa4d9c32fda5c32f3801019457fb56847a56725ae54dd48d72f97d2ab2646844 SHA512 5f566308d29bb960a034e4e1817a9c5879f327c728a35d78516a913bbb7ef54044874ff0333827f06ff5a825fcf8fa22d06535f5827867a69a1b725524fe7aae
23 DIST genpatches-5.15-16.extras.tar.xz 3852 BLAKE2B 8e4e3c1404ca66fd2e0c5587d08f000fa40a68f11e7717b1ee5b2c74ce28269da0ff0dabe59235ca4d2581e71bf3b642cbf0346101bba1c6ebb4b214cfa452fa SHA512 5ab2818e93612703d5c39e37eb9f7dea773a104280fcb1c09cf643ef24c691c337cf139d2f59060597f3cb4528efc31793bb577e8cae4ea7d6d3a6a4686bc83e
24 +DIST genpatches-5.15-17.base.tar.xz 689440 BLAKE2B 518d67ff7cde6796dd7018ec15e403c094fe029968ff9454cf3595158c1e49215f6df9ed7f7e9fec3e4d4991b32aa0b268699dd4b0da2386167675d48d377776 SHA512 fb9880b15ee392f86e32304f135a46dc10497e7eb61f47c187ab80af5712940e89d50a32b5451669be08ed28a8afb27519cb845d8252ca406e13a187f4296079
25 +DIST genpatches-5.15-17.extras.tar.xz 3856 BLAKE2B f9b45f83358962c168d971bed4c73ff1e2c0aa66174f42744babb1ba549a2134cf299dcd33562d2d7977aff9428019051ecbb212e0f9a687a098ccacd8683d6c SHA512 f0c9fb8d40150d8d5ab801d0eb08fc39654dc97e1d08bc6c32c3624cb717f65b12dc387ca0a0422f25216ccb43a0b07b3cfc0f50b7201581b0a9ab428827b2bd
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 @@ -59,6 +61,10 @@ DIST gentoo-kernel-5.15.14-1.amd64.xpak 69136010 BLAKE2B 02816bd47f782e5745f6217
30 DIST gentoo-kernel-5.15.14-1.arm64.xpak 64063658 BLAKE2B 9ba5f5b087eb42f653c676504d499e86982dd35bd8c2802093bb3c5db3594e4cda873ad3116010f7e686439725812d447b85eb3634087fe01ba9380be0cf004c SHA512 a067966649016e2af50b8d29ade39ca2ccbce5be8ddff128217874496c807f6f45698935835d23d51375561d762da3d18fe4b2fd04e6f1623a0a292ac18fad14
31 DIST gentoo-kernel-5.15.14-1.ppc64le.xpak 57755114 BLAKE2B c9d2451bc841a7279aa710f0f7f6c7354fcc5b215f44cdc1548a8d02b790c30d896c3ab819931a52b702cc95d7e4c39e94719fbd6c04f57ec51351dcbf73133e SHA512 1ef3a27546a0022d0fc7b7d0b185cdf4a13c61e4e4c464d28ecdf9572147065b7c233f79306e0df80b916490da4406ae710e9d724a83a5ac422274de50af50e9
32 DIST gentoo-kernel-5.15.14-1.x86.xpak 59934931 BLAKE2B a5af79eea1d895f8717025925f3cc329fdd3b7b25a421979102aa2bddb629f1aa1a3d9ccd573b6f5348f9ff6365989e9c3d3423e803ce32650554159122373c2 SHA512 418ded266b15dbe89c4676e22f8be46eaf0f7d86278f9b6f313e89d5663d37dcf1d29f2bb7e0662eaa90d1ac5d8047d5fc5261e405b3545ecab65c7e04d1ded9
33 +DIST gentoo-kernel-5.15.15-1.amd64.xpak 69117640 BLAKE2B f70e5078599931acac6dcc8f4887cab138922fb9c993b67dee02399ad74d6b62354f28aac88194a3da3856f5a432fd473a1d504c7be86aced8fd4c418d0fc5a5 SHA512 63f02e7c6cfbf72777245ceb667d643a638c8239058fa27a5cc5959c5fe27afe715c7523bb11b0e284a7937cdab2d6a37f2c5199078b06066c6662deec20e340
34 +DIST gentoo-kernel-5.15.15-1.arm64.xpak 64054916 BLAKE2B 1ab13fe482b73ff09bf193e1608cde33687bab71a1b299a8a7f4901a1ba16637600f3c5552da815397278cfe258aa717efa1a6627c5e649676c818bfdeb80c89 SHA512 9a7d29f2e0d3014c100cb53b852206e8fcda20da2a8bbe9625eeea0963880bd25e98f8db766698238922b066fedd9e3ef2b243474ddd18ba4a2ec4fa8e9fa121
35 +DIST gentoo-kernel-5.15.15-1.ppc64le.xpak 57833311 BLAKE2B 8287b29261abeb7253a9101d280e09bc9bf625c7c8d6a1cd913726802e0993a7b663bc458f1865b5919a84e31e53db03712bfb38c64a39a492b954bac7494478 SHA512 0900ac695da23946a8f8fdeac3a89d5353bb268c284e602b238dbcb547b0b20d92fccfedab3566f03183524fbe45fd55b601c2f5ab017ed4e48a69aa782a929f
36 +DIST gentoo-kernel-5.15.15-1.x86.xpak 59888771 BLAKE2B 8b5d77460c9566268a52f2a621ca2831dcfc81a93e275fefd71e6e2f09efcd8457f996311d73282d8bc26b8778652b26bfa7266518b80a4d8ba58ce93b009f85 SHA512 0a5c430d7a2c46d5cbc18bf27507833f3bda9ccf96cd289fd9df52f23e842075f2702d2339859f91814794de8a8a89f282c2991e27dcb29d4f88dd1bb4d5bb14
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.15.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.15.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.15.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 +}