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: Fri, 17 Mar 2023 17:18:19
Message-Id: 1679073478.77fcaa904741741332c3c3ee041a231c9a596062.mgorny@gentoo
1 commit: 77fcaa904741741332c3c3ee041a231c9a596062
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 17 17:06:53 2023 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 17 17:17:58 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fcaa90
7
8 sys-kernel/gentoo-kernel-bin: Bump to 6.1.20
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-6.1.20.ebuild | 127 +++++++++++++++++++++
14 2 files changed, 133 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index 8e6647b56c58..ce7fb31bdc29 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -22,6 +22,8 @@ DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B f1b86487c82d4354347171df635192
21 DIST genpatches-6.1-18.extras.tar.xz 3804 BLAKE2B f31c07ec6318b91e6e7eabeb62bc28af362fc097297b31521d464e298effbdf52cdb94b43a1811fc10ea3dc9387fa47501c4987d6709d73603ed15ac7949dd92 SHA512 8611f8cd72f54b7c4360d314eabcccfaa99722f568da32710a39f47ffd1770b14502130be5ce3d3a14a0bd93fc9fbb73f65a9c9636a8d0e9051892d1e5221ef7
22 DIST genpatches-6.1-23.base.tar.xz 1114724 BLAKE2B 35cef45469a4e42a736c5e94529a211dfc1b60a44e695243d4b936e85933efd685a6e8617abc4b20cd42f736979bda6b85fb66fe33f1d48ebe2cb53fb672a913 SHA512 c7cc6f174e7b1b3c5036b4861da9c5b5110c6857c4bca2585bc4090e84382688fe785ae23c3383246682bcf807368a31793921e160882a1dad5b929501c1001a
23 DIST genpatches-6.1-23.extras.tar.xz 3808 BLAKE2B 328dc3054c6ce8f31bcef2d682301b7b9b06a6d8b3ae96adcaf187cc6bc85561dccd219bfedffd4171c3e8df9ce998d4e615bcf364223afe8e268198d3a9d403 SHA512 74e378f6efe8fcadd39e29aaec0d0cc3b2ae8edf909f06a0395a2732d4af1337a966490ff3986237f98086a8779deb1fa980506fcd6385061742187b9bb89da6
24 +DIST genpatches-6.1-24.base.tar.xz 1155780 BLAKE2B e6be4766ec5aba82d12d5209c1ac86b013482c2c1d40a9d5f72afa0f86555816c859795db9fa229415dc813e8b35851c98f11d17884d3e928684827b6c434778 SHA512 5e0c17ed36ccfe2d926e835a74b283ad40a21fdab33220c82c9e87ec2cbe17c3e6cc356bb62e17a1ca12901bd56694819708af438725c67b68c142c64f0a938c
25 +DIST genpatches-6.1-24.extras.tar.xz 3808 BLAKE2B 31803bf14b9c85373217e5b25fec9c401103b7ac996da14ddf03c69331b6073d6aab4c5c85241454fed43b559cdc6ce1be09c0a61315e79e9482907253e5fe4e SHA512 d5035bb0d8e99597e61a8939842a765e592db6133e923985268bfd7f69c512f5ed2cbf97c7372934794e103309c3649b3da11cbd26d4ba19464fdfc96f3759b4
26 DIST genpatches-6.2-8.base.tar.xz 378352 BLAKE2B bfdf83b6ed486ad759f6021e48fad9b980a87ba5c54c0f06dbb2af3dccc79b41c7065d5a3a11933d761da759d9b33b314c456b458c9c65f49de75dd2cd4402ee SHA512 48521d82fbb2475b7a477bcd87dbba073f6c72cfde784adb77e9b92c44bc1fae188179199aee9face7bf53538cc5f2cae491173da686a54182579d69585b54e6
27 DIST genpatches-6.2-8.extras.tar.xz 3808 BLAKE2B 3bb072914898f6f80f3ceef2ac92d44b3dba7aba6232febd7f7ad48232a2d76c3de4414a0822d0c7d45f632f02441e640a0911fa38a24ca88373807e04806ed0 SHA512 a4c3ca924859b487463b20fd470c2f157e404c0380cc8721d9a9c787519b1471c88f72daf57398d0c8582ec966bd9939c2082ad3b3cd71f93b761bf4443f3a35
28 DIST genpatches-6.2-9.base.tar.xz 419680 BLAKE2B 9c206118605a2da947feb5b7e4b5c0a022a8f88936af354679ea50fba6f7b99b27794693ea18b7511feb5c46ef9d7cfaa55a1d426d6181e977c73e8c41a5343e SHA512 ccc911b481597853d5ce05fb8c2e2436c1d67a30f567ceb219cc724f5ffc311b7e6a3c13c66ed964ca9d314ab9f00bcd27ea7f078260956b003c59de903c6e6d
29 @@ -74,6 +76,10 @@ DIST gentoo-kernel-6.1.19-1.amd64.gpkg.tar 76625920 BLAKE2B 70fba952a43951ac9e83
30 DIST gentoo-kernel-6.1.19-1.arm64.gpkg.tar 69273600 BLAKE2B 5da6f74318181d4dc0a5ae602e0ce60812afa8ca98e0a31716cf6d5fd5b827184c8d0c0a323af01a854a1d89b9b78f1fd8fe0c3e88dfbe51a45c52653fd4b4d1 SHA512 7238789a5fa481a61fe5ba7af576e4a056744b069b984b2293de5f81b7c18381befb7d3043d446705a50f14136cab7c23ac13ca7a322483e645b5bbb5e79ff3e
31 DIST gentoo-kernel-6.1.19-1.ppc64le.gpkg.tar 62699520 BLAKE2B c66e2841c011e9fbd0cbe20d918caba803bde65df4e0666d654effe9ee13329d3578967cc2d73ea7b0d7d26eaaefb4c1034ee7aba75f14f61298b9ac31881a29 SHA512 a8ad202ac6d97d3aa9e64b428178552ddb6368899bb7474c97de250f72db7b3a99afaff67054249acb547d7f8febc7e29f48bd0cdf0e0ac0c6b8da6e943e25eb
32 DIST gentoo-kernel-6.1.19-1.x86.gpkg.tar 65863680 BLAKE2B 2c8f33ea60fe9e05142f23c6899bd2d66f6d438ec5d13d26c62ec815a7f97fff37e68f9ae308f8ce7dae609a06bfd8e984bb57213596c7388c2454b7ff27e730 SHA512 8b7951da5fbf8a88be98e5489c74b453b5cdb73dc446c7f6406591f790f5f294630b3280b7385f17c97801394b10247fb59da5b959229b01d1021bb78a833dae
33 +DIST gentoo-kernel-6.1.20-1.amd64.gpkg.tar 76656640 BLAKE2B 4c4a3cb54d6cbc4576b79af5605adbaf5443ded418f35c9e0e1365f7f3fce702fe2b7e91e4ac6c83c47c2396247ed6b0fc2a48ffd4fe35fe83f8da2462234327 SHA512 4c2da7961ef5c2cbd81688d338584329e14e18adb75b72d5d26d62255e208c41c02eb1cafce89b13005c436669f3259338f746b0e22c6d5d385945c794e4eba6
34 +DIST gentoo-kernel-6.1.20-1.arm64.gpkg.tar 69294080 BLAKE2B 474e147b0e42854e742956b474e13825ea667b3b98abd1eb3f87a038c2a9c9c9449b3e4b06a4cfe6a5318e7a0e85c340e5f373c70d3a92ce663f8fa8a7178b8e SHA512 ff7afedd909fd0c0652a4f42f3d72b5d35c64edba592669437d30f63839cfa8f95706289ea82de585b41b08fa2f47613a33f4b491b265bc7013bc428cf228f68
35 +DIST gentoo-kernel-6.1.20-1.ppc64le.gpkg.tar 62679040 BLAKE2B 08df3b9613477efc2623544d27f473d5a2bb9fe62f769ce1dba3b5525873b7f00030f1324fc5c78a6cbaf8f4984a1f55004c753a540e8f5aee5b9e70cf2db6cc SHA512 94fa1b6d4b3046053d28fd79d8074ed0ba18c84944424c276d00a72ba83144d41c0ad6023f367be6b05067fa8b38f22eff5db90b7930883cdd6f430b028a2b0e
36 +DIST gentoo-kernel-6.1.20-1.x86.gpkg.tar 65863680 BLAKE2B fcb2ea60541f3f9d1dde5f4f6738b3d81adb167f4aa79d47677d112ddd452200c1c0319bc39d9017d836e166ce19e7fca182ec5d2eb86f8d0cf604ece5f9931f SHA512 2f3deb92d791a888df6620c567d73ceb913a0b3cbea9d48de661277e253d814a0774c51d2df88349434df4b8a33ea94755b198c19e2a6258972874c500e62c5d
37 DIST gentoo-kernel-6.2.6-1.amd64.gpkg.tar 82411520 BLAKE2B 81b3141ffff9af51265d94e5fba03365f0ad203e00b1cf5d609caf6c7fc04717cc8d4530cfbd0db5cf811473c5e4fc4ae6af51e54bac46d4a55d5aa965baf826 SHA512 c5ad329e56bf1151effed1289a65646f83e116f545934a08757358451f94462177e8c0a7eaefed86ef9ff3ae8ab1e842f77174ebf4d92f4e9fa0c6ee407ba8c4
38 DIST gentoo-kernel-6.2.6-1.arm64.gpkg.tar 71628800 BLAKE2B 12bf704c287aa5854d6952fd1945325174b9353bc8a5235d557fc22af6d0601836a3f86895d8ad3aa956594664628555583fdd54c8f0a7bf9367ebc8ca09ab46 SHA512 313a4122005a9e77509e9ff7bce97f32b31c3baebf6fea0e1c52ea131ed44242392b237b33dc9334f8307185c959a6bae4f22c673ab5d212b2f21fe693627d77
39 DIST gentoo-kernel-6.2.6-1.ppc64le.gpkg.tar 63744000 BLAKE2B 81b079534ee172c8710c0177b595bbca8a9d5d48b7297ea6e3111ddfd7d55b4887591a1848a9f831414c317465337131e5fc12d7f9570b8f31c16c137bc566b9 SHA512 d8e7d7dbc1243054fd7e5a3501e74b93f49ebe5577501a41f329f87d8cd743e78c5a7894eb746bb5f3bf1efff1825ab81840e720a01ecc21c7e87cda9deeee7e
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.20.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.20.ebuild
42 new file mode 100644
43 index 000000000000..27016e1b991a
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.20.ebuild
46 @@ -0,0 +1,127 @@
47 +# Copyright 2020-2023 Gentoo Authors
48 +# Distributed under the terms of the GNU General Public License v2
49 +
50 +EAPI=8
51 +
52 +inherit kernel-install toolchain-funcs unpacker
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}.gpkg.tar
66 + -> ${BINPKG}.amd64.gpkg.tar
67 + )
68 + arm64? (
69 + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
70 + -> ${BINPKG}.arm64.gpkg.tar
71 + )
72 + ppc64? (
73 + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
74 + -> ${BINPKG}.ppc64le.gpkg.tar
75 + )
76 + x86? (
77 + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
78 + -> ${BINPKG}.x86.gpkg.tar
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 + app-alternatives/yacc
97 +"
98 +
99 +QA_PREBUILT='*'
100 +
101 +KV_LOCALVERSION='-gentoo-dist'
102 +KPV=${PV}${KV_LOCALVERSION}
103 +
104 +src_prepare() {
105 + local PATCHES=(
106 + # meh, genpatches have no directory
107 + "${WORKDIR}"/*.patch
108 + )
109 + cd "${MY_P}" || die
110 + default
111 +}
112 +
113 +src_configure() {
114 + # force ld.bfd if we can find it easily
115 + local LD="$(tc-getLD)"
116 + if type -P "${LD}.bfd" &>/dev/null; then
117 + LD+=.bfd
118 + fi
119 +
120 + tc-export_build_env
121 + local makeargs=(
122 + V=1
123 +
124 + HOSTCC="$(tc-getBUILD_CC)"
125 + HOSTCXX="$(tc-getBUILD_CXX)"
126 + HOSTCFLAGS="${BUILD_CFLAGS}"
127 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
128 +
129 + CROSS_COMPILE=${CHOST}-
130 + AS="$(tc-getAS)"
131 + CC="$(tc-getCC)"
132 + LD="${LD}"
133 + AR="$(tc-getAR)"
134 + NM="$(tc-getNM)"
135 + STRIP=":"
136 + OBJCOPY="$(tc-getOBJCOPY)"
137 + OBJDUMP="$(tc-getOBJDUMP)"
138 +
139 + # we need to pass it to override colliding Gentoo envvar
140 + ARCH="$(tc-arch-kernel)"
141 +
142 + O="${WORKDIR}"/modprep
143 + )
144 +
145 + mkdir modprep || die
146 + cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
147 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
148 +}
149 +
150 +src_test() {
151 + kernel-install_test "${KPV}" \
152 + "${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
153 + "${BINPKG}/image/lib/modules/${KPV}"
154 +}
155 +
156 +src_install() {
157 + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
158 +
159 + # FIXME: requires proper mount-boot
160 + if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
161 + mv "${BINPKG}"/image/boot "${ED}"/ || die
162 + fi
163 +
164 + # strip out-of-source build stuffs from modprep
165 + # and then copy built files
166 + find modprep -type f '(' \
167 + -name Makefile -o \
168 + -name '*.[ao]' -o \
169 + '(' -name '.*' -a -not -name '.config' ')' \
170 + ')' -delete || die
171 + rm modprep/source || die
172 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
173 +}