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 Oct 2022 15:31:18
Message-Id: 1667057464.24776af7c5727c6d34801c7badb1ecd5084c6904.mgorny@gentoo
1 commit: 24776af7c5727c6d34801c7badb1ecd5084c6904
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 29 15:29:18 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 29 15:31:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24776af7
7
8 sys-kernel/gentoo-kernel-bin: Bump to 6.0.6
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.0.6.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 759332ccc8f0..3e6c6a2e478d 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.4-226.base.tar.xz 5186832 BLAKE2B fb55ce4cae1d02a54869a3dd5e31
21 DIST genpatches-5.4-226.extras.tar.xz 1812 BLAKE2B a477853adc62b2f1ee5d2093966c211638d4f0d3550de98990261db927a1946ee6a8163502f0a5b66b57d326521cdfe18ed1875bc126a63ce662e4442abaa9d1 SHA512 821a81cc51ecf898420e480860de4a7083fa2c6f1681e468f9058c7de403af07f72351395791facc34977dc05b6dedf4b2684fd29914bfe6802fd2fcac3465df
22 DIST genpatches-6.0-5.base.tar.xz 279980 BLAKE2B 72e3445a0d791825d6aebfed695bde22454c1d3891176756d90b2cd6aaefa8051bc22a8c7b39326f2889e947d2f65112d386f8d158d1a5327aca142a9d2312fa SHA512 e74152dde7f6c6e511c500ab1038f5a5bd2473354fac8ade6293c43c288ead3e2549fe8f0a02ff205fd72f5947401372cee34425dc2cf23ed3bf1198ad7b6123
23 DIST genpatches-6.0-5.extras.tar.xz 3804 BLAKE2B 36e9a4a81f9cc9bea2dab9138bbfa9e380ef6e6d1305ff27072f96be23a8be691c20505c07d0034f0cead7b0f955e463485fc7d488b04ccb951a27eb3aabfb39 SHA512 b0c4a0640f20bbad1c5a5ce4a4c7413c1bd3fa1463be6d8dde3447d0131beb0a5809be53d2df7660516affe4b35f9b88a6ad8ff1b8575cf76f01bc086e4ccf60
24 +DIST genpatches-6.0-6.base.tar.xz 307564 BLAKE2B 14e3d451ae6f21219ed86f8fea2cd8c4888e8b8d23e43d6d855ccb3e07346348aa267e0e20e65c0cb782c3fbb0adc98e3e6728dc83d58bb8dbbed656b3273076 SHA512 1ed76b47ee510074787be882b999dc60c108e1411f4704c9104936f808b12bb97700883f2eed9e41d6da6a0cb5fd00cdd47f267cff1c34173bed49e1379a8786
25 +DIST genpatches-6.0-6.extras.tar.xz 3804 BLAKE2B df263043bb2e5608eba21f3e3512628029043bbab7dc43c1190e341f66d74d7adabe224a7d726aaa23c7fb9290544419b10704e6697a45c39d1932acdc75627c SHA512 243a9810ff21706c2624a796f61690235c37faaa0b748a0c3e80bf4f7e3f6ed2285201a1f6510e03f3244adcbb3c58ecd90e6f0eed09fe06f469725792554be0
26 DIST gentoo-kernel-5.10.150-1.amd64.gpkg.tar 66488320 BLAKE2B 548b1836f84cb713bfbc3a164e218f5d4cccc19287b3a7627de422fb521190401d890cac611a018f30fd6e6edff2da939cdb15e819470f76bf29b974b7b37f18 SHA512 c578eac829553e923fd0eb2fefe6cd182769e3ec74ff59d3a7c1d2b9cdd0838d32a16cc8f6be0599313d54da1a94d009e5ca9a8726c7f494a5d9820078430aea
27 DIST gentoo-kernel-5.10.150-1.arm64.gpkg.tar 59648000 BLAKE2B 07d60e7576f56ddb93fdd8128a0a7392865ab6ab6d87069aca8845aea7128fa1cec81e9f7733e9620c77036641a027a6d64636b3c8561c2483f59a17e3bce888 SHA512 8c193e9b4e2ff698912c5fa09c8644561e9d555434a7b1f2d7406c9045604a17d7ae7699d264fdebd3354f30f7e0f679e0fd87cbd373fcd4b843d05da304a49b
28 DIST gentoo-kernel-5.10.150-1.ppc64le.gpkg.tar 55029760 BLAKE2B 144627355aeb03f3a7886603473cee7579b7e9cf4d8bd8e53dd6e65a2713a008d789dbb4b0c8521c295d300d8e5e47c1eb20abc81f9667eb587d24b25387c8d1 SHA512 00354da7ab9103ce3664aceba5bddee24e66dc610eeed00e83460c776a4056e219ccce73d2bab7ac55d19500456fe8379025a519f7273487b9799739776d91cc
29 @@ -46,6 +48,10 @@ DIST gentoo-kernel-6.0.5-1.amd64.gpkg.tar 75898880 BLAKE2B 5f4ebb5f829f76206838e
30 DIST gentoo-kernel-6.0.5-1.arm64.gpkg.tar 68802560 BLAKE2B 33ed94c2431e6e17944bdf0bb8a50f420914ec040506cbb3ff8ec8ca752bc7b43be165881b85e4590e9d79665a5215639f84b6ebfc8ac4bd405ff26844668d51 SHA512 f34ea6de684e2bc1ac120117938e383446fc2f19744de95382a24a7fb6044a89711b86fc13479b5e5536c71fde4dc0ec1d9de6939a26e16e254d3ed1f405da8c
31 DIST gentoo-kernel-6.0.5-1.ppc64le.gpkg.tar 62136320 BLAKE2B ae2c5b8830f123c5c2a853e5826e701bb46370919a24fef527f40d530e7fac9be23050cd36ea149644c9331954aaea20f23c44f8341d05b9b170adcbddb1bf2d SHA512 70635eab0375b229ae24efe2f2aa123249e8a38bd8fc864cad8afee0643c98f9f7ae7d4b10ea341a8ed14af4616bacfa2e9cf2e12d1aa47dbaaa21b4df619fcf
32 DIST gentoo-kernel-6.0.5-1.x86.gpkg.tar 65290240 BLAKE2B bcd55c436378eac2b8ce96a4060848d3f218c5e01b0aa70f032717074a4195c5e31238b0af6720f1951018f3faac6f99fa7ac7e3be07436224cbe061ee68f241 SHA512 278553bf4f605c0b7df947341d78ffa19be12a843e0ecf4be73f22c9648d0cdc7a4d508470f5be1a6ed60dd2614cd006a1868ed2d47bd0ef4815a748af9748fe
33 +DIST gentoo-kernel-6.0.6-1.amd64.gpkg.tar 75898880 BLAKE2B 9f21fe9ca844e8198ecc8c34581d303ce326051ef01550a6f98aacd94ef7f2b42c99995830c4168916d473583154b802e3a57d6308596c85d2e3b71a970f9546 SHA512 126d9fb655e1d755755f980fc387f504ebe35e94974eae87d6739e578b5eaeb49242668722051693e1d60cf900e089bd80b29d5e28d469b7f4d0ee605eba46a2
34 +DIST gentoo-kernel-6.0.6-1.arm64.gpkg.tar 68823040 BLAKE2B e3fed7cf9d8b58d029c6ca5c0273055fc67725384e48b0ce58f2c585f0475f5af73022da05b2b6bcfd4b4b7120f4ec17cd985710f931301d4eed98b4adcce003 SHA512 85da99efac7153fbb96c74034645b4a274383e88128407ca68d80d14bc81ad08e9de8189169af7bb591e27ca717797ef853c96b5c5039506bfc68c5ec86fd85e
35 +DIST gentoo-kernel-6.0.6-1.ppc64le.gpkg.tar 62126080 BLAKE2B f367c776f7f2a4abdb7311b8dc26d5050bb854d394238281eaf644873b1459084573c579e95f61c267c95be3a5832b5001195598b252d43b715474e7a6844729 SHA512 7835669158730c244ef8f2cfcafaab73c8a7cef0ae524920fb3ee3276ab16021740a42484c9e88ae3890a25f81f11017d421af1ffaac23c3aa7ae5ad187d4ce4
36 +DIST gentoo-kernel-6.0.6-1.x86.gpkg.tar 65280000 BLAKE2B a15712598741b489eedbabeec0053e4f515acfcf0c150973c60988c2ee977909909675cbe849618292b8132fe1221ff7305a5b4e91493d3365c4f73d7eab6054 SHA512 391a3c8d953174ea42c76de8aa11f3a50f5db8738ca08bd2b8f0082d09ced86e3b87a04238935219cd5e1f17b8860fdcf2f16b8231318a403558df82b3313c71
37 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
38 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
39 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.6.ebuild
42 new file mode 100644
43 index 000000000000..2b0e14e98e55
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.6.ebuild
46 @@ -0,0 +1,127 @@
47 +# Copyright 2020-2022 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##*.} + 0 ))
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 + virtual/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 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 +}