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:57
Message-Id: 1644362499.31e875215ebe7fa72570dd02d88c99c4d6f6f554.mgorny@gentoo
1 commit: 31e875215ebe7fa72570dd02d88c99c4d6f6f554
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 8 23:19:04 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 8 23:21:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e87521
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.99
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.10.99.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 4642a655f844..f910fd91b87d 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -4,6 +4,8 @@ DIST genpatches-5.10-104.base.tar.xz 2993596 BLAKE2B 76aa47af46b4ab39bb19e89151c
21 DIST genpatches-5.10-104.extras.tar.xz 3876 BLAKE2B 6e245a2360aa73d3cf99d4439556a5057a3705e6d04d541888fdb07b648a8f0ec5d87c86cb08d85e1e7945ec086ad1ee373470271985cd4b5e85612895d1928b SHA512 643fe234bd05fa86b4161d78a6ea901623c459ae0205972fc0fa11db4c07ecc3691552c77e14cf6f02eac9c6fba16656ff40f4027411a54a6cbe205a7c0a5cc3
22 DIST genpatches-5.10-105.base.tar.xz 2993776 BLAKE2B 6087b0ca5ea7150567bb23d43f83a02e653e1e1ca068e55951db43b3fbb3cb18b84fdad9c9b5ecfe77938b1192fd3260a6d241e3f840a7b09dd83449a2389ff0 SHA512 c74695b8d4b4c0205c0287840abcfa5a6e06d88cda53898e1f1a4bc67f4c264d5ca6c0c197ef5ae6d6e3627227e276865566d5dbb6a096c4bf21f569fde178a4
23 DIST genpatches-5.10-105.extras.tar.xz 3872 BLAKE2B ff451545dc2cadfa871ffa39b689dc2effdecbe09a84338b82231fbc5886ac546c60cb71deeac0391d6e4a783ced9b17d56f79fb72a480e815e1ed1d6e463cc1 SHA512 b041afab67f32b35a68621f8bf34a5656f61aa3143bc75cbb4ea5df3775513afbd3adf312858b7468aee3bdb0587cbdb7eb7a9958cb590864b13ac969ecd6a2b
24 +DIST genpatches-5.10-106.base.tar.xz 3012020 BLAKE2B a8514f6d958a386a0931d838f2f7403bc96e72afc17b944c95d49d8af64dd393b6c44a0f391527c41aae45fb0cdf19eb944ae089b125f0603a57b447368fb928 SHA512 a972a686d77b3d666600765004466bbbe5fcb4e3cb180c34841298bf7dd8716024d1dc87399a09296f71cc60693f79d69970227b4422309960de3beb17aab805
25 +DIST genpatches-5.10-106.extras.tar.xz 3876 BLAKE2B ba9ca4653cb4f4dab39d69d3ed970d0cd2ac752dfed74d995e80636b1070ebdb8be5923fc233eebae11c240a791a5ed8a1a0796a71b1af434a70fa547b630438 SHA512 2891548b18e1ed4a2dde9e48bdc2176daf7ff4a3f331e312c5e5a925fd038e67fa4f7fa0914aad7a424f6acd45e5a433fc273424bbcb3d640b0ebd960d0f58f4
26 DIST genpatches-5.15-21.base.tar.xz 979868 BLAKE2B 217af3325d15020a43cc661746272b7756aa030d7e4e66d014f68e421b83f20fd6ad16cc036cf676b3719c118d4532b174a9f7b05aad730f22a13803fd621702 SHA512 5946fa7783d48d25b4f350815e645078e1629d3678aab048de1ec5c62066180de8db940b1b0e8db2062838fc2e06820a354278c20f60ec8da71f2ea686255c58
27 DIST genpatches-5.15-21.extras.tar.xz 3876 BLAKE2B 4c07b166a474bc11502de000f1bb00d8f0c25914a7877b2a94db844c694e0e7a4c757e8a10880eff40438b97214326ba50e716070d79ce1ef7f68c65d876da39 SHA512 384a2111655d8fd78a2f6165e99be0c74b36cf90333a465a4bb4cb6cda5ba32e1d435958987094a2d1407f02df7331ff2bd4fccace4f0a6ebe0c300692598f41
28 DIST genpatches-5.15-22.base.tar.xz 986832 BLAKE2B 48fcd267e6e28850d226693b902fd66696024e75db6a75bb78ec79c7ac8afdac62643c4113ff205c301024d245f075716e0bf8083f97917dcfc8b1fcd71b674e SHA512 e8c64bd91caedc3dcd98301dbcbd2003b4aceb5a9713bd908a69448eaa2aea945fa8162e57442862b03daa0e1a4e7642e4504701b1f34a6edb127692e582e0e0
29 @@ -33,6 +35,10 @@ DIST gentoo-kernel-5.10.97-1.arm64.xpak 60942589 BLAKE2B 737483d551e4d9ee2deb583
30 DIST gentoo-kernel-5.10.97-1.ppc64le.xpak 55697054 BLAKE2B 06ba886ee8932f7a7d4dcc3c1d452633b314a3776e5cead15fe8398e8a6ce4ad4b2f0994a46fc0350ac9878849ceba50dedcbabc936c1a4be4a70ca6415dd813 SHA512 1ce33c16c51ced5a37106b1f3e4a75a7936e03613cdfdc7b8f16f8bc210f5df35ed02754ba27882931b619e3375a8e3bdaf111e587767a8f24b817f77e45dd14
31 DIST gentoo-kernel-5.10.97-1.x86.xpak 57312301 BLAKE2B ba049f09332100ecb5090c79e8b429513bbca0f599422e18cb012c4fb41964c8349b0db6aa64907453f07b8b1722fbf603a78419305aa282ee956d720a60871b SHA512 915edb7dd918eb2548193974ec43a462f67de93dc859dc6c9d0236f6a2421935b2d9bd20827570c936498d729b98304b8d09488697b3a82de7ddb6504db1fabd
32 DIST gentoo-kernel-5.10.98-1.arm64.xpak 60933641 BLAKE2B ebed181da9ccc7eb441464fad70dba91b95a4c0714feaaa93c87a444af27f28b13ba8b045bfad375b6f3ae7b4adbf955e619994013b722740ef38237009f2e3e SHA512 b3b3a132e43ddd39fcbdb7e55e9ffef90a371d2e926b3d61a905c2debd6d858326e6db4eeca31e83c56cc76c10a48e646d063e083387c5d9f0491a191d5c4371
33 +DIST gentoo-kernel-5.10.99-1.amd64.xpak 65597117 BLAKE2B 28b5d1d86611b4a7940085b7f558bc0f120e723bb1702537be78f7d5b1b26b52e6d7078403b8c0ca2c8381488f00d4b4390daea0d5e49854e61c6ecde9510d92 SHA512 58e3a20cce713c4b6e97e650fb4d12c88c7d7e493d11f5fb0744a4f2d1598dc7041c26455115057c54887bd8604958e3ffb882519fd6191ffd42ba1a9d21f511
34 +DIST gentoo-kernel-5.10.99-1.arm64.xpak 60924463 BLAKE2B a5a280e73a4a8c744acf0e25c118af433efa0563833c5b39f1fd392428c3a7f37b37ed8e1bb3cc97debd70d574a5998115309fdcb39d067e3ac46846ccba4efe SHA512 d4ef071f23b972ff3919a1b78ba6eca6345a72bace20ca9e20c666d6b0c37abc04cd0453f0158293b82c96dde53af2d0e813c331cf3c36ea032b31349c59a5f9
35 +DIST gentoo-kernel-5.10.99-1.ppc64le.xpak 55732526 BLAKE2B 5f81b23dcba9a1be594ed0ef6c3ae08f1e5b8bc1144806f388fa223651027c5d567f80d3e1d3e88cd4b595decda4082a919b570852e779bb90c2b376d93a37d5 SHA512 977c689ca23d771efa4cb5335f9215be6e7a656db9160d5de829aa89206e47d640bc21f5d10cca2e02505c10dad9ad4181b3787dc604fcb2d142690aa82d7186
36 +DIST gentoo-kernel-5.10.99-1.x86.xpak 57266442 BLAKE2B 0af1403a0988f550ae739c7b78881804171ae99eebe6c92db08d4f3457ddf6a0ff61ceafed97a015b6c26134fca161764e62eb6b9456de926b49bc7981aa3832 SHA512 5350f9ec18f099298553fc093248dae31f3e6586331db4baab703d36a870f17f3fec0372ad3fdb0544991ca21a0019da42890f79cb2be70d2287f434b1ed4398
37 DIST gentoo-kernel-5.15.19-1.amd64.xpak 69117444 BLAKE2B d9ad649c62d485451faa472fcbf6f85c50af457e269cefe84d2cedc4419f0cc9582d0f538388b3653e8ea048000e8f606fc18da23ccabce34f178bf534aa5723 SHA512 2e88f25fbd8839a08df0c4c4299f24ae441783a00b2021913345fa4a04bb3888d19c4ee374a8ac6b3cf86b7c0d83a716ee52fbbf9065c168e9e98b63d61cc66e
38 DIST gentoo-kernel-5.15.19-1.arm64.xpak 64076344 BLAKE2B 5778bb6d94f2f92d11c94fc5334e4150442fd52e76a3d4aba89dbfe987a8f9da9300a8e496721a922e6cfa08d5365b78586cd9a41da482bb1cb422e2f5833252 SHA512 d43c6e92a0828b15d780cfb721b52a4c767e896bfe1d8129b7fe7912cb46b14b2c8483b555771f396f6f4942cff7c980e968ee011367b2966876ea01080a4342
39 DIST gentoo-kernel-5.15.19-1.ppc64le.xpak 57741601 BLAKE2B 8f1c6eddc18d0dd95bbdf81510bb15e6613b68c0e8dcdd8f77348e84a2934daed0a41ac015d6cceb2c102d0a94a57ba2a062c712a1aa69dd02ca379267f0da96 SHA512 c15b3d2feed720bde8f65d6ea58d78499618704b1e222d506eca5ff3c28ab664927ce121de4cb3b82fad862416d1c75f99b929d4f0052bec9cb39f07bfcd35a3
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.99.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.99.ebuild
42 new file mode 100644
43 index 000000000000..75080d99ff99
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.99.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##*.} + 7 ))
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 +}