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: Wed, 30 Mar 2022 10:44:11
Message-Id: 1648636998.1684a50670a67eaa9a07d7bb1bac20be98378796.mgorny@gentoo
1 commit: 1684a50670a67eaa9a07d7bb1bac20be98378796
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 30 10:43:18 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 30 10:43:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1684a506
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.32-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.15.32-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 842d41a1c647..b7e549d12118 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -14,6 +14,8 @@ DIST genpatches-5.15-33.base.tar.xz 1296164 BLAKE2B 25dce9e6d4047709a0995ff75999
21 DIST genpatches-5.15-33.extras.tar.xz 3876 BLAKE2B 4a7d695523ec637b847c28eb168bbd7543706ed346e863930c1c824b82087cd531d86b794605b26076000e67661f5894d0d8f081ed031b7d7e27b2f85a0d152f SHA512 f8b5b9264f917f79c6ea34605511d1b7e5a12b6336746495f42aa64a157b5879ab4fb23704e625eba53d9ce1c5a5dbb3bbf259e08c4bfb81edbe0ac6cbb1f55d
22 DIST genpatches-5.15-34.base.tar.xz 1304560 BLAKE2B d7343aa013da3db621f7d17f4ac08298d860d90950520a0665d1ba614f947a401c10d33e97e8997ce9ee8e9e83355b2c054a064ebd6af4641b3b0d1c048a9b2c SHA512 b502ae1dd5cedf5e7847d4d3519beacceb6a5f8ab0b503a36df792ab23e62e0f07166fee5817b8152c93dd5d6ece7ce3b72b6de8ac7ef6875cb9253acaa62b75
23 DIST genpatches-5.15-34.extras.tar.xz 3876 BLAKE2B 17e95df8de7387f9b3d3361cd16c1743fb2e3667df91aa2faf5c1c9bce8b0bf27d0039dd661e222457dbfb11e4e8b17dc4ba058680621c817a2ac921c5c78f5f SHA512 2963b146bf94e1fdd190f023f6a91272fc4ef82ef97189f49a2211b2ba51f32b39df4173c0aaa5c4f7dc52bc2145e36f0b86dc45ceb68c55eb77be3596f19494
24 +DIST genpatches-5.15-35.base.tar.xz 1306764 BLAKE2B 5ea5655e825b9196663a7bb830ef34d74da7c9f922f7a71b46f7bc8755adacddd3b55f57e85b29532d6936ca481699ffae36642401e34293b4c6a445abb92db7 SHA512 50030f2dafba3e7fd16df7a6dd275fdbede772273009d1f1055dc904dc7afe947e92e9a32274c337938edd35073adc2e101d18a6ccd39529461d703af3e20566
25 +DIST genpatches-5.15-35.extras.tar.xz 3876 BLAKE2B 5b14c88d66ede25e8417bdebc3c822d2f3755a13f21cef8a95088c97bba42a44357c98d13ce5a40e3aeb128ec0716540e893b108bf1f73256cb45250cd7ef43c SHA512 bdd8c5a700e9902cb7db17094fcc220eaca4774639d73e8496ac061fbba9fb80f6aa136aa9e87331a636af6146737fdec3c21249da7a18b5fec4d82de559e24f
26 DIST genpatches-5.16-17.base.tar.xz 753196 BLAKE2B 8f4be6ddb70a7407f6515d180ae8a65eed54c7a7aa3ffa4175500f532036bd13dc718a77fc9cb442f6053b1cf0f8e3bf2de2c0954a5bbfd8957a99162675980b SHA512 9550fd794ffcb29ed26be5f99116f8b53a5bc9ce3a9fd6a79d221e7f7e5e81be809eda7a8becd253361ac069526b141c414e132f11d8e1eeef84f5737c03afd0
27 DIST genpatches-5.16-17.extras.tar.xz 3800 BLAKE2B 9224e534e09bf58189462be87516fa21fc37228fe60399ef670e40320a8bcc5edbcd0371b5da5ed445ca84c0127ae6541a07999edd62f67a8619f977c70d08bb SHA512 92a0580b4e38c43c3e594fcae0cd6ad1c04621e8ea543ee7c039bd47bec9229c23f72585d98d4f237e5c80fd1a3a21205a4b688ccd67df77e048d4b417dd3884
28 DIST genpatches-5.16-18.base.tar.xz 761144 BLAKE2B f4d4b5225a2ef03e422230497861714663b430397d3118c8e1cd880eea9fbd2393a4b6848c674cce8892fdb145c06e4b3d828be05836d76a1c56501e07d840b4 SHA512 472f456ff01545dad0a9e21a3560eadca63dbbaa5dfea0cb4496d3ea8f10fc968967a97a7d483ab573312de53b6d719f8baa21761feb7b7474597af53e50abd0
29 @@ -62,6 +64,10 @@ DIST gentoo-kernel-5.15.32-1.amd64.xpak 69294920 BLAKE2B 6dd43deba7b030a279129c6
30 DIST gentoo-kernel-5.15.32-1.arm64.xpak 64208616 BLAKE2B fafb9af1e53830260acaf15c9de71b9cb0405621057a559f0d9c722a39e008ba2c66034f01cd3ee197f621a98fe7be6fd6824a4f0fe4236b9dd91fb85fb2dc52 SHA512 aaf8187edcbf43c4bff93098000601ed1e89f1c540af65a3aa8a223782190424e4597c95c7a11b55991f86558faf4f6ad77c6c4082a6861fe3183d0a9ad95a13
31 DIST gentoo-kernel-5.15.32-1.ppc64le.xpak 57985675 BLAKE2B 474e740069e15133eaf2ca5f21bbf892da1c60b01f0d67de6c283299bc2c2622b14d38c60184ce351fa9399cfe7e3cdaf651e63fdc85890059567d852888fafd SHA512 38aa410c50ffa1f4a79e1487aa29b12754b932b72fcff4d1cc0406924ddcd732577986abc24c68eb37cd4843c0da2744ed52b0b14a8d77408c754c52660e6ce5
32 DIST gentoo-kernel-5.15.32-1.x86.xpak 59999881 BLAKE2B 4546846bf959a0d23ded9e7cf497bef4d8e53a36aa8e3b9d1983b51cca060766b170c47f4ebaf2277fb104f3b7ad322629dfe038286834bc5dcb1231095fd82b SHA512 e99c85e26f6330426cc7c1a0b04723acce750960ccf2e311e61e0e1e515ef02ad2d79dadc99a0509c5a7fb407e37f94bee714b388da4c17ed0982e999ec5d79e
33 +DIST gentoo-kernel-5.15.32-r1-1.amd64.xpak 69326816 BLAKE2B e26042a6d9b77d98d2d49f5f00bba7128a5498f01b4309a0d24e08f4d38f9b9b166bdde135aad75e005f7433af331c9bee60ec166abad8a8ccd83afebcc43dad SHA512 040cd5784b2676d58ecc7b24a1a9316ad96d2fbe03add3b4f9b679285b25185a6dc1bf1ba1a40c816763e7088bd40a185266dcf535dbb578fa5a005453ef1f21
34 +DIST gentoo-kernel-5.15.32-r1-1.arm64.xpak 64197193 BLAKE2B a50633bb2a4b3c7a1ac5df5b38821b7df24f15dd883169b6e91c6d934508166fd6236c4dc3640b0bef994b7aa97551ba9b9aea8ef4e6ebb80b9131c61945045a SHA512 c4e922dd2bf942c6be335387e4266a1ed3d27ee466f7db3b4de24774e20b68e5fd2f62c5a3cb2f84db7e520211e1dc6f0c9f27040039da372cc37bafe06ac15c
35 +DIST gentoo-kernel-5.15.32-r1-1.ppc64le.xpak 57890732 BLAKE2B 7e5ec0913bf2cd77bbe726e48bd236867a7f963777ceb2cf5dc86a410e98e4c5af5888a75f304492883fbb821813a8d6428664d21c55af1a36e7ab7cc9a7ae0a SHA512 c77e1e4108b06a46758209bcacd45bc42dffdfdc273290774550b8dfb1c7a4bd287db95dba4dbcf17da88db9a0a6a04cc14a20f75dcb9f467d7549dfdf9fb33d
36 +DIST gentoo-kernel-5.15.32-r1-1.x86.xpak 60053260 BLAKE2B d56a5675c36c7e5f70661378298a1ddb33212a588f50f588676c4ccd59905b9510dd4da6a4c39c9f6504ddc0f82405670b292ee33b67a52ffc0c26a8124a5f1e SHA512 d0736c1abba8361d192d4dd43ab25e62ddcf7027df5dced00f8b50ad157d8aad4e8b141aec68fa903e4fd6f69b13544ba8a41c768c83a41b9a5aca2fe24b30c6
37 DIST gentoo-kernel-5.16.16-1.amd64.xpak 69716835 BLAKE2B 961d065169c1f657e9492144c83d0738c1d97bac8b5ab7f7b68a2a9dc9175cafb07037b4c24fc20c067fa95f2aa1f9070cdfb8e11efeeda2b97cea7cdd9f1ffd SHA512 26e2e51e51425fedfc9d8bf7529a5001eb54b2c6279e96c7f8132749709c3acd3323c9b8fbf6f2771a697fb837b13f7987b19f0c6d8ef84ad95ee0a673b60a9a
38 DIST gentoo-kernel-5.16.16-1.arm64.xpak 65166903 BLAKE2B febed4db841a18c45e63440a4b517401592b2fd25a1dcdfda5107ffdb4e5c1d4284af2f2ea61964f1bf9519069f5c8a7fecdc1eb9c19ea0cdfd269911870481e SHA512 bb7cd2fd38a10d0608b7fec6a818e323292747616171411ba5a47886ef92c3df3cf7402124f0740f3a12724db1c64a94c1c76a5c6d4ec329018af12196fd24c7
39 DIST gentoo-kernel-5.16.16-1.ppc64le.xpak 58506473 BLAKE2B 8d66bae7d90141c67d7355740d13028f8aa475b829e94ef26f9e338db3564d758009e4e3fd3ae2dc209e7bf6dbd823c1d08b06d39c3dd92613002c0555a06ce8 SHA512 c9121593ea8c810a49120d2230c51b1e1335386415a390f5b37b80b02adae4efde7d4d5efc1b6be3e00e3266cd2c7cc57ee0815b4d85aadafbe1b8c45ccf8e70
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.32-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.32-r1.ebuild
42 new file mode 100644
43 index 000000000000..4a68da434ca9
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.32-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##*.} + 3 ))
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 +}