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, 30 May 2022 20:38:27
Message-Id: 1653943098.971c7109c050cd95f59bfec1a75a631920ef4970.mgorny@gentoo
1 commit: 971c7109c050cd95f59bfec1a75a631920ef4970
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 30 20:36:53 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 30 20:38:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971c7109
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.44
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.44.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 a5e518c27240..4769640195e5 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -8,6 +8,8 @@ DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33
21 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
22 DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681cf3fbd591278c1878e7f1aebdfbdb726b5c8ccbffe43bf2c34e5baa57c04eb5fb08a723b9473b843639835383bbde464c1ade SHA512 e6ec4a4ab7abf3b91face2df9f8fa7089c054a7c5e44d8404742d05dac9bf7940e6c0f97f219519f8bce22f3cd3e40fd98c856da866b5cbd637094aee1bd884e
23 DIST genpatches-5.15-47.extras.tar.xz 3932 BLAKE2B 37fad5be81ce4ff7e0ddb17772893055c06789e02e7b5043c205bb94c483704aea802822964f89d0f90deb4a02070d9e6c1f9924059a8ff2920367cc9fb5e007 SHA512 0a680400cfa7043efb47dac7642675f327ebae2409da95468c1fa2b70ea0de6ec50c1e1325aea7796a1cce641994b29d209cf69e9ae4e8df7f228b38e6e302d5
24 +DIST genpatches-5.15-48.base.tar.xz 1909116 BLAKE2B f3b0a3234a30ca102daceee913682488db12cb6cdd5587ea96d4a2bdde0db2c1bddd26ba0e9ebff3632c3cf4f26ed8695043179ea1e3f160bc84b721b73282b9 SHA512 57102597ad1f18e7b94666b431db5ecf96011d14ad76754792793f98bd57811a16f52358ca28728d33c60f5d08203f77003d1312f6092617bc3c804fa4d8d839
25 +DIST genpatches-5.15-48.extras.tar.xz 3936 BLAKE2B 9b4063e107540bc974fab302dd638f468c461780f35bf23e885037bea7fa8a521db5071a40560b9739b042609376f9d703c38bc943bd85987c95d2b0a87636a6 SHA512 f32559fc7935bc4d8059f7a806d5b3153f3f3248b6b8f60a4b746eef04028d0aa7526eab6e41ae25e2f07a8388fd5a1f89648e9ed83c123d2f259911efefbb09
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 @@ -36,6 +38,10 @@ DIST gentoo-kernel-5.15.43-1.amd64.xpak 69301097 BLAKE2B 5d56815f4421afb75974c36
30 DIST gentoo-kernel-5.15.43-1.arm64.xpak 64221919 BLAKE2B cbb29dc2ae0817402dd8b06350fe5161a275e2203d2c92cc9c7863149405186294a44d4a03fd4d259d38be86cf6b4db31d9d5906d8aac1c60eee88e88da3a801 SHA512 f693a453ef90394c7e6af1ba10803e93d72d4675a16db4acf31296552f113bdfe9deb3d4729104668af6c58e5913a11f2635e054fc68e1e9a087152064ada3ca
31 DIST gentoo-kernel-5.15.43-1.ppc64le.xpak 57921217 BLAKE2B 82314b6dbb017fbcdc54d39993faec8a9153b2506e505cf8df61e78a4495da7070eba069a9e4b63f24624473e4122ac3e1491fb9599d28f29f491840833875d5 SHA512 917f672fa2421a0ed6fee93e41670233bc2f324b4c146b1e0e21bf57bb404a37fa4f67d6b9d8319d8036b98c01ddd28ed94bec3a4c3dbd8027a212f34c0ac743
32 DIST gentoo-kernel-5.15.43-1.x86.xpak 60028294 BLAKE2B e08cd541fc79f2d59ec814a769483103c64dbdd88f093febbd18cef3be9d8fde97e757c880069929d2b4def0a7a763a17a01fc9cded297a2f82ef97f455a295b SHA512 b7d44cf33050c250989baeed7d83b88fd65e62680fe90388589c66464cd285417014331327e53e6995fee8736e87205633252c818c4adbfd5df170cbe149a3ce
33 +DIST gentoo-kernel-5.15.44-1.amd64.xpak 69338858 BLAKE2B 5d272f9b4f03ea40903e2465408c85278a6f2c18db475681d7353436ab1501b401666e290597d3e99145896ca99d67c4dd47c0ca29d80b6a0fd0eb50021a8761 SHA512 b939684b60fd5ce867496810852624dbcf61a70efb40bc81a94719f0b8a924fab8eabd971f10ad67da9eaa5f3c7166814c7695c6bae79674c38e31e1c7029e3a
34 +DIST gentoo-kernel-5.15.44-1.arm64.xpak 64235463 BLAKE2B 5e22a209a0776b8a3ad96e709f3eaf3df074c411764065e18f77d4fcfe45703f26aad5c4b5f226fdb4b6d2021bec8bcc4c08b504d2fb4e03c2d808b235bb5589 SHA512 e73519c883b8bada4fe60e78074739bad13abb1806d37e5a475fd50284714087acfc562f411d2d767dd2b04f343d76d556bff24b07361a9dcfaad125565e797a
35 +DIST gentoo-kernel-5.15.44-1.ppc64le.xpak 57988582 BLAKE2B 72a78861279f195dd95eeab20df5ec9f8fd7abda437990cd6faee31434da7d48bdaf5e81e0e40bdfbb6d86929ccab9c5f06404204c53f6135f08221847c9655b SHA512 52691050ca1a30b3c08a020a461bb46a8702818b93a906b02004a314ce407e20ab03fc0ed7c934e937db7f0299bfcbaeaa06d97847748129fd1193cd11a52d0b
36 +DIST gentoo-kernel-5.15.44-1.x86.xpak 60022582 BLAKE2B 8b87258a199dbad3e4597c9dff615bb920d6baffe9039ded5635e288f47e7bada859e0daa1195f7faccfa078674566e3cc487b438aa8b49aa94a6dd3f1d6b8d2 SHA512 df625e91a53a0d95fc97e224dfb5d1486120d717655c3925619319beb4a00f3a67c117d5bf40c854aa2f7ceec560b994654e2ca39dc86898435d221a04b6c2c2
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.44.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.44.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.44.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 +}