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, 01 Dec 2021 16:33:20
Message-Id: 1638376389.a455dc68a320adddeae5056396f0d3cfc897a9f9.mgorny@gentoo
1 commit: a455dc68a320adddeae5056396f0d3cfc897a9f9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 1 16:23:12 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 1 16:33:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a455dc68
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.6
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.6.ebuild | 125 +++++++++++++++++++++
14 2 files changed, 131 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index 5a2b05d46a11..3383473ce66e 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -18,6 +18,8 @@ DIST genpatches-5.15-6.base.tar.xz 300776 BLAKE2B 1a3abd9e88ee1bbadf68e0a7117737
21 DIST genpatches-5.15-6.extras.tar.xz 3840 BLAKE2B 0c17070891e0184c34cf4f7c28648e7ffdc56992bd68113735b1f90bf0b46330d37239d4f4a8448de315e1cf2741e3c07a769eb8aad57f1ba9ef107dd8c30241 SHA512 aa484998b7789569896470d1fedd282445aa71a945b1f4d5024acfa80b6c16eb199505eaa089f7c0afd6c26eb3fc5692a890a3c0ffa912e9fa0e2ed5808d3452
22 DIST genpatches-5.15-7.base.tar.xz 390456 BLAKE2B 57db165ca26013ab19c546231b6ebceccb056d66b5fb3686e21959455464dd1802e51fa5d7c6d179bcdcc6c4e08dff63112d7fe6ffe513bbf7519f51dacceb06 SHA512 aa1dd9e723a275bc73c3efae6b2402515444fa8b15f89b2cd940f50bf7e0603724c6e9f25b9573266a3e7165ac4b8c9fbb40101e08f2b76e80827d60db288455
23 DIST genpatches-5.15-7.extras.tar.xz 3844 BLAKE2B 76fe168f8b4ef235c0aee9f1fad698e25e2f59a73bdddc04a9d0b1465aa033386052e9669ef7d0948accb8d86cac5c2ad0b6184ce757cd7171452f698ed5c3f3 SHA512 d36687bc6f48adaa584e0d856cf824cbe6284a63bd8475a42a32bd0236660b55a68b40ea25195948e8985376890c9becfc678c02228c111ab32d6d2b6df57f14
24 +DIST genpatches-5.15-8.base.tar.xz 440264 BLAKE2B 284e426656ce3318a0e8e1c7a05c27f9ccbc27f5fefb8d9835937ae821133757dfa29193c9dc711c6639891a76d159f4a3e42db2a6ee24938005b2bc2143d3ce SHA512 d16462c151c932b68ed71edb2095f590c8c7046200e05c65817de68a48b2b281bd83159720e1d94efe22fa29f83c07ffde46a1c91c39be5ecc7466eee254fa09
25 +DIST genpatches-5.15-8.extras.tar.xz 3840 BLAKE2B 2e14bbe71b25a68d304965d273923b4be3032e6a03fbb085bce05a7f83ba65f8ab60b4b3661770491b75bbb01e56188252ec3ebc2756a2bc0270ec4c4b54bb25 SHA512 08ece5de15fc1d6bf1af1eecd0f638e7d9831ca646e34f9adb99b0e6da7ff87312f25125da3fac18ed21d05d49b9d6262cb41d7811469657678995f2e5139fc7
26 DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B d264f2a3cf61b8ed2a297bd8a3fbbc3aa977a6651e42f8d9a8f8773dc9bb6466358fc5d20537b67f826a66a1f1e28912e8454b3cd04dc337e838f18ae28e32e6 SHA512 f90b1d2dd335e25cef4822dd9663d27eb1aa44d780412e703236ced0c0f50b1c4a614eec10134bc6a1a418d19af0abc231764d1fdf9b7f526cd59e10b8b46ef1
27 DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8 SHA512 4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
28 DIST genpatches-5.4-164.base.tar.xz 4167868 BLAKE2B 62abbdb5c0284dbfcb1d6342b81fb1a5e5ee99dca0be41b046a751e28ea64ab76697d44870ae175b6a64ac9fbce592a32755374b1671631f31ca5ff199338b39 SHA512 e9bb5a5fc61f7f72a299bfb5f8ac5949dddf7bbde9fc347f2e64930678cb2bc48074a89a965b0eae61879d297a16fcf027deecc836ed377387f197ec1b1053b5
29 @@ -54,6 +56,10 @@ DIST gentoo-kernel-5.15.4-1.x86.xpak 59852931 BLAKE2B a1003536287b44381077246b5d
30 DIST gentoo-kernel-5.15.5-1.amd64.xpak 69012707 BLAKE2B 4942272f991883ef98ce1070d65731f4bd83bd21becb29eddbbe8dceafad7dc15dfdceb3044aed146d9865426e594c2810d683493bf882776eb66399a4b91e15 SHA512 5ae9694e6f3ad9961f9941cbb2701ef943fc1ff7d431e96d6fbc9db62be49dc4e0ca59bb1d9d5a5f6c341e727dc42d4461e12b163e69189d41065b1968ece384
31 DIST gentoo-kernel-5.15.5-1.arm64.xpak 64064478 BLAKE2B 9f6dfc48f0b022b630fb38ab4adac3df2ac65d4ce6cb1bb84a7cb9fbf4743799c1d07e788413e0ca64a51091ea7f7474a500d914613ea61a21a9bc052f012cbc SHA512 798d295c0293e5a4470e5919c804d93666d729f0d79637409bb1975d9330ae8aa4c2395c4f5f6a76d3f27379e62eee846fb58ff8b562ffa161b58c64b05cba27
32 DIST gentoo-kernel-5.15.5-1.x86.xpak 59878712 BLAKE2B 720ee31cd33cc32347903db3e2972fab151cfe3449f8f00046a1ca3be9d63b26a956ddf4e90de5a960265f880d84076307d1840fa4d3222f7a85b6b821970722 SHA512 5a5a875f71786ff1bf8d66cdfdb608535ca0736b5588271a425183066de5e7b0cb35a4a1e741d7a856423bff382462e589e974d309b41d685ad076a635a11dce
33 +DIST gentoo-kernel-5.15.6-1.amd64.xpak 69018354 BLAKE2B a86f1248e5682863046acbbf824047124fff77ba03ee9d51ff57cf848a43bdcda0161a60547df1a71b0b4b01b04316fdb10ad51f4dc854cc505c7d687e378bd9 SHA512 83a1ab23a520cdd8947d950d13a496bef01ce15572545d60cda248b78f7c7c41dd3fd407eac673267481013cb55c4c80868a754ac53ebff7331d38ff58d54760
34 +DIST gentoo-kernel-5.15.6-1.arm64.xpak 64016881 BLAKE2B 2450d026c89a88204f61b0fe60b1ad0880f1ed4a6c0f0a0617293d7cc139cb33cf64656c909e79916f2bfb266c58aae188f3dae023f3c55f5ed79f4f83ff5efe SHA512 d3df6396918411287304455bd51be5a28e8cdb3319d3123279782a74ec411250d5523fba16e22adc50f6246652c3af9e3ca49afa6af54c02f5fcd43064ed2389
35 +DIST gentoo-kernel-5.15.6-1.ppc64le.xpak 57811524 BLAKE2B c8d7e4bcb4f30a490e428ed93ab1a8eea1bfbaf4c169ee401de2445e980d49338028d86b4f9d5732cfe30941789110841e456691ab6afc8d0b490116f209e9c0 SHA512 fdafac0273b8f466eebdc3004272a6ce8224199f42bd391ef50d8f41463410bf0a0b3fa06b7a65b85b57b58cdb03c32be8419a1c0d7c15051ffaacf1a9c84095
36 +DIST gentoo-kernel-5.15.6-1.x86.xpak 59880519 BLAKE2B 03dc5dd152c9740b8c61e36fba61a064fdffcb049675ec6ffeb7701b117d968847f2fcdd758ffc6e19ad4c87495730566f7a18bd54d38ffb2079f9bda5b9225c SHA512 698e173bbba017629466625d614f41d8105a4d3ef967e861314fdc0a2c6432521350ce6d0dc2c224c6e940e00fad19a355ca09201582ac2b45c4d4a079b54ddc
37 DIST gentoo-kernel-5.4.158-1.amd64.xpak 61365744 BLAKE2B 985463752628a98755f7765199cafc22a742661e2b2b4754b0f0ee4d3d1d96ee890eccf099f26be3e58a3f78fe770080c9dfb83f0fee00c4c79c23717fa021e4 SHA512 3a7a4890768af369d07566fac6e75ff482c3488a246c95911612ece436b0ffb9c26c87ba951dec49fece3d5bef90a238fa984a494dd3dfb7460ccb8f01293ef3
38 DIST gentoo-kernel-5.4.158-1.arm64.xpak 57629591 BLAKE2B 75bfe916311d6b16bf2b8a8f7a641b359b1f94b24fd35cc728e424f1df4e66579dc614f52b1fddd2cb1c2929b40dec26993fba8933a054a4d412078eca7a8eac SHA512 6b7cf2d6796dcdb567fe2c84a968726145e492799c7f40a92e501a84df385ca7da213ffd72799bae483558e7528029a97fb68757a9685272690dc2c88d70abe0
39 DIST gentoo-kernel-5.4.158-1.x86.xpak 53194465 BLAKE2B 4419edde2a05c5c375e085026a85b314800cbe571fd0e30f0a2123adb6db1aff60f1c0ed60611ffd756c22a8b42b69382c15c4a59d9046781bf57b9cd83e764e SHA512 c8695b6a312bde4a9f2807f79547d58f678865bf7c18435f1fc98ea285b9428de6e60885b12310d92d2f0f50a694ec583ea42a69956e5d5e1496efb33d7de3d6
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.6.ebuild
42 new file mode 100644
43 index 000000000000..849be5e61578
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.6.ebuild
46 @@ -0,0 +1,125 @@
47 +# Copyright 2020-2021 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 + ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
103 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
104 + eend ${?} || die "Unpacking ${BINPKG} failed"
105 +}
106 +
107 +src_prepare() {
108 + local PATCHES=(
109 + # meh, genpatches have no directory
110 + "${WORKDIR}"/*.patch
111 + )
112 + cd "${MY_P}" || die
113 + default
114 +}
115 +
116 +src_configure() {
117 + # force ld.bfd if we can find it easily
118 + local LD="$(tc-getLD)"
119 + if type -P "${LD}.bfd" &>/dev/null; then
120 + LD+=.bfd
121 + fi
122 +
123 + tc-export_build_env
124 + local makeargs=(
125 + V=1
126 +
127 + HOSTCC="$(tc-getBUILD_CC)"
128 + HOSTCXX="$(tc-getBUILD_CXX)"
129 + HOSTCFLAGS="${BUILD_CFLAGS}"
130 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
131 +
132 + CROSS_COMPILE=${CHOST}-
133 + AS="$(tc-getAS)"
134 + CC="$(tc-getCC)"
135 + LD="${LD}"
136 + AR="$(tc-getAR)"
137 + NM="$(tc-getNM)"
138 + STRIP=":"
139 + OBJCOPY="$(tc-getOBJCOPY)"
140 + OBJDUMP="$(tc-getOBJDUMP)"
141 +
142 + # we need to pass it to override colliding Gentoo envvar
143 + ARCH=$(tc-arch-kernel)
144 +
145 + O="${WORKDIR}"/modprep
146 + )
147 +
148 + mkdir modprep || die
149 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
150 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
151 +}
152 +
153 +src_test() {
154 + kernel-install_test "${KPV}" \
155 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
156 + "lib/modules/${KPV}"
157 +}
158 +
159 +src_install() {
160 + mv lib usr "${ED}"/ || die
161 +
162 + # strip out-of-source build stuffs from modprep
163 + # and then copy built files
164 + find modprep -type f '(' \
165 + -name Makefile -o \
166 + -name '*.[ao]' -o \
167 + '(' -name '.*' -a -not -name '.config' ')' \
168 + ')' -delete || die
169 + rm modprep/source || die
170 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
171 +}