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, 01 Feb 2023 15:01:10
Message-Id: 1675263574.8689cf195865a93c6902d7c3096db56376b4a056.mgorny@gentoo
1 commit: 8689cf195865a93c6902d7c3096db56376b4a056
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 1 14:59:34 2023 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 14:59:34 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8689cf19
7
8 sys-kernel/gentoo-kernel-bin: Bump to 6.1.9
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.9.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 2d4c5c543070..b46a3f51a524 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -18,6 +18,8 @@ DIST genpatches-5.4-235.base.tar.xz 5437324 BLAKE2B 16a5f67224b3bc10792945ef3798
21 DIST genpatches-5.4-235.extras.tar.xz 1812 BLAKE2B bc1b83082a60463da80236c4eb42590981905e35f653ab2976c9f31f4879446f65d0f123f11e45bd583fc0ef788898f38a6534e66d1a028716954020427736f4 SHA512 515331c1ce6d7ce76f946ab6b8443afdf47f829bdf8e486ca733854d5c984c0c99a36611cc82418b0155f9ce1276b702affec04b65c4699cd4bf796d3ef6a7d9
22 DIST genpatches-6.1-10.base.tar.xz 591388 BLAKE2B 5352d923a1df59c38cd1061ea9454041143a9786e4c81c195edb0e50ae9490f9629f2806482246c417db294a2ad9b643c9a6b38403c46c1b135c73a94506e6f2 SHA512 5ed3ea65e2ad63f4d59241b8e11f4de068564e5079c7fd6d511e9636867843e517b662f744577b615cbd572fa7313af260fb07c5c4e39e0cd114e4f315d3d777
23 DIST genpatches-6.1-10.extras.tar.xz 3804 BLAKE2B 2a713dcd63d5946368d0bf88fee904b05f3fceac266173aa3016c528cfb40eff98f7aeaca2fd67e52a02a39b80b430fd55c8abd65ff5e61dbb6e6cd6ee757282 SHA512 152c134efcd7ceeb233bd7d9211a871d6b4f633e4782ac73657d583e4f149763e37ad7cf0f19efbf1c4c25fc50f3c67167b15f024eabfcfcb016b1cb23c36ae0
24 +DIST genpatches-6.1-11.base.tar.xz 672088 BLAKE2B 29cabedf32ea3f8cb1ca75bde23955e4cc23c54ac93f8dbe66adbca1b1af4e5c6b54e60b84ee95bf48f9432a844aea279e89acb3a15cd8ab67e5453fb179c9d4 SHA512 a840a15204d1f1fd9f809cabe01cb0e37756cf1ac89181b29306e6a3b0ea3ce5e8b48b2402804b096106d0c4a0eb2b318e4ad3eadfeee4f266e6c3b6c259a6d2
25 +DIST genpatches-6.1-11.extras.tar.xz 3804 BLAKE2B 9ecd609350e0ad98aedd70e1bd6838fd2d933576dd2236bc111c13b46623adba926bb1547349a1e9e35f3e90e0ef0b29fdc10bd38e3c4c5aeb3cf92b2cef9ff6 SHA512 f8aa9ac57c51f229a8a940ca57b401ca7c5b46cf40cbc1ccb427b341082c2f52e5cd945c548b2fe809935ffb94d4c8275fa4011510239d38ae13b338d568253e
26 DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
27 DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
28 DIST genpatches-6.1-9.base.tar.xz 544936 BLAKE2B 9152c33c4145f99daff4f436afcb621883d21fb05be5821a045b47be2880250d3ccf1210f3ecec0241ac41f57581da737053b86852760cd11efc524719fd0f6b SHA512 88b6bd131dfe53a51a9a0dab13ef2bfaa4818d4b0ab93e485346f96fe58a64b7338d9aa4483c751d9d1886818ee8700918721037b03f868a3b2cd9d5ecdd7799
29 @@ -70,6 +72,10 @@ DIST gentoo-kernel-6.1.8-1.amd64.gpkg.tar 76718080 BLAKE2B 713e821d591d8cc2fe314
30 DIST gentoo-kernel-6.1.8-1.arm64.gpkg.tar 69416960 BLAKE2B ca6850fdec6fad8721dbb452e526873afb71f3fcdb8aa5806ab893b7c3b1b1a7bef0e3316f0b78d93d1e5824c84280fd8d66e815853cee4f9c3b775c57b6e1cb SHA512 00f265f601e687ba3575ed55bb01a146ac68d1828b98636644cd23bb78f21d969112ace0194d62aeb518aad505eb7b4a7f6674d1ccc6549a58f3a11c8ff5b780
31 DIST gentoo-kernel-6.1.8-1.ppc64le.gpkg.tar 62730240 BLAKE2B ad80f22360c5d40f9d880e20317957e868928f46fd8c0f3370b96523947fb4db7382b5e252ab3ac32e4e3284fdb114a0a2591d69b756ddf2da478b7c428345e4 SHA512 f9bda97985408478b632b934b10f5ab1c770a0fe62a46fd18b3969a9266091d2b5883e0efbd08da58d1046aa26d0a6f6b1dc800516eb77fc1114f4f6419c964b
32 DIST gentoo-kernel-6.1.8-1.x86.gpkg.tar 65945600 BLAKE2B cbc615a39aa48fcf60cb9f424c5d842dd1123d53884f064ca49e5ae3f6034797a17adeada0b544924843d7aff20fff09dee7fb44629b8a13190fb0c2d7252503 SHA512 f9e554ecacb469d41bba1d6f19be5f18b44f3a5b6bb836e5a8b30343d4771a4b08b6320bf31ff6378d838480034cbcd1d012da87e007864f5d50c3c98a1e5a5a
33 +DIST gentoo-kernel-6.1.9-1.amd64.gpkg.tar 76677120 BLAKE2B 4aa123ab222f8ffdb05b33e5f12dc69fa93dc47e9062f264ead51fe7d3d3ef18289abb9f108a96ea3acfd89ec2c6a12e2a882e3eaa267ac356e814d58c3d3039 SHA512 eb78874422fcd85cd3a5c1bdb8452cabdbe528f54b5ed8d8b4c25e38ff70fb849998b02ae2d6c590c81af331814b3b4d8723a81330e03e25641d10754ff32529
34 +DIST gentoo-kernel-6.1.9-1.arm64.gpkg.tar 69406720 BLAKE2B 321a51b3efa98ba23ee7db2d80b89b5e65bd88ed2da757efc6499ca6600f850e9aa5940f8b89bb8317bd012b2b4c0eb093ea106c8fd08a81d82a3c9bac0fe118 SHA512 47f62d7113ea84bd21166d27f212fdc7426cbf3b6f0360a9cd5f6d5fd190e9d125157647f966731f56774c07955b4d6d2d3cac8c1e22530fee61cbd081164e47
35 +DIST gentoo-kernel-6.1.9-1.ppc64le.gpkg.tar 62771200 BLAKE2B bfe6f915e046fde71e1a116fde440829127968af9884d825a5141a7873af1e4c424dd94c8d3f8e6008afe61c0a8f313b3c154edded04715b8e2a1f8e4af731e8 SHA512 9cf3257bc5bafc3e99c9e7a10fc3e33d162ec97d1721e2aeee0c5670692165ee2f3045d8ac1ee0300a361615ffe54177d3fde8a3c44702beb698f7905d8badee
36 +DIST gentoo-kernel-6.1.9-1.x86.gpkg.tar 65955840 BLAKE2B d1acd5dca76dcd0c567e6425cec9a89f429cda4bd4b464df803b54029b6b2a2fe256ab887b1f2532e0d104eb1814659ef8b49fb40fdcf4d3fa67058d2079c853 SHA512 6c829daabb7d86cc235d47d3313910f1a0924fb5fbca2cc804bad54c8b9a959a200b921b6b5bc17bf5fdf5f06ec33c439e34792597beb1b726fd62f7f4f661ec
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.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.9.ebuild
42 new file mode 100644
43 index 000000000000..b4281d75894e
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.9.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##*.} + 2 ))
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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
63 + https://dev.gentoo.org/~alicef/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 +}