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: Thu, 27 Jan 2022 15:06:23
Message-Id: 1643295969.2a281c16b8cb3b065ebb647816284be452e913eb.mgorny@gentoo
1 commit: 2a281c16b8cb3b065ebb647816284be452e913eb
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 27 15:05:25 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 27 15:06:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a281c16
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.17
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.17.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 f9266ecf5a85..f3986bae4ba6 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -2,6 +2,8 @@ DIST genpatches-5.10-100.base.tar.xz 2822696 BLAKE2B 8958af480d9babf927d8b1ac5ff
21 DIST genpatches-5.10-100.extras.tar.xz 3852 BLAKE2B 7ac718b6080adb6a641ef7b976185b09ddf7f225fcaede25afbf6a15bf855eb6dbbe44416fcddf1ea466c36433e04736c68f032a1c79bde858434427c6658a1b SHA512 558c9fc3279d7fb507ac8251369966dd40282776890da045d96eab328fd7300a93dab12afbfabc3dd52f61d49c0020b87cd4087d4c8f840f3443ed8ffe89c81d
22 DIST genpatches-5.15-18.base.tar.xz 697228 BLAKE2B 01a377a9c1f2709ad2cde18e3094d37ba2414c7c3d949f236d41f5d36e8c4513331c4859740ec34bc8418d6fb2457fbb7d9f7c64f6f596795e1abc9a02c9e340 SHA512 14a652cf64e8e22539a61f14af715fd1a59644875a8a61473b5eb66bcc7b5f4bb34602463b208114bb4dbb73f159932983d48c0567a44b5090b9ff8f52920eaf
23 DIST genpatches-5.15-18.extras.tar.xz 3852 BLAKE2B d3521142bf5ece893429ec7e1b6aec724fff15fbba2f80e9fb092af4d40bc258e034226989d2502ee258faa0c7e0aacd885499d22f4317060d61cd916e00e7fa SHA512 f1a98d3875541ec4b8f3461c1af8a9b37fd4f5a64e7d717e906f851bf4e976e4509df4b8cb67b9e210215cc33924d039599cecc8f4892dcbed510e00f8119df8
24 +DIST genpatches-5.15-19.base.tar.xz 925776 BLAKE2B 040a1cabc9217a91e8bae89ef7878e61056f3eccc97472a27dd2b3c695b2bce59c487ff303048d1f98553349c0b6227d0a3dfa837ccfd6cfd7b1147606b4703f SHA512 b2facd0ba66001ce9327ef2d037097e78e4b9c8e02eb5b66f9ab9bacc6af5800ccfe576ca4383c263c597a67e92b96bb0287140396a602f15fbec403a4173a53
25 +DIST genpatches-5.15-19.extras.tar.xz 3852 BLAKE2B 9ae7ef921212fb3b67dedf9647e0ca3091382410a5bf9c7ae67539f9cac0b97f54eef1bb63279481722184bf0e64d4208928d9485f670e47f0c60e62a0bc036e SHA512 462cc99b18a41f5dc2265732d63349c17696d5ca4e360e23e50ecfe56f3b08ce7d5bb0dc1505011cd5336c16057d1f9d97c3faecb551f4eeffe4d8ca95938998
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 gentoo-kernel-5.10.93-1.amd64.xpak 65587762 BLAKE2B bd99d1842a244a3424b835106e6478a7e010ec07bbb801126f3492f8300438885b2ce141b08e79e89329140a606e27afb6ae8d5f19c8f22526bd31a76b9933c2 SHA512 19c3063f034b6c4265a7a821116d5ba01c26975863b9205181eef6c8ff189ca5dd2199452f24b9d6dec8f88deeac788095f9138f69e30511252cc35e7a807d00
29 @@ -12,6 +14,10 @@ DIST gentoo-kernel-5.15.16-1.amd64.xpak 69106038 BLAKE2B 78623923862279db4eaf156
30 DIST gentoo-kernel-5.15.16-1.arm64.xpak 64049610 BLAKE2B 0d1ca4fc9a688627ccfcba8c5df1834e3788c321a46d9beb8e03521f786a2b5d8d9c5a5d53b45cae81b50f12d33cfff023ac1dbbbd0267d67ab0cd0cb37c925d SHA512 ce6b3741a01df1fd724d92a1543f71a09564230ada4b552bb05eb7480123db4406e25898566080ce81122fb64e94cf04fd161f1d04788b73a641cb213cf677c7
31 DIST gentoo-kernel-5.15.16-1.ppc64le.xpak 57775378 BLAKE2B 54cd093059112ef1f92eb813be1717757fc398e6c5e8b5b1e961c43c4f585aa385eddd339c73dea161b623194e66df915d580576cfb52199356c18db7245bebb SHA512 ecf60dd546c5a1a63b2dc66f4e368a7a5797b193f382024c372af0a53fc6d1dce33e9e79023bc593fdfb9d0ecadf1e48765852b790024f3b0ac01e696d8bbdf3
32 DIST gentoo-kernel-5.15.16-1.x86.xpak 59905344 BLAKE2B 6ee3a539d9a7c08f0097a02386aa90afcd576836ecdbe39c9411ae9fa44ccb944e22314cf187362e0116fab6d55c08230d75bdfaf205ecd1ed819aea7e8f81b0 SHA512 94ef702bb5c4c78ed9557e74f1e3acab60a5855f9c0ecdc24e811e61845d5eaac22eb502d9e287ab2a0fe9b591ffe8fad0c0fc53eb484c737fb1f2a0b22a0a7a
33 +DIST gentoo-kernel-5.15.17-1.amd64.xpak 69148683 BLAKE2B b40154c0680e5f4220cb8f4e2fb46b4148a3a460f96d368864703c7978611cc75278ccb49dd020b0d025b007797d7eed419f19efebaf7a05bf51ab103057f214 SHA512 0e1237a74ab57b9beffbb86d42108957d9301aaede2f2f6833c07a0599f3bf7def78236ecf86870563176400f32062678dad6015c3e0f5461336ba982e46b9b0
34 +DIST gentoo-kernel-5.15.17-1.arm64.xpak 64063189 BLAKE2B ab53f70019e9653aec8c41f6601fef52255ece5036002c8b3453b14977d6af9fb801d2fe3d139c96be0d5be8a86dfd4d1ffdbd2dccba9edad7c96d80f258366d SHA512 674491916aea32cca2cc52b4dc816158011709a4a16062480f67ef42cc7f4e376f94e1fa2b7b7151bacd96d5870464237477ec948c6ee84b1db071491d5bf5de
35 +DIST gentoo-kernel-5.15.17-1.ppc64le.xpak 57779621 BLAKE2B 958c2240903d55f0f7eb6065209526cd7d74c5ac955b96cdbb8e04aa4a8d7a9e19ff088e7709c1af466d2ed6ba59113f17edb4b2dc5f84e784ef5d37d52d197e SHA512 2b7ce28f1608a7a617c6ce58fc6e7a6a166c2ec2493869b2cde0fa5899cd2187a9adcbb705be2c0ae0907628c71eff2c7f48374d4a2ee3bab412b4f82060893e
36 +DIST gentoo-kernel-5.15.17-1.x86.xpak 59906195 BLAKE2B 4d1e9b6968d07838feed61b315fccd1bbfc7e389af430006e8bf51736ae41be72bbf8abf50d539cf95bbcef1a8ff01f4bcacff434452eb1829d6b658b4361cce SHA512 412390ec4cd903f554e39fe6ea7884dc24c2a83573797eff363b18ad0b2577954d21b190f9777cd398fe15a1ab40eccd1b208deb30dfb1012d675b3ed699f935
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.17.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.17.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.17.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 +}