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, 26 Apr 2022 16:04:48
Message-Id: 1650989073.b987f132e143564c4c7889ca20a116b822d6f008.mgorny@gentoo
1 commit: b987f132e143564c4c7889ca20a116b822d6f008
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 15:51:15 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 16:04:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b987f132
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.112-r1
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.112-r1.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 d40103859bcd..308df269fa72 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -6,6 +6,8 @@ DIST genpatches-5.10-119.base.tar.xz 3340768 BLAKE2B 52f04f06622bf08385fbf25264a
21 DIST genpatches-5.10-119.extras.tar.xz 3872 BLAKE2B d952b7d246de7586bc50734c64f664c27d0677fa30e6d40dfdbed24394eaebc55328a446da8112f8d723b30d73c716fb817f34533259b35e873736c4bfaa9443 SHA512 7bc4595c81e2723e66af28851b458b2cc2df5349ac4cbee2f866bfa3e2fcd0223d40afc4466e8ccebde6e90dba99b891ee313510d70d059684757dc0de531b4f
22 DIST genpatches-5.10-120.base.tar.xz 3365700 BLAKE2B 6672f4b80ebd90ca24903c7f842b69bace79b790b9669a4f37d0be516e743da5b70e2916c10a6b006e6b50e74f50985c0df490bcca865fdf737ca8fb810fe77c SHA512 73275eafde83a8814c0643c01acc193223d3cacc3c9f25455370e8395237e98e08c097749f550bc6cf77665241f2235682c6636e70e700594623ceac03e93d1b
23 DIST genpatches-5.10-120.extras.tar.xz 3868 BLAKE2B b052197fd349775bfb579a89c27f152944573a81583c38dc323b21932c1453600016f986971170819a4f640cf7e7db87ffe43e484a0461d6e5bb8363af54a0b9 SHA512 b0d15b0c0456cfbf58826f58e4929011bdcbf3c6764735f7b2b9bcbc5f037ba7fa1d343cc34992eee8f1044e2a89909f6f826f8a0cdc5d82f55e44923a4fe006
24 +DIST genpatches-5.10-121.base.tar.xz 3366696 BLAKE2B 121f7445e184846460c5501e9d2cacf0349da8bb47c60d3528cc526385121f97b60b11706502d696e783b9649795d3921082076788325189087ead4c1cc48be9 SHA512 aa75a7c32373a0356488ab21c1b090c2ce6a63e706f5e61824212397d56aa474126bd21f8b28e10f3dff1445ecfc3bbe6d3e7ca249e1eb161fa80e79e47db796
25 +DIST genpatches-5.10-121.extras.tar.xz 3868 BLAKE2B 8ac8a382c1d7bbd47dc8761e26ae63ccb501decdbf43e4cde641441c1e08a711a9734320cb9a28e46c3d22a0dbfe5f0d2b3360f299878e5ed46c7cba2fd7b64a SHA512 f050bd3cf40e8d4d37a8652ab2af932fecc38a834c6baceab1c79cc6aba47f3a19e59aadce250c5b5302830e440001bd7a4c9a380d8ec35e12527ece903a69fa
26 DIST genpatches-5.15-35.base.tar.xz 1306764 BLAKE2B 5ea5655e825b9196663a7bb830ef34d74da7c9f922f7a71b46f7bc8755adacddd3b55f57e85b29532d6936ca481699ffae36642401e34293b4c6a445abb92db7 SHA512 50030f2dafba3e7fd16df7a6dd275fdbede772273009d1f1055dc904dc7afe947e92e9a32274c337938edd35073adc2e101d18a6ccd39529461d703af3e20566
27 DIST genpatches-5.15-35.extras.tar.xz 3876 BLAKE2B 5b14c88d66ede25e8417bdebc3c822d2f3755a13f21cef8a95088c97bba42a44357c98d13ce5a40e3aeb128ec0716540e893b108bf1f73256cb45250cd7ef43c SHA512 bdd8c5a700e9902cb7db17094fcc220eaca4774639d73e8496ac061fbba9fb80f6aa136aa9e87331a636af6146737fdec3c21249da7a18b5fec4d82de559e24f
28 DIST genpatches-5.15-36.base.tar.xz 1545664 BLAKE2B 367785e90aeba2a5498c5a17443429bd6650ab40390db6feb349eb54431e36ddecdfb031785f74355e5cdd7105636bffc8c0a86821ea36ee257d40cc0fc54d31 SHA512 63191671b4b41fb4a45d0535782bf638976e520e227ac6e924ce7e783e67ed02c8f127574f263d9373cb5d79591f1de209d09ceb47ba6ce34acb57c6a991857a
29 @@ -50,6 +52,10 @@ DIST gentoo-kernel-5.10.112-1.amd64.xpak 65779289 BLAKE2B 1d94227c1fde8938dfaca4
30 DIST gentoo-kernel-5.10.112-1.arm64.xpak 61043728 BLAKE2B daac6db8b960c8638d2c3962a0163fe007caac23e51b8ab1e308f295b75c0ae8dc6eb39c5928c400e697c2c2457c8505dea04007261e6c1d1a472aeaac9096b9 SHA512 7bcff951f58c2abf1b28f80d6278bdb7b0fbdfc647f56fc8dc00daaa67c5f03469c427c7a1c5796b18dceef45c8ef6dcdab44f64480b5845402df153b4d347b3
31 DIST gentoo-kernel-5.10.112-1.ppc64le.xpak 55835819 BLAKE2B 7bacbe611e0dcb8220a6a1314187013b11dbe57e0f5f734923c5e1dae47904051e1e05ec774c08d3224e44e99d0929b1ee3adc1638f3b0f15a0d7d66f150e148 SHA512 da052891d940b9babaa3a2e9a4245f83f956d00c391bd2ee42636c07e757647d6669b2bae3f0fd9023f9772a999d6fc6e447c72298ae042592295052c6a437bd
32 DIST gentoo-kernel-5.10.112-1.x86.xpak 57401622 BLAKE2B 5f2091507bdbb9b2944c6bb4c54656975fb2ae585c591d6bd073d91710b17453aa95429eb6a99671f00a325382058b1df4b972b20f06dd46c9d909bc8462071f SHA512 4db33d6926b0cd996ff348489d111bd0c00af48a9382373584594a6d66c94fd5a001a3fc604cbb5430e9a8a3e4c2e4214ae023710604c909900347a2e5924076
33 +DIST gentoo-kernel-5.10.112-r1-1.amd64.xpak 65760204 BLAKE2B a53b234128d90a78efdbb4518c4ba0fad2a75e724673384b120ad0002ef2346c4a637313d49a3f8e6f59a2e8d416e5ffa6c51a500f7c8c698168a18217924753 SHA512 6c50d83e8d97e21f9a68074b23e74e75aee104e090274a79b2311c1535f85341ba870ed04e6a7337f08e7826a5c2e308abda39cc66c4cc1a10c5007674ee596d
34 +DIST gentoo-kernel-5.10.112-r1-1.arm64.xpak 61031199 BLAKE2B 893aece0eb35afceb36ee5f840689426e70baf28bb0e6215005a1237039ec8cb73c9aa0f577f880af0e69dd0694878d83b544f0a3ad83ef6eacd2cd1c5de60d3 SHA512 08327985fcf74f7d56d32797b2ef97bce2da72b7e19758e6995e333ccd47236a73845c4c47b096e566e31e65d1c4da995e84fcd6d0998a69f70fdbb27e904cbe
35 +DIST gentoo-kernel-5.10.112-r1-1.ppc64le.xpak 55782682 BLAKE2B d45c86f2785a4e4c23c0cc0f2e5e4753b4c79a76e259b8882c7f5ba27523951c3463dad367a752fd456b15862d2aa383d627e74c94d1740c2fbfcefe454b6bb1 SHA512 59414778eb8a76132a81888e28bdc7457c2a16f7e79675ca5f1de6e717017ee0e17980a35c3464d47f8ef64756ffadd3fb3f852ee3db7744f864151ba45dc2a3
36 +DIST gentoo-kernel-5.10.112-r1-1.x86.xpak 57387015 BLAKE2B a888c5fbb47c2e91af583e8af88c6126f600fc8febdf9f3e6ac12fffd7607f84ed64a4e53f4733342e70df8a1bd4fa4dad9ee8e9dbc81f62823ae94c56847315 SHA512 8a5262ba90f8b8ab9427ad01f538ac197386ee4556e2c4fe69243a84f1b712b47139e87604e55d6c1b6e22e6146708d1834e3dcffef83112382df15f00b2973d
37 DIST gentoo-kernel-5.15.32-r1-1.amd64.xpak 69326816 BLAKE2B e26042a6d9b77d98d2d49f5f00bba7128a5498f01b4309a0d24e08f4d38f9b9b166bdde135aad75e005f7433af331c9bee60ec166abad8a8ccd83afebcc43dad SHA512 040cd5784b2676d58ecc7b24a1a9316ad96d2fbe03add3b4f9b679285b25185a6dc1bf1ba1a40c816763e7088bd40a185266dcf535dbb578fa5a005453ef1f21
38 DIST gentoo-kernel-5.15.32-r1-1.arm64.xpak 64197193 BLAKE2B a50633bb2a4b3c7a1ac5df5b38821b7df24f15dd883169b6e91c6d934508166fd6236c4dc3640b0bef994b7aa97551ba9b9aea8ef4e6ebb80b9131c61945045a SHA512 c4e922dd2bf942c6be335387e4266a1ed3d27ee466f7db3b4de24774e20b68e5fd2f62c5a3cb2f84db7e520211e1dc6f0c9f27040039da372cc37bafe06ac15c
39 DIST gentoo-kernel-5.15.32-r1-1.ppc64le.xpak 57890732 BLAKE2B 7e5ec0913bf2cd77bbe726e48bd236867a7f963777ceb2cf5dc86a410e98e4c5af5888a75f304492883fbb821813a8d6428664d21c55af1a36e7ab7cc9a7ae0a SHA512 c77e1e4108b06a46758209bcacd45bc42dffdfdc273290774550b8dfb1c7a4bd287db95dba4dbcf17da88db9a0a6a04cc14a20f75dcb9f467d7549dfdf9fb33d
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.112-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.112-r1.ebuild
42 new file mode 100644
43 index 000000000000..ecd98ce35a2b
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.112-r1.ebuild
46 @@ -0,0 +1,135 @@
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##*.} + 9 ))
56 +BINPKG=${P/-bin/}-r1-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 +"
81 +S=${WORKDIR}
82 +
83 +LICENSE="GPL-2"
84 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
85 +
86 +RDEPEND="
87 + !sys-kernel/gentoo-kernel:${SLOT}
88 +"
89 +PDEPEND="
90 + >=virtual/dist-kernel-${PV}
91 +"
92 +BDEPEND="
93 + sys-devel/bc
94 + sys-devel/flex
95 + virtual/libelf
96 + virtual/yacc
97 +"
98 +
99 +QA_PREBUILT='*'
100 +
101 +KV_LOCALVERSION='-gentoo-dist'
102 +KPV=${PV}${KV_LOCALVERSION}
103 +
104 +src_unpack() {
105 + default
106 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
107 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
108 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
109 + eend ${?} || die "Unpacking ${BINPKG} failed"
110 +}
111 +
112 +src_prepare() {
113 + local PATCHES=(
114 + # meh, genpatches have no directory
115 + "${WORKDIR}"/*.patch
116 + )
117 + cd "${MY_P}" || die
118 + default
119 +}
120 +
121 +src_configure() {
122 + # force ld.bfd if we can find it easily
123 + local LD="$(tc-getLD)"
124 + if type -P "${LD}.bfd" &>/dev/null; then
125 + LD+=.bfd
126 + fi
127 +
128 + tc-export_build_env
129 + local makeargs=(
130 + V=1
131 +
132 + HOSTCC="$(tc-getBUILD_CC)"
133 + HOSTCXX="$(tc-getBUILD_CXX)"
134 + HOSTCFLAGS="${BUILD_CFLAGS}"
135 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
136 +
137 + CROSS_COMPILE=${CHOST}-
138 + AS="$(tc-getAS)"
139 + CC="$(tc-getCC)"
140 + LD="${LD}"
141 + AR="$(tc-getAR)"
142 + NM="$(tc-getNM)"
143 + STRIP=":"
144 + OBJCOPY="$(tc-getOBJCOPY)"
145 + OBJDUMP="$(tc-getOBJDUMP)"
146 +
147 + # we need to pass it to override colliding Gentoo envvar
148 + ARCH="$(tc-arch-kernel)"
149 +
150 + O="${WORKDIR}"/modprep
151 + )
152 +
153 + mkdir modprep || die
154 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
155 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
156 +}
157 +
158 +src_test() {
159 + kernel-install_test "${KPV}" \
160 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
161 + "lib/modules/${KPV}"
162 +}
163 +
164 +src_install() {
165 + mv lib usr "${ED}"/ || die
166 +
167 + # FIXME: requires proper mount-boot
168 + if [[ -d boot/dtbs ]]; then
169 + mv boot "${ED}"/ || die
170 + fi
171 +
172 + # strip out-of-source build stuffs from modprep
173 + # and then copy built files
174 + find modprep -type f '(' \
175 + -name Makefile -o \
176 + -name '*.[ao]' -o \
177 + '(' -name '.*' -a -not -name '.config' ')' \
178 + ')' -delete || die
179 + rm modprep/source || die
180 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
181 +}