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: Sat, 29 Jan 2022 22:56:03
Message-Id: 1643496954.51a7b2a52390d944ffb163d91244b0bba6611e75.mgorny@gentoo
1 commit: 51a7b2a52390d944ffb163d91244b0bba6611e75
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 29 22:55:10 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 29 22:55:54 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a7b2a5
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.18
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.18.ebuild | 131 +++++++++++++++++++++
14 2 files changed, 137 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index c83695de092a..988690749f46 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.15-18.base.tar.xz 697228 BLAKE2B 01a377a9c1f2709ad2cde18e3094d
21 DIST genpatches-5.15-18.extras.tar.xz 3852 BLAKE2B d3521142bf5ece893429ec7e1b6aec724fff15fbba2f80e9fb092af4d40bc258e034226989d2502ee258faa0c7e0aacd885499d22f4317060d61cd916e00e7fa SHA512 f1a98d3875541ec4b8f3461c1af8a9b37fd4f5a64e7d717e906f851bf4e976e4509df4b8cb67b9e210215cc33924d039599cecc8f4892dcbed510e00f8119df8
22 DIST genpatches-5.15-19.base.tar.xz 925776 BLAKE2B 040a1cabc9217a91e8bae89ef7878e61056f3eccc97472a27dd2b3c695b2bce59c487ff303048d1f98553349c0b6227d0a3dfa837ccfd6cfd7b1147606b4703f SHA512 b2facd0ba66001ce9327ef2d037097e78e4b9c8e02eb5b66f9ab9bacc6af5800ccfe576ca4383c263c597a67e92b96bb0287140396a602f15fbec403a4173a53
23 DIST genpatches-5.15-19.extras.tar.xz 3852 BLAKE2B 9ae7ef921212fb3b67dedf9647e0ca3091382410a5bf9c7ae67539f9cac0b97f54eef1bb63279481722184bf0e64d4208928d9485f670e47f0c60e62a0bc036e SHA512 462cc99b18a41f5dc2265732d63349c17696d5ca4e360e23e50ecfe56f3b08ce7d5bb0dc1505011cd5336c16057d1f9d97c3faecb551f4eeffe4d8ca95938998
24 +DIST genpatches-5.15-20.base.tar.xz 934800 BLAKE2B 6134e0fb2d9810d96809e5f0994361183c0a1bd188ab24ecf83f76914efba3d9341dda8ee0ba3ef4d02f2cd7c93959aa2b59aaeddb4fff6807faf2ac623e7d56 SHA512 43281972c4eadc5299bf16270021531f9c56943a907331e7c1ee270b2e26f745693d0d312c5c2487de82f4d8df164dcd1e2e132a3d3fd86866467ccfe1776703
25 +DIST genpatches-5.15-20.extras.tar.xz 3852 BLAKE2B 277432195bcb89cffe0fcb0ab0b2f00b889fa7c39c6178d81eb7426405f1bf5b85bc2d6bf5a69e6a0e2c18431eb768d3cae116fd8523de25f720479cc860d6d6 SHA512 e565d94865328b2296fbab040a7bb70444410d478a0b361c1b3502a0d8263ee868fbb446adb5f680716bbd189ecb42519c63849d92690c7e504975a5ff43ffe5
26 DIST genpatches-5.4-177.base.tar.xz 4317444 BLAKE2B e7ad5f0a561dc50a11aa3720c3096230d8209c58a523da7f6f0fb1b0c8ed903780d74c48edc2791f8d8ba7fdc946ef0fc506d73ff3f86e9e2bfb4c05609d4456 SHA512 0e04707f1f5e85b53f425d54c74d9483d33280769d1cdd5122e34d19dfea1fcf0cf258d84579f3f169a1f620d9107a7d454970da313806c5edbad8a6d8632c9d
27 DIST genpatches-5.4-177.extras.tar.xz 1784 BLAKE2B e840ca0c6b2dd9399ff4f0d03e828bbb42f53528e1c13b2825c5439cbccdc36577f029caccf91690857cd6e4901cebd98cc27e2ad2d0644c7503822563f38d0c SHA512 a17abf06bb76236986b9a86f671dc60544b39fc47736aca69359e6d68699a52a3e72b1a2ebd57f78602114e9d1f5a201f37121bd6917f50c9d06e385b194cb20
28 DIST genpatches-5.4-178.base.tar.xz 4382260 BLAKE2B f43573bed5925ddad264a150c6bf7e769771cbb89ec56c0c07f73375c19386ebd15b538b12b89c9e18ad3592b1be038288f8bc4e8ee4365fe92c118d81e3a5a7 SHA512 26fec31e23bb0758ec4a5c5542868795172d7717dcb1323cb9a930cb9b60c860cd033836d9ef80ab327a85656f4a70a46a597ffdb8e9ad27f7431d1bd1944b31
29 @@ -26,6 +28,10 @@ DIST gentoo-kernel-5.15.17-1.amd64.xpak 69148683 BLAKE2B b40154c0680e5f4220cb8f4
30 DIST gentoo-kernel-5.15.17-1.arm64.xpak 64063189 BLAKE2B ab53f70019e9653aec8c41f6601fef52255ece5036002c8b3453b14977d6af9fb801d2fe3d139c96be0d5be8a86dfd4d1ffdbd2dccba9edad7c96d80f258366d SHA512 674491916aea32cca2cc52b4dc816158011709a4a16062480f67ef42cc7f4e376f94e1fa2b7b7151bacd96d5870464237477ec948c6ee84b1db071491d5bf5de
31 DIST gentoo-kernel-5.15.17-1.ppc64le.xpak 57779621 BLAKE2B 958c2240903d55f0f7eb6065209526cd7d74c5ac955b96cdbb8e04aa4a8d7a9e19ff088e7709c1af466d2ed6ba59113f17edb4b2dc5f84e784ef5d37d52d197e SHA512 2b7ce28f1608a7a617c6ce58fc6e7a6a166c2ec2493869b2cde0fa5899cd2187a9adcbb705be2c0ae0907628c71eff2c7f48374d4a2ee3bab412b4f82060893e
32 DIST gentoo-kernel-5.15.17-1.x86.xpak 59906195 BLAKE2B 4d1e9b6968d07838feed61b315fccd1bbfc7e389af430006e8bf51736ae41be72bbf8abf50d539cf95bbcef1a8ff01f4bcacff434452eb1829d6b658b4361cce SHA512 412390ec4cd903f554e39fe6ea7884dc24c2a83573797eff363b18ad0b2577954d21b190f9777cd398fe15a1ab40eccd1b208deb30dfb1012d675b3ed699f935
33 +DIST gentoo-kernel-5.15.18-1.amd64.xpak 69132656 BLAKE2B 5e94ab481497164deed411eba7efcaf02bf933a84c3789ea8c0871cdd85cc7707533d37a6ea8196fd2279b1007e66485d8741127fd83b3c1b7d32a629e4409b6 SHA512 c903d2922fd12b7e2337d630fa5f055acf770d5b6b241466073c6d9bfa8645292c111cecf3b1d0e54058c30ce1878982d29a0b4912c5b7afaa0e829b487cc6a8
34 +DIST gentoo-kernel-5.15.18-1.arm64.xpak 64082286 BLAKE2B 89b8c281c46eb0bf2a5161011fa9a6d3874be5553aa3fc659af45fba4a61a5bb02d608b3b70d3c7ebd41881dcb88ecb11fd9858d39503cba351e063aa5c35226 SHA512 c050e965c4f785bae4517f75c7e4c601bf7aa2c655ec33803ca4838b57d0169703033f2c57cacd5b5618e7a86678130ea3f73b5256a796a58bf22287f94299ca
35 +DIST gentoo-kernel-5.15.18-1.ppc64le.xpak 57937156 BLAKE2B 36e0a5aa9c2151edaca6543ea589fbb41648d2517642299ec4f4dba8629425a4fa0c85b042865ef85b006fc3e85406ad7ddd12278bce694db6641be47727ccf2 SHA512 54812ab67c1869b01dea64891e7950b53f859fa7d24d1c63661b6c7da206376a616c77b5364b0ea7a2f46b7fb1ab98e80ab2438c7fa42dfc42beba42c63ded26
36 +DIST gentoo-kernel-5.15.18-1.x86.xpak 59923665 BLAKE2B f574ea558955cc2b6ebf2b1e547e205becc787116b7767f21357c8af8c61370db7bbea6731c24288f8923c74603665b05c0bf29f5dbe38a106b50e590e0a5426 SHA512 a26ccdf1b97c2342422177309f27206da56d1633bdcebde2dabbe02654c594bca2ddb15ba90008897af35aac6c3b0719d1111a448bb02bc60c7ad3e3f959af30
37 DIST gentoo-kernel-5.4.173-1.amd64.xpak 61491991 BLAKE2B 3f675236bf895b44d790d0d57f66398a6a887b2131c456b9d9919749d239d0eb64ad3f5455b55c5292aeb2345c651d32e86ddd06f4910df585b13c3eb2e4acdf SHA512 9365ba5ad810bdacdfa9f027f366dff44ee3ea293d7106d877229c485234fc76982cc046888c83cff699261129ba1a4aca2de15ccfbd86bae0b3d44e800b9bde
38 DIST gentoo-kernel-5.4.173-1.arm64.xpak 57634871 BLAKE2B 2a8f8b5a9e5d7050ca931591f5d922ec34018784237fb678de9c4b365822b17eb85da9a3f4725dc36ba6550afa9720ece0c9c4ad29ad3ab475b7770f7e0d3cca SHA512 887e4bc46b2de5affd6cd318330774c9a4802053e21c4430bba205cadbd3c49083d63fb9685ddb82c24e93d55b3de8f43ebcf00d76b8a8966fd61170bc6a7459
39 DIST gentoo-kernel-5.4.173-1.ppc64le.xpak 54968644 BLAKE2B 3b23f23aa63b8bc0235cfb3e169a27f9226c8ccbf785361accf7906d3b1963cffbf71b5ad05146f9ba676daf8bc4ccb3d32f86c0d27ed8aa7b2fe1bd43836eaf SHA512 7312d2f633cc410d4af4fdc2706de3cd971bf012484bb226f1e47fbfec84b642293145be5d92c11f30485f38458ef81bc50147d393e1a145ebdbf0c602a55e9b
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.18.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.18.ebuild
42 new file mode 100644
43 index 000000000000..fc9dbc62cb30
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.18.ebuild
46 @@ -0,0 +1,131 @@
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##*.} + 2 ))
56 +BINPKG=${P/-bin/}-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 +S=${WORKDIR}
81 +
82 +LICENSE="GPL-2"
83 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
84 +
85 +RDEPEND="
86 + !sys-kernel/gentoo-kernel:${SLOT}"
87 +PDEPEND="
88 + >=virtual/dist-kernel-${PV}"
89 +BDEPEND="
90 + sys-devel/bc
91 + sys-devel/flex
92 + virtual/libelf
93 + virtual/yacc"
94 +
95 +QA_PREBUILT='*'
96 +
97 +KV_LOCALVERSION='-gentoo-dist'
98 +KPV=${PV}${KV_LOCALVERSION}
99 +
100 +src_unpack() {
101 + default
102 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
103 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
104 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
105 + eend ${?} || die "Unpacking ${BINPKG} failed"
106 +}
107 +
108 +src_prepare() {
109 + local PATCHES=(
110 + # meh, genpatches have no directory
111 + "${WORKDIR}"/*.patch
112 + )
113 + cd "${MY_P}" || die
114 + default
115 +}
116 +
117 +src_configure() {
118 + # force ld.bfd if we can find it easily
119 + local LD="$(tc-getLD)"
120 + if type -P "${LD}.bfd" &>/dev/null; then
121 + LD+=.bfd
122 + fi
123 +
124 + tc-export_build_env
125 + local makeargs=(
126 + V=1
127 +
128 + HOSTCC="$(tc-getBUILD_CC)"
129 + HOSTCXX="$(tc-getBUILD_CXX)"
130 + HOSTCFLAGS="${BUILD_CFLAGS}"
131 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
132 +
133 + CROSS_COMPILE=${CHOST}-
134 + AS="$(tc-getAS)"
135 + CC="$(tc-getCC)"
136 + LD="${LD}"
137 + AR="$(tc-getAR)"
138 + NM="$(tc-getNM)"
139 + STRIP=":"
140 + OBJCOPY="$(tc-getOBJCOPY)"
141 + OBJDUMP="$(tc-getOBJDUMP)"
142 +
143 + # we need to pass it to override colliding Gentoo envvar
144 + ARCH=$(tc-arch-kernel)
145 +
146 + O="${WORKDIR}"/modprep
147 + )
148 +
149 + mkdir modprep || die
150 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
151 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
152 +}
153 +
154 +src_test() {
155 + kernel-install_test "${KPV}" \
156 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
157 + "lib/modules/${KPV}"
158 +}
159 +
160 +src_install() {
161 + mv lib usr "${ED}"/ || die
162 +
163 + # FIXME: requires proper mount-boot
164 + if [[ -d boot/dtbs ]]; then
165 + mv boot "${ED}"/ || die
166 + fi
167 +
168 + # strip out-of-source build stuffs from modprep
169 + # and then copy built files
170 + find modprep -type f '(' \
171 + -name Makefile -o \
172 + -name '*.[ao]' -o \
173 + '(' -name '.*' -a -not -name '.config' ')' \
174 + ')' -delete || die
175 + rm modprep/source || die
176 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
177 +}