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: Mon, 06 Jun 2022 17:14:27
Message-Id: 1654535599.e2017172e4a285b229697aa64c779f883f1d42e8.mgorny@gentoo
1 commit: e2017172e4a285b229697aa64c779f883f1d42e8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 6 17:13:19 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 6 17:13:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2017172
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.120
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.120.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 3ccd4bf47b61..68d366744e89 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-127.base.tar.xz 3469464 BLAKE2B e14c637285530bec0187c71aedb
21 DIST genpatches-5.10-127.extras.tar.xz 3868 BLAKE2B 6a7c16cab44182ebb5262a7e419d68daa265a55ee51b3ad6a8d30ce20299090250e00bf295c30551d07bdd935acfad6753128cb0dd5f975b11fc3c31b1537689 SHA512 8bddbd6ac07595d76efce9ec9595b0da1ea1cf49735ab22ceac6d312d59a72304ea7557eca349896c6936dec060dcac3cf2a877e213e4d4d5964e330f37a05f1
22 DIST genpatches-5.10-128.base.tar.xz 3512860 BLAKE2B 2d01ea45d9fb1ca3fdb216cc7fb2807d351a5f96aa5174bd86acdd5c425dc2fe277443adb00c66dcaa7bbc89aef1be27b7bce2eb3f2d41d547aaeaf4b5f875b9 SHA512 32b4f989b9a0b6978c90f002c12b0da3ac376ffce93ac6a84c4fdcc5a2aa9484f1c5305cb74b59eaa4ed0311d000164cc7d9211d8eb3186c44e0214e745e303a
23 DIST genpatches-5.10-128.extras.tar.xz 3872 BLAKE2B b797d3b758b6472b55021e34f567122b0103fc60e9aca785a3ebf196deca22e13cf6423aed5126e9f441fea69db60f72934072b18a3821c61896a372562d9a52 SHA512 a021a9b67fafc0ec650a4bdf87ca72bb7ac39d705aeaef5bd650e115a46d4c2dafab4ff853e6585f14e18fda15dbca489adafd7e86843a73a656848b6bc416da
24 +DIST genpatches-5.10-129.base.tar.xz 3527080 BLAKE2B 91778a19b8905af40a0f80cc63434b378ab6c502d1fa01bdd81c258fd6c0010051d1cb4649a60050799c6654686cd37fbcc4aab2224029d274181cb404c3524d SHA512 94e12e0801a0dcd2645430074e03c446de75fa7106a5ecbc95be288b44ae387eb4a17c3237f66e6a0fc6651d973843cc32919c3ccfc807b1c1d36dbeca4137d1
25 +DIST genpatches-5.10-129.extras.tar.xz 3868 BLAKE2B 85f4030ed0bd5aaac7c1e0d5f64412557a2684d0d53b1243357b0c5d3c521cad0cc5d72af7cdfad1fe8304454a3b1fb8adffd797aa0985353729911c48e17342 SHA512 69db79779a285aa4127339bb11bd77de8e2d9500eb85fc582473bf487a36983edff85b475bcee41b55417895503bc6799ae17f8260e056efcac43f88ff9c64a0
26 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
27 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
28 DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681cf3fbd591278c1878e7f1aebdfbdb726b5c8ccbffe43bf2c34e5baa57c04eb5fb08a723b9473b843639835383bbde464c1ade SHA512 e6ec4a4ab7abf3b91face2df9f8fa7089c054a7c5e44d8404742d05dac9bf7940e6c0f97f219519f8bce22f3cd3e40fd98c856da866b5cbd637094aee1bd884e
29 @@ -32,6 +34,10 @@ DIST gentoo-kernel-5.10.119-1.amd64.xpak 65749709 BLAKE2B 8af5b2b74712c01c35fadb
30 DIST gentoo-kernel-5.10.119-1.arm64.xpak 61049055 BLAKE2B d9b5acb3ba5eaf5eea6c6dabccf28ed1ec17de91fe326160354ba123ad7c0ca34ab0b1a597d5d9534c15e536795ef740cdc8ae8092cfae1b5b7e04807f8959a6 SHA512 43968617b0d8e53937a9b4994854c0365ed6299c069426cececd0de138e4dec20781c8d820467e19bc19d879d67f87089aa18afb6d9575d8602089089c241760
31 DIST gentoo-kernel-5.10.119-1.ppc64le.xpak 55844669 BLAKE2B 36cf5c837d27c66c8fe9937b11998b43271cc7a9e47e12d228780bc4f42e5f2589e375fefa3b70ae6fada9ff9441506d2fb24cda6ce2d4f3e77970b87c036d58 SHA512 f6d01065b01014699acdbbbed9a4ba4dc1bc480234aeb4233b23cd5eeafc1b53d6e0c87f870c0d54b84b09f01ea937a008a3657c4da2b9362d970ecbc09a7533
32 DIST gentoo-kernel-5.10.119-1.x86.xpak 57397446 BLAKE2B 8c241c5479ef923753675a680f499e19a9a7204649a034e8aea523c048be836901f994c4783ece6466b24147d8686316c974f3b75b6fb2ebcf9dd2538ff26a87 SHA512 a0ed711557c2b96a217a0c78efc819030cdc09ab645ff5f365578641107864e4d777196a08d38cd5b5571f5c4e7e12b53d0173af4ba7a71d99527dc11c0fbb45
33 +DIST gentoo-kernel-5.10.120-1.amd64.xpak 65779242 BLAKE2B 25031baad2c62a6cc1b687bc5db785a2a852ed9fff65ca57a41a5788a9c737c00acf47c112f62e04f6ef57945cfe2c0f7ffc87b85dcb7b89a8482879a09b3d47 SHA512 05d2ce7adcab5425ec9519d2573745c6082593c9428e28cea8b9090d1cc31a387c2c2407537fe1a11c740c037545e521b402cc73c1c1a4d4f4421c87f5e8244d
34 +DIST gentoo-kernel-5.10.120-1.arm64.xpak 61039499 BLAKE2B 8160103097dda5f134c720624fecdc594f2f094dab31041f7d2897c568e64867aad1c55dbac047143500997b5017ed76717857eda24f27031801013374f58a42 SHA512 319bfdccb09e95f582ef0ab45915b63bd6ba2166f7191f649ecc5af3457f2f6f573d1e9ebd2a4eea1cc1869f14ab7077eeb4b04b627375cf50eafcf06d8362ad
35 +DIST gentoo-kernel-5.10.120-1.ppc64le.xpak 55791957 BLAKE2B 41dd8fb69b6e250148c3079d5dd65fbb159616df2d031a48afa5426ef1e3634281336563c2b06b09cc9f4664b3eeab12b1540c1f534867d2f5202899d163177f SHA512 66fbe779762127978dc6071a7ea0db49dcc03aa5f8be7c640e9dd2b176a0d6cedb74e8ed33d35b679a7ad7b9a6ea69505c5848d6808046b2a8bf608867d5e6c3
36 +DIST gentoo-kernel-5.10.120-1.x86.xpak 57392206 BLAKE2B a9dec7960fa31156a19882d0ae1cccf9d81489864825f3938d091a61ffda56f97358e03b534306789fe4ed40c7830b9ebff72f03e0d35da5fece0182143ae2cf SHA512 b6f40e84dcd2ddc44789c8f44e9bb2567a4b1271c6c0f12bbdca298401475c00f7398f65f8ff3892e321ccbb41c1cbadaf1351153a66e2e23e7c89f38db1c240
37 DIST gentoo-kernel-5.15.41-1.amd64.xpak 69349403 BLAKE2B 37462257c705fdf3600bc45d4b6b5564346457105ae7f7ba4fb655a8a2b7ff91422063052ccf1047cf0883977d4e3407b11d0cc604b68cc9ffd500503dc1f017 SHA512 f480c67532576e5dac934aac7418e3eae3b23b9ff73645ba9243d67412897307ebbd798edc1b195112cbc5f84545915dcc8a9004754e70c4ff56b9ff94f9716c
38 DIST gentoo-kernel-5.15.41-1.arm64.xpak 64219270 BLAKE2B 0daf5fb63aabd71a4e37c1c8ac0f101957366ada93143355fbc4924bd67611f6c6c02cbf37eefa4524f5957c5374ce548bf754f701bdd8543112e3ae25a58c90 SHA512 d1cd5f83f7a759dc4263f3fc524e1cb01f2ac025eaa22c18ff803491a5a599c3f67ca8e06610fe1d7dff11b48f95abd599d729f53f77107b7560b2a1b4d67221
39 DIST gentoo-kernel-5.15.41-1.ppc64le.xpak 57887862 BLAKE2B 6311a4bcb222baeb0a9d0a4d52ee33c6b06098119e0b154ba2829fb88fe12a1085b753738ff0adaf7b4d4bda9aa119e3fa599eb2be85d3a8a3ae6da2bdf29b4d SHA512 fb2a8e31f39c7282b7b01161ba6823ed96a8662bd741e8960bdef2940302bd8354973185406f10d20df3f3a9dbb1b8b04e44d6d6ae3cf85351654c34fda3d273
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.120.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.120.ebuild
42 new file mode 100644
43 index 000000000000..da84e07f808e
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.120.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/}-1
57 +
58 +DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
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 +}