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: Fri, 08 Apr 2022 18:06:13
Message-Id: 1649441142.8ee6c29ef123f56660533ba6f2079d5ea0da6f98.mgorny@gentoo
1 commit: 8ee6c29ef123f56660533ba6f2079d5ea0da6f98
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 8 17:43:29 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 8 18:05:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee6c29e
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.110
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.110.ebuild | 135 +++++++++++++++++++++
14 2 files changed, 141 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index de1689600608..1bbf34638b9d 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -1,5 +1,7 @@
21 DIST genpatches-5.10-117.base.tar.xz 3165564 BLAKE2B 0e41b33af63a5b6da920d194166e75b32812231f7b13a56211ad390d744f889dc8b024328dd2048e7c7bc356ea04936716c295cf4d33d731bbc7521b9ed720d9 SHA512 421a487bf1914ee42c8b6c39a6a99f4841e8a38e293024b4367a10391b1ca973c041697c42979b7e4a78b56b9e871034b0703f8bfa6c1347f3aef39eb49f9066
22 DIST genpatches-5.10-117.extras.tar.xz 3872 BLAKE2B bbac7edcded53e4205c58e1404692b753d57f306b98bfd7e718206e25a947b2e1e565ae33712b64f9b24333df30c32c975af71c5a9d11bfb836216a27dfdc782 SHA512 b192de56c873740d963fa6689f7d9dc177b25cbaa2847adff2d3a5ea7c6c541161c4518f389f7a5f2294b878dabc0d06844bf4e45cffc87ce8f9649d55a4312e
23 +DIST genpatches-5.10-118.base.tar.xz 3302340 BLAKE2B fbaffbc3b7d0bb3ce303fd721ad703a267b028f4fd1b12edeb0bdf8f9317b58a58716243d536f7db0e35501d801ee283b983aa598488df518a535e349e0e7a1e SHA512 d13dfd90332b7b4ea8184b2fa0b76b4de6d966ccff68c1eaabbaca806f79ad26549fe4ad7a69228139c9f97fe0fa6b11c2949b97ba9f7b82c25d9cb7942efcc8
24 +DIST genpatches-5.10-118.extras.tar.xz 3876 BLAKE2B 221613b83c1b7b4a98076c5b515efa90f18ba07cd9918de4b1018156a9dfcab0c3efd2a736a00db9a32ae23c1d2afec9abd5c2c575d85a8f27f9248b0e8d8c87 SHA512 33a175b16c82f910c13c800504cd13d7c2f41e6bea652325b0665081628018fa20cfa3fd62139e7aecd3f7701e56c1939473d4aa3e1f764ae0c3af8829b4b568
25 DIST genpatches-5.15-35.base.tar.xz 1306764 BLAKE2B 5ea5655e825b9196663a7bb830ef34d74da7c9f922f7a71b46f7bc8755adacddd3b55f57e85b29532d6936ca481699ffae36642401e34293b4c6a445abb92db7 SHA512 50030f2dafba3e7fd16df7a6dd275fdbede772273009d1f1055dc904dc7afe947e92e9a32274c337938edd35073adc2e101d18a6ccd39529461d703af3e20566
26 DIST genpatches-5.15-35.extras.tar.xz 3876 BLAKE2B 5b14c88d66ede25e8417bdebc3c822d2f3755a13f21cef8a95088c97bba42a44357c98d13ce5a40e3aeb128ec0716540e893b108bf1f73256cb45250cd7ef43c SHA512 bdd8c5a700e9902cb7db17094fcc220eaca4774639d73e8496ac061fbba9fb80f6aa136aa9e87331a636af6146737fdec3c21249da7a18b5fec4d82de559e24f
27 DIST genpatches-5.15-36.base.tar.xz 1545664 BLAKE2B 367785e90aeba2a5498c5a17443429bd6650ab40390db6feb349eb54431e36ddecdfb031785f74355e5cdd7105636bffc8c0a86821ea36ee257d40cc0fc54d31 SHA512 63191671b4b41fb4a45d0535782bf638976e520e227ac6e924ce7e783e67ed02c8f127574f263d9373cb5d79591f1de209d09ceb47ba6ce34acb57c6a991857a
28 @@ -14,6 +16,10 @@ DIST gentoo-kernel-5.10.109-1.amd64.xpak 65727782 BLAKE2B 5fa0d5f189dfaa93b3ef1b
29 DIST gentoo-kernel-5.10.109-1.arm64.xpak 61045068 BLAKE2B df8a0214d4cf59e0a49f075180860645cf8fe1a0e1a1f62bb7265b9b9d5056834d328cccd1661e80c7ab1a8a651f57a2d3d8c250da6ba3b25dc5349ed95b6f41 SHA512 bcb625eb11362f4872bbebab2562ad75567e2504194173671a40aa810ac9d0282d72f55556e749b4447bc7d4df907e58fbdc8a1fa0587050c3c0fda62b6a2bff
30 DIST gentoo-kernel-5.10.109-1.ppc64le.xpak 55828184 BLAKE2B acdb17f64eeac0f2a292902f020283ee9e3836cc9428d2b2587f53755e791370f611bc50060a73385aa4171ed5284cb2a5b6d3545873914fc68075fd86551cf9 SHA512 872df4d6cd4a010445c406cd8605a24c2292e76f9f07ca79c1ad728d768af255e3be9c2d4069415e46d2697d3af22b340211cbe4e02bee40ae483b6bf12078bd
31 DIST gentoo-kernel-5.10.109-1.x86.xpak 57377986 BLAKE2B 9de3db8e2cbecf1b7f9d6b7ec4a54adc318e556a7d2bbae952da36fc113b7ae6b44148629ff7041f584096d4240203747cd5fd9983454e3ba7ef08c814d0e836 SHA512 6760fed9c33fea05f7f4b5486a0486d3a562bcd1c9ce7a64161ac86fdf660ccd7302d094aa8bea6fb2b10713b3a76b9b82b97421d40e702172dd9cdc52004cc2
32 +DIST gentoo-kernel-5.10.110-1.amd64.xpak 65761641 BLAKE2B dd48ed95b0b86cd53c151742548577e075ef42d10d583d8a6b1390bf8a7d8ac2ebb1ef9f71ed5ea4941257ee03b3471cbd690dcb29fea7fd54f69318827812fd SHA512 d3da85363da28659e4c6c42a936dee5831478bb4647d6b2c2889bbf6884f86953284401a3dbb0a9c96bd4570147ff2397adde3a330c7167357f489c8f0f668a5
33 +DIST gentoo-kernel-5.10.110-1.arm64.xpak 61056323 BLAKE2B 69c85cef00fd2833de158a34c806dac926b33f9f8d7c61b8f2f4d4c004f4d2e59fb6a4165e110bee3bf60d20693b0097ab47b9df344599b82b5911a84cbc2746 SHA512 e03ede411a9079c8f334645c22e0cd726e710f69aed04a8040f8b9d573082e685ad92774a4c17574838007e3d28263cc4708869cd412737ad8fe6b9814199289
34 +DIST gentoo-kernel-5.10.110-1.ppc64le.xpak 55922287 BLAKE2B a2c2299a9cd22a2781793b5d9d1a9007945449bee9f6107bfe77776fd82ae399189533814f6ae97bf51c5b17048036677d1ba519f472ae558289872308d560a1 SHA512 e1cf8c8e362c0279ec2dc491a401666db4073cf94868bec0652703617accbe59b6d508ee811b1f415e8fec2362c81c9b740d27806573735cf2ad82b7e8f3342f
35 +DIST gentoo-kernel-5.10.110-1.x86.xpak 57382213 BLAKE2B 56fe3874a0cb8b53170288a574bcc29148b3882866a45b0f815cfe75ec410dbe1d988950a27869b21cc09be7b7a016e297f0cc38021a691a0087acf83a728789 SHA512 02cc4991af88a451e0b0047d5d683a673b23b3a584f0ba9df64597b644bd03c79321480fc6618d66e26f23b769ea64c6f195c556daa86e7d1410f7cafafe45e4
36 DIST gentoo-kernel-5.15.32-r1-1.amd64.xpak 69326816 BLAKE2B e26042a6d9b77d98d2d49f5f00bba7128a5498f01b4309a0d24e08f4d38f9b9b166bdde135aad75e005f7433af331c9bee60ec166abad8a8ccd83afebcc43dad SHA512 040cd5784b2676d58ecc7b24a1a9316ad96d2fbe03add3b4f9b679285b25185a6dc1bf1ba1a40c816763e7088bd40a185266dcf535dbb578fa5a005453ef1f21
37 DIST gentoo-kernel-5.15.32-r1-1.arm64.xpak 64197193 BLAKE2B a50633bb2a4b3c7a1ac5df5b38821b7df24f15dd883169b6e91c6d934508166fd6236c4dc3640b0bef994b7aa97551ba9b9aea8ef4e6ebb80b9131c61945045a SHA512 c4e922dd2bf942c6be335387e4266a1ed3d27ee466f7db3b4de24774e20b68e5fd2f62c5a3cb2f84db7e520211e1dc6f0c9f27040039da372cc37bafe06ac15c
38 DIST gentoo-kernel-5.15.32-r1-1.ppc64le.xpak 57890732 BLAKE2B 7e5ec0913bf2cd77bbe726e48bd236867a7f963777ceb2cf5dc86a410e98e4c5af5888a75f304492883fbb821813a8d6428664d21c55af1a36e7ab7cc9a7ae0a SHA512 c77e1e4108b06a46758209bcacd45bc42dffdfdc273290774550b8dfb1c7a4bd287db95dba4dbcf17da88db9a0a6a04cc14a20f75dcb9f467d7549dfdf9fb33d
39
40 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.110.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.110.ebuild
41 new file mode 100644
42 index 000000000000..84bead9d866e
43 --- /dev/null
44 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.110.ebuild
45 @@ -0,0 +1,135 @@
46 +# Copyright 2020-2022 Gentoo Authors
47 +# Distributed under the terms of the GNU General Public License v2
48 +
49 +EAPI=7
50 +
51 +inherit kernel-install toolchain-funcs
52 +
53 +MY_P=linux-${PV%.*}
54 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 8 ))
55 +BINPKG=${P/-bin/}-1
56 +
57 +DESCRIPTION="Pre-built Linux kernel with genpatches"
58 +HOMEPAGE="https://www.kernel.org/"
59 +SRC_URI+="
60 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
61 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
62 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
63 + amd64? (
64 + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
65 + -> ${BINPKG}.amd64.xpak
66 + )
67 + arm64? (
68 + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
69 + -> ${BINPKG}.arm64.xpak
70 + )
71 + ppc64? (
72 + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
73 + -> ${BINPKG}.ppc64le.xpak
74 + )
75 + x86? (
76 + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
77 + -> ${BINPKG}.x86.xpak
78 + )
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 +"
88 +PDEPEND="
89 + >=virtual/dist-kernel-${PV}
90 +"
91 +BDEPEND="
92 + sys-devel/bc
93 + sys-devel/flex
94 + virtual/libelf
95 + virtual/yacc
96 +"
97 +
98 +QA_PREBUILT='*'
99 +
100 +KV_LOCALVERSION='-gentoo-dist'
101 +KPV=${PV}${KV_LOCALVERSION}
102 +
103 +src_unpack() {
104 + default
105 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
106 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
107 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
108 + eend ${?} || die "Unpacking ${BINPKG} failed"
109 +}
110 +
111 +src_prepare() {
112 + local PATCHES=(
113 + # meh, genpatches have no directory
114 + "${WORKDIR}"/*.patch
115 + )
116 + cd "${MY_P}" || die
117 + default
118 +}
119 +
120 +src_configure() {
121 + # force ld.bfd if we can find it easily
122 + local LD="$(tc-getLD)"
123 + if type -P "${LD}.bfd" &>/dev/null; then
124 + LD+=.bfd
125 + fi
126 +
127 + tc-export_build_env
128 + local makeargs=(
129 + V=1
130 +
131 + HOSTCC="$(tc-getBUILD_CC)"
132 + HOSTCXX="$(tc-getBUILD_CXX)"
133 + HOSTCFLAGS="${BUILD_CFLAGS}"
134 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
135 +
136 + CROSS_COMPILE=${CHOST}-
137 + AS="$(tc-getAS)"
138 + CC="$(tc-getCC)"
139 + LD="${LD}"
140 + AR="$(tc-getAR)"
141 + NM="$(tc-getNM)"
142 + STRIP=":"
143 + OBJCOPY="$(tc-getOBJCOPY)"
144 + OBJDUMP="$(tc-getOBJDUMP)"
145 +
146 + # we need to pass it to override colliding Gentoo envvar
147 + ARCH="$(tc-arch-kernel)"
148 +
149 + O="${WORKDIR}"/modprep
150 + )
151 +
152 + mkdir modprep || die
153 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
154 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
155 +}
156 +
157 +src_test() {
158 + kernel-install_test "${KPV}" \
159 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
160 + "lib/modules/${KPV}"
161 +}
162 +
163 +src_install() {
164 + mv lib usr "${ED}"/ || die
165 +
166 + # FIXME: requires proper mount-boot
167 + if [[ -d boot/dtbs ]]; then
168 + mv boot "${ED}"/ || die
169 + fi
170 +
171 + # strip out-of-source build stuffs from modprep
172 + # and then copy built files
173 + find modprep -type f '(' \
174 + -name Makefile -o \
175 + -name '*.[ao]' -o \
176 + '(' -name '.*' -a -not -name '.config' ')' \
177 + ')' -delete || die
178 + rm modprep/source || die
179 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
180 +}