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: Sat, 05 Feb 2022 17:28:29
Message-Id: 1644082096.c997901ee77e12fdd3232010ebe1d1c92fc94b8c.mgorny@gentoo
1 commit: c997901ee77e12fdd3232010ebe1d1c92fc94b8c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 5 17:25:38 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 5 17:28:16 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c997901e
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.20
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.20.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 e9aaa44f18db..7195afeab8d3 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -14,6 +14,8 @@ DIST genpatches-5.15-20.base.tar.xz 934800 BLAKE2B 6134e0fb2d9810d96809e5f099436
21 DIST genpatches-5.15-20.extras.tar.xz 3852 BLAKE2B 277432195bcb89cffe0fcb0ab0b2f00b889fa7c39c6178d81eb7426405f1bf5b85bc2d6bf5a69e6a0e2c18431eb768d3cae116fd8523de25f720479cc860d6d6 SHA512 e565d94865328b2296fbab040a7bb70444410d478a0b361c1b3502a0d8263ee868fbb446adb5f680716bbd189ecb42519c63849d92690c7e504975a5ff43ffe5
22 DIST genpatches-5.15-21.base.tar.xz 979868 BLAKE2B 217af3325d15020a43cc661746272b7756aa030d7e4e66d014f68e421b83f20fd6ad16cc036cf676b3719c118d4532b174a9f7b05aad730f22a13803fd621702 SHA512 5946fa7783d48d25b4f350815e645078e1629d3678aab048de1ec5c62066180de8db940b1b0e8db2062838fc2e06820a354278c20f60ec8da71f2ea686255c58
23 DIST genpatches-5.15-21.extras.tar.xz 3876 BLAKE2B 4c07b166a474bc11502de000f1bb00d8f0c25914a7877b2a94db844c694e0e7a4c757e8a10880eff40438b97214326ba50e716070d79ce1ef7f68c65d876da39 SHA512 384a2111655d8fd78a2f6165e99be0c74b36cf90333a465a4bb4cb6cda5ba32e1d435958987094a2d1407f02df7331ff2bd4fccace4f0a6ebe0c300692598f41
24 +DIST genpatches-5.15-22.base.tar.xz 986832 BLAKE2B 48fcd267e6e28850d226693b902fd66696024e75db6a75bb78ec79c7ac8afdac62643c4113ff205c301024d245f075716e0bf8083f97917dcfc8b1fcd71b674e SHA512 e8c64bd91caedc3dcd98301dbcbd2003b4aceb5a9713bd908a69448eaa2aea945fa8162e57442862b03daa0e1a4e7642e4504701b1f34a6edb127692e582e0e0
25 +DIST genpatches-5.15-22.extras.tar.xz 3876 BLAKE2B 95daac6c95b82d628c0551b4e18e7c3ad9a5722b5ab8f087889b15bdeea8c6f5e232ee8b365bfb4a7c6730207d4735a0fb648b389626f35cda2593caa83ff3e2 SHA512 0616c4a976d22a5491039a6bc3babdd7e9095a2c53e2a1530d1ecfcf50a2dbfca637c1b6771078efc92e3371ac15f332f85f653d267ea8e6262ffd305be2723a
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 @@ -58,6 +60,10 @@ DIST gentoo-kernel-5.15.19-1.amd64.xpak 69117444 BLAKE2B d9ad649c62d485451faa472
30 DIST gentoo-kernel-5.15.19-1.arm64.xpak 64076344 BLAKE2B 5778bb6d94f2f92d11c94fc5334e4150442fd52e76a3d4aba89dbfe987a8f9da9300a8e496721a922e6cfa08d5365b78586cd9a41da482bb1cb422e2f5833252 SHA512 d43c6e92a0828b15d780cfb721b52a4c767e896bfe1d8129b7fe7912cb46b14b2c8483b555771f396f6f4942cff7c980e968ee011367b2966876ea01080a4342
31 DIST gentoo-kernel-5.15.19-1.ppc64le.xpak 57741601 BLAKE2B 8f1c6eddc18d0dd95bbdf81510bb15e6613b68c0e8dcdd8f77348e84a2934daed0a41ac015d6cceb2c102d0a94a57ba2a062c712a1aa69dd02ca379267f0da96 SHA512 c15b3d2feed720bde8f65d6ea58d78499618704b1e222d506eca5ff3c28ab664927ce121de4cb3b82fad862416d1c75f99b929d4f0052bec9cb39f07bfcd35a3
32 DIST gentoo-kernel-5.15.19-1.x86.xpak 59902854 BLAKE2B b42961bf6daf1f3f2963d66ed3ea328c5f2ac98894d75891842dd1d4973e123c0a5d769e3370a2bef70341270381fd711cddddd84899cbf10470a0d80741c025 SHA512 efe1815c64841345dffb94a71b5b474a216ddb23041c44b26a6a909103c6e183ff57da1f32e4a125b6b95d7e7955e368088f3e32548e92d1046a58a186825442
33 +DIST gentoo-kernel-5.15.20-1.amd64.xpak 69164075 BLAKE2B 81adfaaa8ac7f61c7ae32257e84d3407b99b7b0f1072ee814a80097134dc730f65ae66d464c82e3fe2b230539e997fb6d1c7f04d4e40ecee332d4abb28269eab SHA512 38d6c744d28012e83a7dd0e59bb64c9523dc79966733a3fbcb88c7c8bc1bbff729b16e78bfb0362c42249efeb11eac3b8c67c83eb765c416ac6b7e7825c092dd
34 +DIST gentoo-kernel-5.15.20-1.arm64.xpak 64077658 BLAKE2B 176f5c7f076b8f54f9870bf34b488afcc7f37454f5c2677297f56511c819b810a60f40b15e678df9a736ccf28e8bfccf4370c8899079da34d537d29ed03e77e9 SHA512 e01fa47311154d25f2ec82afb78d6287caa0dfe95624c4a1523f06166e8ffd8d71933ed6f6a4a1148afaae9ea3f6ad5559977f283058d05cf1dd49edf31f8d6a
35 +DIST gentoo-kernel-5.15.20-1.ppc64le.xpak 57875770 BLAKE2B 9ac3a88f8200154bf5c8bc10b44dd02d1264397ae4d7c648ad518c4d9af70654336427c1d4e7b6c44d66200106ab1030a8d4f58ef09ed04ce0ef98ca1885be20 SHA512 9cf231b6005a399d776dec5b1c22fa8fb7914d7631f8cfc70bcac24d8a91cc1b54b28a05c7b2fa3544a9b123497a8ba709f6def358059b3bd68b19bf511622d6
36 +DIST gentoo-kernel-5.15.20-1.x86.xpak 59968495 BLAKE2B 5031de50f6b2f57235b3dcfe58c2ed2ad07fe281541c8004f881daf313303cb32d3ebe67e3d7393837549dfca9d0c954edb2feb0110a487d1e423b1081509489 SHA512 1a11c79c27cd89a003f3d2c330b17d8b153b459158bddb2f08277472ae6fbbe13b1fc3aaf46df3a96ecc382baf987783874e8299117c3e3f6457f3357acc82d2
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.20.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.20.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.20.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 +}