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: Tue, 11 Jan 2022 20:52:15
Message-Id: 1641934294.0353cf68b769876c2c2d446ca930f4b23778b242.mgorny@gentoo
1 commit: 0353cf68b769876c2c2d446ca930f4b23778b242
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 11 20:51:34 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 11 20:51:34 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0353cf68
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.14
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.14.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 393f2dcf8078..e103f0623cae 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -12,6 +12,8 @@ DIST genpatches-5.15-14.base.tar.xz 639672 BLAKE2B 93976aee6245c420aa654981538f3
21 DIST genpatches-5.15-14.extras.tar.xz 3852 BLAKE2B 09bb1bd3fffd353fe5454a033000632f9c76ede889e8550ddcdd507651e427e6b55fc65329ba89753b8b0d4e4bf4988d3c3e54a54cdf01e54b0e200d38fcbb68 SHA512 61bfb0e5d1f66b0b6b689c8e4474f22b8d2dbebd9233ea139c6da870cdb76c9a1559eb1469f91f4c3cc0eab5f2688dc7b843601ac10bf989bcdc3129510e06b2
22 DIST genpatches-5.15-15.base.tar.xz 662744 BLAKE2B 8eed543eaa9a3c4778d4fb196877820305dd0fae7857c719fd68f04b2fe7fb0d6b7e19ae7a157adc7cd301f0e7f35e8c0fee7bf58f4104c0a802a6e2e2f6204c SHA512 f0253d9cc063a8d29f3796dfe1eba7109ba89340d1e4178149c4786e36bc01e12f00a48968b9109438ea349b1ca1f486ae35d0103c08577892fcb83befa514cf
23 DIST genpatches-5.15-15.extras.tar.xz 3852 BLAKE2B 0329c5eb48a8a7abaa686d62fae617d2a4066577aeaebc787ed2547de293f7203576fbbe9075d6289c774a2c95f26c085b3011df84dbd1d36d6b652644db3656 SHA512 b5930766e7f7b0adbea14d44526f570e058d8121b14b548e50ce185c1c49a1c5d20d2cd9b21c196066b8291b782693cbe38cac9f822ec1c015729e3edbb787f6
24 +DIST genpatches-5.15-16.base.tar.xz 681884 BLAKE2B 49b0e8eb54e610648cc101eb889ecd1eac2277a221e1329092502cf387504c07aa4d9c32fda5c32f3801019457fb56847a56725ae54dd48d72f97d2ab2646844 SHA512 5f566308d29bb960a034e4e1817a9c5879f327c728a35d78516a913bbb7ef54044874ff0333827f06ff5a825fcf8fa22d06535f5827867a69a1b725524fe7aae
25 +DIST genpatches-5.15-16.extras.tar.xz 3852 BLAKE2B 8e4e3c1404ca66fd2e0c5587d08f000fa40a68f11e7717b1ee5b2c74ce28269da0ff0dabe59235ca4d2581e71bf3b642cbf0346101bba1c6ebb4b214cfa452fa SHA512 5ab2818e93612703d5c39e37eb9f7dea773a104280fcb1c09cf643ef24c691c337cf139d2f59060597f3cb4528efc31793bb577e8cae4ea7d6d3a6a4686bc83e
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 @@ -45,6 +47,10 @@ DIST gentoo-kernel-5.15.13-1.amd64.xpak 69014252 BLAKE2B 2552baf934bc422247add85
30 DIST gentoo-kernel-5.15.13-1.arm64.xpak 64045786 BLAKE2B fbf3147fbeae75a3d56177155eea889a65b965e6e9eb04a62ee25951e13a8572a0f681fe02a9c5a5a88f86b5fd5f26d82617c851474d97698fb632408cdcc090 SHA512 84363a3863fbffa36b9247e758f7b594fdda958270c59eaefe33525352c7009bc7f4355f6aaa4a184744a8596735803f0c88a9ead54aa44e345f1cf73f6fc2ba
31 DIST gentoo-kernel-5.15.13-1.ppc64le.xpak 57928928 BLAKE2B 2183f41f524b84e8dff90d886ea764a66b058f258767a318154c994336cbaf0faa9f496a014479c3ee338c58628fce7d7f595ca7085dad195ba605b36e30268c SHA512 41d21261009a1e5a47b6ba9e2ae89cb764cf6ad6f55aa08e748477e3821aa775f750416c05e28e1324eb5cfe090d1c6bc583adbf131a7117b40a781015e5e76f
32 DIST gentoo-kernel-5.15.13-1.x86.xpak 59901223 BLAKE2B 737281b1c3721880d29125e1d1089bd8d15583c58aa819cfb5c4229c73ac18a45de61fe2614d9ef54bff768ffbd00f4bd133ea7319f58b22145c09d3ebb20298 SHA512 29c4c1d53395d5e7c63e79d2fbc3ecb8c9c9c4f5f024261ed256fbd9815548631e91405d1586a227c5a37f5b85df27c44bc5a601a5db38d56fe7d67bb36c1526
33 +DIST gentoo-kernel-5.15.14-1.amd64.xpak 69136010 BLAKE2B 02816bd47f782e5745f621740e9f764136bca2bb025c44a8c109a86cc81bfcba4630941b84193a032853fbaacc2474c5102f8852cb3e9d39147e996a781669f3 SHA512 0c3da89cd9a96ecf3630c5017fd8c63bfbfec121d3450e829a9b9bb14d7d8c9500b35e8fc645e8e1e5bd487382c67c925379d5f62f7e090debea76c1dafbfc50
34 +DIST gentoo-kernel-5.15.14-1.arm64.xpak 64063658 BLAKE2B 9ba5f5b087eb42f653c676504d499e86982dd35bd8c2802093bb3c5db3594e4cda873ad3116010f7e686439725812d447b85eb3634087fe01ba9380be0cf004c SHA512 a067966649016e2af50b8d29ade39ca2ccbce5be8ddff128217874496c807f6f45698935835d23d51375561d762da3d18fe4b2fd04e6f1623a0a292ac18fad14
35 +DIST gentoo-kernel-5.15.14-1.ppc64le.xpak 57755114 BLAKE2B c9d2451bc841a7279aa710f0f7f6c7354fcc5b215f44cdc1548a8d02b790c30d896c3ab819931a52b702cc95d7e4c39e94719fbd6c04f57ec51351dcbf73133e SHA512 1ef3a27546a0022d0fc7b7d0b185cdf4a13c61e4e4c464d28ecdf9572147065b7c233f79306e0df80b916490da4406ae710e9d724a83a5ac422274de50af50e9
36 +DIST gentoo-kernel-5.15.14-1.x86.xpak 59934931 BLAKE2B a5af79eea1d895f8717025925f3cc329fdd3b7b25a421979102aa2bddb629f1aa1a3d9ccd573b6f5348f9ff6365989e9c3d3423e803ce32650554159122373c2 SHA512 418ded266b15dbe89c4676e22f8be46eaf0f7d86278f9b6f313e89d5663d37dcf1d29f2bb7e0662eaa90d1ac5d8047d5fc5261e405b3545ecab65c7e04d1ded9
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.14.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.14.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.14.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 +}