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, 08 Feb 2022 23:21:56
Message-Id: 1644362498.afcc48b00bd38e7bd37d4ff0fd59d4b133af492f.mgorny@gentoo
1 commit: afcc48b00bd38e7bd37d4ff0fd59d4b133af492f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 8 23:19:00 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 8 23:21:38 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afcc48b0
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.22
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.22.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 6776bc5818ba..4642a655f844 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -10,6 +10,8 @@ DIST genpatches-5.15-22.base.tar.xz 986832 BLAKE2B 48fcd267e6e28850d226693b902fd
21 DIST genpatches-5.15-22.extras.tar.xz 3876 BLAKE2B 95daac6c95b82d628c0551b4e18e7c3ad9a5722b5ab8f087889b15bdeea8c6f5e232ee8b365bfb4a7c6730207d4735a0fb648b389626f35cda2593caa83ff3e2 SHA512 0616c4a976d22a5491039a6bc3babdd7e9095a2c53e2a1530d1ecfcf50a2dbfca637c1b6771078efc92e3371ac15f332f85f653d267ea8e6262ffd305be2723a
22 DIST genpatches-5.15-23.base.tar.xz 986960 BLAKE2B 8c64fb7038c358c4249af8d9274bf406249246ad0315d87266b6f22435e24105269797815679f863a4827aaed70e42471f2c4b82420d8f7021eb35c13a2f7f64 SHA512 0ad59d266c94ebc7614f2b8308d2a81c260677f7667de1bab58d5d2bc41a55bce7550e2f109bc7fe69303eeac2d58fe84ffd03c5d389433942928b786208a79c
23 DIST genpatches-5.15-23.extras.tar.xz 3876 BLAKE2B d41bee55c7c742a138bacfb45459f6449a80521b6857fdc55f675cf2434102176c493b9239ba73ab2d07df3062d995f9cfa76a168ad4913e5623453496519464 SHA512 3171e72c60211f2c331959851d85954ad94c947884408934375a4b495fe82c35f66c7408e6b3edff18ceb6888819c9f64b13a8b7c9433c80c802cf0316bf222e
24 +DIST genpatches-5.15-24.base.tar.xz 1017424 BLAKE2B 97132a2c8902493e4ce76861880f580ee6b37f4cd3facd1296a3d7b207c7a7ba014bb3903465e16e8cae3cfa6341f15aedccd0a72eb8017320ca91b5b7d4ac63 SHA512 b88f25da20d309e16c13adca272114237f1082d2272631d960e1b5ec54e8675b1f3c32725e336556b6d23748e8da9668989cbdb5ad9d0e0ad1253f442de92891
25 +DIST genpatches-5.15-24.extras.tar.xz 3876 BLAKE2B daa2d5da1a55e035909da862f247e79e67ca6d514aec1b7aa4862f3f88508a0a6b1efa5dc21c70b8f79ca29cd88d7b7012ea380dd0a56931b82065ba4358c81c SHA512 9cee406769c914080f8e68c42441c8235767f9247d9b5222dee661df6570923872022076d174f9d5dad2bf2b4f2871d266bc907e35c0b7f423a9322d9fa096d7
26 DIST genpatches-5.16-6.base.tar.xz 410464 BLAKE2B 19e5c3718dc8bd9b10f42b4448da16717f95da8a5ca33145bec2703c850ecfe4978144530823319bce945287642a44d368eef24448b45b12d28f5fe450325e99 SHA512 80c38fece09b566dbb65b02beeba3b895c41f18fec08ab9b09a6200450a88be8fb10c04dd80c88dadb13e3aff56f2e5983063cd2d852d9f1fd7ed92113e74887
27 DIST genpatches-5.16-6.extras.tar.xz 3800 BLAKE2B 43e9801bfd91b817bc56eeeecf9a86c77ef00c3899a13d78b022dc119c4130d2635fb801b1e638877b68bb17c2ce57edea5d14f8a93acc165c715dc0f5615173 SHA512 cb4570ee5ff2dee8a8e992c7f9d173e4b4c7a680cc8225a53ed9e16887d7ceee3ca7a461aed80bbdbd90dc236b26b1094ee6be207afe1bd15117dbb4025b9c9f
28 DIST genpatches-5.16-7.base.tar.xz 421780 BLAKE2B a4d43c5c598c6c263330acf21502866f0d6698e409b51f48c1690e98204e786d4ca8cca252dded8ea276124e9ee0598e912d42cc458ddf096239f3b97cbf392f SHA512 e76e4ffe549b2533f8c1674963a6fe22f70ef169f46ec13681efe896f1141b6a0341f942856a6ba934e2749589fa68512870e727e2fd411b7d2f5e4cb9b86594
29 @@ -40,6 +42,10 @@ DIST gentoo-kernel-5.15.20-1.arm64.xpak 64077658 BLAKE2B 176f5c7f076b8f54f9870bf
30 DIST gentoo-kernel-5.15.20-1.ppc64le.xpak 57875770 BLAKE2B 9ac3a88f8200154bf5c8bc10b44dd02d1264397ae4d7c648ad518c4d9af70654336427c1d4e7b6c44d66200106ab1030a8d4f58ef09ed04ce0ef98ca1885be20 SHA512 9cf231b6005a399d776dec5b1c22fa8fb7914d7631f8cfc70bcac24d8a91cc1b54b28a05c7b2fa3544a9b123497a8ba709f6def358059b3bd68b19bf511622d6
31 DIST gentoo-kernel-5.15.20-1.x86.xpak 59968495 BLAKE2B 5031de50f6b2f57235b3dcfe58c2ed2ad07fe281541c8004f881daf313303cb32d3ebe67e3d7393837549dfca9d0c954edb2feb0110a487d1e423b1081509489 SHA512 1a11c79c27cd89a003f3d2c330b17d8b153b459158bddb2f08277472ae6fbbe13b1fc3aaf46df3a96ecc382baf987783874e8299117c3e3f6457f3357acc82d2
32 DIST gentoo-kernel-5.15.21-1.arm64.xpak 64067891 BLAKE2B 5c009c0a55c97d7c67e60b9081f8fc558a6df7c862b6ae1d250161e0525d88f7278b9e5a67ac795126409fcea58c5b0eabfef2caa08adca62f7d886f8787fb48 SHA512 3734b2715e25e1977e747fc77cc2ebc4cda668dd7b6f1b34933b51846a50a96a83012dc71306bf26bb1ba211b4f18a08b88880aad7ce16775ba2b5ceb2e3b01a
33 +DIST gentoo-kernel-5.15.22-1.amd64.xpak 69092606 BLAKE2B c642b3c66773abba0b53a171b147fc1599bc6fadb2dac21e08ea2293e3ee9849f785e61ea89636e52dadfce7f4d379ccda7b0589f60773ea3627485d07e13955 SHA512 19da671d85031e749003da6305f82db23bb77a75c22db407c73dc5cb6c266774b983622b8c3dc8e1a9f4e72d3eb5d38c6f4695543ee1790b0b91d22b6aa3bc85
34 +DIST gentoo-kernel-5.15.22-1.arm64.xpak 64061332 BLAKE2B 26e77ded161d0b26c3ceb61bdea110436751d570d9fdf0a9337e145413fb4e94e47ecd9fc95807e659e82e6affeef3b7755448180757662e83797cd114cbe493 SHA512 54f2ebc4d27eb24280120ba236dfe07cf1926fc8d3e1c2cf19df4cc73d073284b921f940635ef9660bdc33848b2ff7330149f1cdbb055e85b66ae5b5e347d2a2
35 +DIST gentoo-kernel-5.15.22-1.ppc64le.xpak 57814487 BLAKE2B c5b241c8679d3817a309f0dd9f7bf64176860a7fc5fe51fba212f4c3fac5c3f53a5ad70ae9b9af4959ab421f7b0da9c18b7201ae778f255947096dab8e49a7ca SHA512 506431b16914679a4dd0f5da10aeaab6aa1b76cfaf8996a594b3a050d3bf0d0a51a5818e5b026bcf34a95a604c9e7b2f2a7e71efa3ffdc68abfdb65331938336
36 +DIST gentoo-kernel-5.15.22-1.x86.xpak 59910367 BLAKE2B 1047514a2635df82670bde5198d2c05b79c6f2682354121ee5df2d68d9a6078faf75e73ebeada744e3ca817c2b205e1d918c26ccf0d95bec5359c4cb3b84f864 SHA512 11b11b96f48dcf42b2265b8abd7347f6561010e7f6053e3385c0f054c52cde2ab4f1bf272197da4e68198afa2f2290fc5ae09d0f39c369738b8b050a17166744
37 DIST gentoo-kernel-5.16.5-1.amd64.xpak 69620204 BLAKE2B 3a97499960be60fba4927ee160ef508363cd8efebddb0b6a4f7fae1f865d47ea7f5167ac862c4e2a7d1b2117412ec0c5914b19216e933ed2a72e24240289dece SHA512 19d15ed4e39ca8d0ece619712774460b62db6f286222fde4e0b99dd73ec2a65acb9e5454d4ea4a99ed22f22ecfd437d00a66e78e561e91bc87e4b207cba94519
38 DIST gentoo-kernel-5.16.5-1.arm64.xpak 65025315 BLAKE2B 17e0ab2a7047e968b06fb254926d55c7f52a019773393504e64d993a30804d918153eaa448aa60799a7fa667ac2dff493b5737f0be5b4ef703326fc2caf3916a SHA512 332fa02243573285c70644158b2fa44dd787bdaf445883107782cf17f30a72636c7039a8e96f6237ea7fde0a64e496d681ecba7fdea6c281ba1f9ecfabefec01
39 DIST gentoo-kernel-5.16.5-1.ppc64le.xpak 58365242 BLAKE2B 764b8fe708d33fb4680c7159b3a0963da59942b2ab94a01ab566cf429b887f087c76cb2fd7421ab7d6f94c0e93f63047d28c2b76014feb549ae9cc00f3c2f3ca SHA512 ae57f6a0470a7b89defed02307e68169c01f493ef230283619e9a0795b0788b4faa776880905e5880d967e3b78ea0a6d97947be485a1d53c573e5b9250649a50
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.22.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.22.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.22.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 +}