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:57
Message-Id: 1654535602.594246135b6993cb4e99fd3e72a267b48eea9e55.mgorny@gentoo
1 commit: 594246135b6993cb4e99fd3e72a267b48eea9e55
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 6 17:13:22 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 6 17:13:22 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59424613
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.45
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.45.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 68d366744e89..8c252522cff7 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -12,6 +12,8 @@ DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681c
21 DIST genpatches-5.15-47.extras.tar.xz 3932 BLAKE2B 37fad5be81ce4ff7e0ddb17772893055c06789e02e7b5043c205bb94c483704aea802822964f89d0f90deb4a02070d9e6c1f9924059a8ff2920367cc9fb5e007 SHA512 0a680400cfa7043efb47dac7642675f327ebae2409da95468c1fa2b70ea0de6ec50c1e1325aea7796a1cce641994b29d209cf69e9ae4e8df7f228b38e6e302d5
22 DIST genpatches-5.15-48.base.tar.xz 1909116 BLAKE2B f3b0a3234a30ca102daceee913682488db12cb6cdd5587ea96d4a2bdde0db2c1bddd26ba0e9ebff3632c3cf4f26ed8695043179ea1e3f160bc84b721b73282b9 SHA512 57102597ad1f18e7b94666b431db5ecf96011d14ad76754792793f98bd57811a16f52358ca28728d33c60f5d08203f77003d1312f6092617bc3c804fa4d8d839
23 DIST genpatches-5.15-48.extras.tar.xz 3936 BLAKE2B 9b4063e107540bc974fab302dd638f468c461780f35bf23e885037bea7fa8a521db5071a40560b9739b042609376f9d703c38bc943bd85987c95d2b0a87636a6 SHA512 f32559fc7935bc4d8059f7a806d5b3153f3f3248b6b8f60a4b746eef04028d0aa7526eab6e41ae25e2f07a8388fd5a1f89648e9ed83c123d2f259911efefbb09
24 +DIST genpatches-5.15-49.base.tar.xz 1924264 BLAKE2B 413b52e2d56b8da573f23def0f2f6424072cdc1019c06a208986ad7e876a7cdcb9bd2ecac3ffc53ed07ae36756c4cde13713c07058bd67953d40a7b968935805 SHA512 874200e89cdcc359476809b36d118a97839d79df4067e423a9b302d1830f54e381c70d93576ca14c3f2c57b5c3ac256d38321c5c48334e6ad4de527c4821b00e
25 +DIST genpatches-5.15-49.extras.tar.xz 3932 BLAKE2B f38c4df269bdaca692d05f2b478b3133d5c55810d2e2d8689850bfc50c9eb108943446ebaf44b87889f8619006f6f8789da09137963aef6e08a95784dae65b25 SHA512 9b00de23b1112f192a10284f5dd6f1846d42e3e0df74aa63d58d4523cfd66eea227854aa7088b0389fe70ffb4e945ee7f6e1d845fb299faf0bbd394902bd5473
26 DIST genpatches-5.17-13.base.tar.xz 713196 BLAKE2B ecba47430d0aeaae2d09d586a9ea016b0b602e2005ae7bf04ffaea7967a7542660dd4bed6cbd5268f187416896c046fdcb7e1aeeccbf293012d11c7473c4d6aa SHA512 fad3e0c53a5bf450dd9dec4146233e322553e110c8b3bd93c53cdb664859aeeb3e5c861f5e04cfbd550014288b7dda9b5740e5d970c443c140c8bfe0559ab82c
27 DIST genpatches-5.17-13.extras.tar.xz 3932 BLAKE2B 9aa42ee7af3c16e41f6bfffa91855a8f1949d795fd435f0334d89de5240238cdf5fd14b964236973d3178172db2aff98989bc3626f9ca6d9f9878711fc6bc581 SHA512 1cea0fe9035f02f8099768608bcc1d896234058af984db268bd03cd27e3f12c2ad108b3f6d90be11b7edd53983d19d7ae3a00de87f62c3e80f1eace1cb5660d7
28 DIST genpatches-5.17-15.base.tar.xz 769140 BLAKE2B dface984138a5b7f75911c7d6a4b7fcc67349f8adfcf863aa960fdddfb0e426fb0e408cd2f725db8df17cc9d742a68f85e24c91c644b3f0c7ff142fc105fcf24 SHA512 8fed293b503b150507ecdca6d19011083cc1e3e5caa9ec4bc8527e282892c2dd35d24b746403d2b6a746586b526ee07c2fb50e97024ac409d03aefc50c372aad
29 @@ -50,6 +52,10 @@ DIST gentoo-kernel-5.15.44-1.amd64.xpak 69338858 BLAKE2B 5d272f9b4f03ea40903e246
30 DIST gentoo-kernel-5.15.44-1.arm64.xpak 64235463 BLAKE2B 5e22a209a0776b8a3ad96e709f3eaf3df074c411764065e18f77d4fcfe45703f26aad5c4b5f226fdb4b6d2021bec8bcc4c08b504d2fb4e03c2d808b235bb5589 SHA512 e73519c883b8bada4fe60e78074739bad13abb1806d37e5a475fd50284714087acfc562f411d2d767dd2b04f343d76d556bff24b07361a9dcfaad125565e797a
31 DIST gentoo-kernel-5.15.44-1.ppc64le.xpak 57988582 BLAKE2B 72a78861279f195dd95eeab20df5ec9f8fd7abda437990cd6faee31434da7d48bdaf5e81e0e40bdfbb6d86929ccab9c5f06404204c53f6135f08221847c9655b SHA512 52691050ca1a30b3c08a020a461bb46a8702818b93a906b02004a314ce407e20ab03fc0ed7c934e937db7f0299bfcbaeaa06d97847748129fd1193cd11a52d0b
32 DIST gentoo-kernel-5.15.44-1.x86.xpak 60022582 BLAKE2B 8b87258a199dbad3e4597c9dff615bb920d6baffe9039ded5635e288f47e7bada859e0daa1195f7faccfa078674566e3cc487b438aa8b49aa94a6dd3f1d6b8d2 SHA512 df625e91a53a0d95fc97e224dfb5d1486120d717655c3925619319beb4a00f3a67c117d5bf40c854aa2f7ceec560b994654e2ca39dc86898435d221a04b6c2c2
33 +DIST gentoo-kernel-5.15.45-1.amd64.xpak 69297366 BLAKE2B 7e115dee1cd5a433dcd9159bba1236fe2837729952c7ba29fb968417715679cb701b355a0ca052f68533bd0d889ff78e371fe301b47444cadaf733d6577749f6 SHA512 d5b95888c8cc87ecbca45223efbae962b7f2f4195fcf5569df52d445f22dcaedcd117a37790449da7d4765c86d1fb0f22bf5a1f72a7842d1969aa3040c24f4cd
34 +DIST gentoo-kernel-5.15.45-1.arm64.xpak 64200982 BLAKE2B 37412de110d0aac950bc5a02a0f3608d33b42ccadf743ad21e996bf96d7e21572d61f0142720907e1a26a842a320683bb78011e65241727573f40ab885dcf23d SHA512 0b3cab7beb0982523d5bc5a9b833d79652c24e1c3ba322cc66f66752a1afa8cccf4ba8eed7611eb11fb59641dc93ee31ae6aed8917cc46ca042f96b04d147b3b
35 +DIST gentoo-kernel-5.15.45-1.ppc64le.xpak 57968401 BLAKE2B c23eae0c10489b9b6ca0e7d8ef53c092d65c3f1295f86cf8aac0efb46f077649037bfb09b7f6fbd881648f2b94861410fd038ce44dcbcfb0c2a4c6212150b80a SHA512 bc551333ad6d455856580d429cf861866be21a7ace3382073173fd851a8cda5d8fb646a9d4953bf34e4b76bda6beebbe2200691628e97ac3265944237981253c
36 +DIST gentoo-kernel-5.15.45-1.x86.xpak 60042195 BLAKE2B 1751a69baed7b6a7537808e0f41c10d8e306890f5dcf20676c62de5d1852a79ff43cd3356b50e80bf0b9f762e42cf0f20cba44d30c922f3fe1987ea02e1386e9 SHA512 ae4a3405dffa3b0c18c4eb71d9cb6db6d7dce798bce01ee71c080565e8372e218b04f97da5778b19a39c6a7826258a17b179f4599dbc5cab6333cbc7f11eebd4
37 DIST gentoo-kernel-5.17.11-1.amd64.xpak 70396924 BLAKE2B 55c9baa3d8048dfe4ca5b384eb96820ef29ab00adea2f19ec40342af80dd1f5a87cdfff8e9f48e74c3cae72e35f810c37e7ea11d4b9e4250fc2304884f4ad7bd SHA512 7e73f9a63d4da4311a544b3f35dddbbe5b06d2483a462441b479faaa3513d02362a27266da93d577c43b972c38b9e8ff838db228802d1212e3036ef6cdd68815
38 DIST gentoo-kernel-5.17.11-1.arm64.xpak 65832464 BLAKE2B d03ed7cdb970c02814f903d1ab728138bbc55d0ee39dfed1d797ef5d8cb097f2d4501aecbd582ccd6ad0fa678bb6392163205e7ec488b5899dff5159080168f1 SHA512 1de69d8db852aad7aa62f8ae9190038ed1ee0c337bcd7ee74a0882ec0abc8813eb37a8ab43d1a0379b94c1f2b60ab47740cc9a85971bb09aff20f7cb5c3f5eb5
39 DIST gentoo-kernel-5.17.11-1.ppc64le.xpak 58784154 BLAKE2B 6694c16997f231c8bb236988d6476405d581a0c2401c6c8a2c5806194da679d78d3ec059b6308f32cd0da570c91acce3441ac8329c340fa2d494e6765ac9944e SHA512 aabffde89bdf2e39a45b49cfcabe47469df80ae1b2652248b89d47cf8a735f3b59f8274b494dce1fba35ae66ed45216146cbcff53fb13d99cc33323d86466a2d
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.45.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.45.ebuild
42 new file mode 100644
43 index 000000000000..0787e9b25ee5
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.45.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##*.} + 4 ))
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 +}