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, 26 Nov 2022 15:08:30
Message-Id: 1669475301.c295d729caddd8c2bed3c4bae3bbe2a2dbef3218.mgorny@gentoo
1 commit: c295d729caddd8c2bed3c4bae3bbe2a2dbef3218
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 26 15:02:58 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 26 15:08:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c295d729
7
8 sys-kernel/gentoo-kernel-bin: Bump to 6.0.10
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.10.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 c2f80c72b5c1..51110c4b5091 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -16,6 +16,8 @@ DIST genpatches-5.4-229.base.tar.xz 5214840 BLAKE2B ede38de7b09b59ab96596aa4e47f
21 DIST genpatches-5.4-229.extras.tar.xz 1812 BLAKE2B d5d084cd21e2a4f6235f0438e8d92746fcfbc9f86170247b00ade3d2aac99e06c4b10bbe725780e8f9644c7404e8defd360c3e9d360cac1e5c5a8a2ffb17adef SHA512 c21105638451b761588caaf266d901de7a5640d72540954c3c559b675dc265cca8ea5e56de1c3c644bda4c4e09fe174ece02ed6e506d12e718e035825dda3e0d
22 DIST genpatches-5.4-230.base.tar.xz 5241272 BLAKE2B 59a4ad6f7b2f3380e5521a2d48e7da526bb8dc177d04c147e5699b75efd76e62e94b97a96d7d2f50c70fdd684c57f76f1a0017fafc223f7a31f7d26ef24a5365 SHA512 f69615ad62cef31b53cb89ce072760e17f9f22a40217ca1057e34939ed2fbaadafea2811e68fbbb91f62aeb630d4ca71ed63442efa5448c1e44554a4cbb57b12
23 DIST genpatches-5.4-230.extras.tar.xz 1812 BLAKE2B 62c614ec2f856867ab6e6953fcbe533fba508263a2f0e0f9e422ba9c4f159af9564d8ad57368f4e8a9e645302b3cdc8ef1ac5a626cb8e18380c025f3290ba56a SHA512 911595072c899538d66313d24585df62a9dd4e44e46980b14e1b6d0c61a64d55b6a66e4b30cae49965900bbbe634c2ebb36aac1d084038829da2a1a59b721186
24 +DIST genpatches-6.0-10.base.tar.xz 546380 BLAKE2B faad43e3066e880e9074c57499eef61f85a8279cb37b7c999f41194588c766bfcb529cd6bd43b234e865c837ca970706935d6fea32fbcb46c49e9a67d274f262 SHA512 c4e37e027f8c9c7ce833d4b5c887b261bbe617222d4b1203bf0ccbb35b384bb185bfa5e3bccc187e7658baaa50a015a5ce2a41a6d9c8fa5ad883a46692b00d8c
25 +DIST genpatches-6.0-10.extras.tar.xz 3804 BLAKE2B 392620ebf627c7f480b0031b9e3e712ec0005b7e83596ef192908cde5740df06cec0605b09a15ba9420919b37a61136611a9e3e13f82caa63d0337f3d9b167e0 SHA512 86511fa64c02b703426450ade1811ce5b3614a6a232cba35f016837572e34a7ea0c751eb90ffe971f6a3321e0f9f61f8f032bd1cab5b0d55f8112acff42b4f61
26 DIST genpatches-6.0-9.base.tar.xz 478548 BLAKE2B 916f2b1b5d198adec6f73a0bb52029f4667132e7b7528ac5578134e3ed775d6aaac7989ec5e3827fe16db691f3321ef16b5a29088d2ad81e963f768f67cc2b61 SHA512 6b748f241e609d6191f83134f65bd9010122d5681b080c7ffeff8690f4cb1ab0f44b2681a135689d945de45f4ef25384411aea1d78a5b1c6248e547dc9e5297e
27 DIST genpatches-6.0-9.extras.tar.xz 3808 BLAKE2B cf37233fbfc631e8ec9d7c663e8982a3bfb154573fa84d13cbb3d67fa73ff38ce74b27bf6dbf827b311826d18c628ef2818a75975e068ce381bc1a46c4948075 SHA512 b4f5d0daae3120662fb79e9f53b7dfd0c15f0a2b7c77a32b7440cc7425b3df87107aabb2cd913a31b7014c9fd1c3c85ab2081839af652ae9d7e43352dcdda42f
28 DIST gentoo-kernel-5.10.153-1.amd64.gpkg.tar 66529280 BLAKE2B f0e4ccfc14b29dcd25ccea3ebd199a6a61092a42d4df68f36e699cf4059674bb0f3056c348fe8da0322bdb9dbc8806e36e87dc329fd88baa0f39c442324ffe71 SHA512 a53fe9f935e05311f40dcffab224791b64b42f218c78e2737d4a4a396df08d0d21f85858d3767a0df329a038c93e892ceadb3db58646d6f103e6941e0b4aa772
29 @@ -54,6 +56,10 @@ DIST gentoo-kernel-5.4.225-1.amd64.gpkg.tar 60590080 BLAKE2B dc8493b1e23b4900e60
30 DIST gentoo-kernel-5.4.225-1.arm64.gpkg.tar 56821760 BLAKE2B 8f799e1766197bbfa02efee0d256cfa44a3cb7c4de38ba6fd119e93544cd4f38201dadd0771dc8fdda1e4786d7b43f5fd589b17ed99d21945c96704019f818de SHA512 3960e9f5cf644a305fa978ae28df192f4a391edc52f58097a1c7705f5d3281d9a0c17d3083010768e9b3f080ad7ed54fd5520d2c4492d4cb695ae9cd6915fd48
31 DIST gentoo-kernel-5.4.225-1.ppc64le.gpkg.tar 54353920 BLAKE2B 344ce9ae954e82b81766a70ffaba056c26013270c802e1c06d582859888726722b0aa6a1005fabc05926e77bb1aba0c452c45a35b1cbadd0b1455dbe3ec478df SHA512 6be76c28b9e9a819d3b3e7e3ad79122b301aa187159a25807bd1a0c656174cc121e6bb8b64c1f880e53c7e514e52004a710d2796aa63a2b79beede0dcec8e374
32 DIST gentoo-kernel-5.4.225-1.x86.gpkg.tar 52387840 BLAKE2B ba357a39442743f0f65bf360ccb1b4c5302e6507a7fff7d714d71a0c458da070b65f72dae1012d3a6dc7099e4b4250f7b33cd1801cdef3cd7e9738164b713b70 SHA512 b7946fa7ba73af920842b2d1190744a4d30ece5b7015fa7ff99f2f011dc5c54e06839cc7808d59d6be89d0acda7dc22d11cdc6172ade29c04c0ee6a3a6289c65
33 +DIST gentoo-kernel-6.0.10-1.amd64.gpkg.tar 75939840 BLAKE2B c97960c5c989babe1e7014c62f75ccd8facab8bf4fba085706ef4fc363d5c886e2682299c502a2800667d4c8a2547233e1fc0a8fd3daebe0a6ccc022f1b573cc SHA512 5996324a9c9e27a01dbef3a481eab7a7eab102912abafbaa4939b6e780dc83784238bdc387fe58ee8d41222bfd5038c3d5684bb6272b5870f14467b79a64c428
34 +DIST gentoo-kernel-6.0.10-1.arm64.gpkg.tar 68833280 BLAKE2B 59dc4659c3bd764768c6cd00e8bfc0db79ed61207d6dac58898b1074adba764e88f6dfec6f910f04e7615724acfc57826691cdc4453dbab1cc1a049785abfea6 SHA512 e1b27ff83e9c937072e829f7cc0753e423d4aa75776f92118d28a1f8d056c4d27c61d562ef36aeeb67aebd8112c8acb2eda7170b66e476e8c4fb62f5b6b4100a
35 +DIST gentoo-kernel-6.0.10-1.ppc64le.gpkg.tar 62146560 BLAKE2B 906a047c07a7091b3375c3a70ed84f87b2507337bac3266c86b133e3f4b4dd256449f926d5a54b76bc050ddd3dbf553e6777c8e3ef54a655a31376a00193cfee SHA512 961fc68e368d4a348b103876c6255c7ec25497a06600077b84176e25d99a782e335201a7b74a3cfd80f27c9da82c4ab323d55a7d9f1279fbcc4fbabb8f1f3f61
36 +DIST gentoo-kernel-6.0.10-1.x86.gpkg.tar 65320960 BLAKE2B 772bdc37ae495658111c5f998c9874eb9947e2a37ee8e0c88d75c9f3e1d981c1e57f841b444287ee334d9f5930f76e2503f9a3ea6154b3bf0a63e9d601b4e079 SHA512 545efb78abe864f1248b4a85f8bb305ced09c343aa0219bfc262789dcd249abb61c956ea9178297b1cc4a188e2fc14b318c7f2c8e39d54daa5fe954b8f266b49
37 DIST gentoo-kernel-6.0.9-1.amd64.gpkg.tar 75929600 BLAKE2B c8798004001baece32bf8a6e242423b04b7e4cea4876fb42baae7e2299adde61591dfa62d06ec385db8ac1b985e8353dccb797b08ef0c42ea21c054c451f27f1 SHA512 4730dff292802f82fe9b6d1c73ab0eb42d00b2d9c7d672ec347c59a0dfa1a586f773a2bf1b6eb7d4e905da1ef678269715f55ef275cd44556520f163002e8cde
38 DIST gentoo-kernel-6.0.9-1.arm64.gpkg.tar 68843520 BLAKE2B 6eec02147edfe83ec7a6a62a5d02d6982649c28654f160223ae6e8479b6071174a26e256ca8504e9a8ecb0f6b26036b2972d9be71f6d23bd6c5c627bf203707b SHA512 83cc9b1022bc652cb5a8105c58f3dcda1c21216ffede67835eab9bbec58cf4c2188655337f03692fa1c1b2a4d24ffcd99c49cdef7300a9fa6f1a4f9b4d642628
39 DIST gentoo-kernel-6.0.9-1.ppc64le.gpkg.tar 62146560 BLAKE2B aff5949a4e9e26f2a63599953e949c8747bef2fa7ddf05e25b8bb095dd1635d3ffb03d37608b6e84e111616d1438425da0a39f91c0621fab8bc1c0cbe5b926dc SHA512 555ca3733ad5883b04100cfa934da2b979e22f2345a3b5b88b86efbf0b9c111d52062b0a706c00b58a4f891c9a6e3e57350f2efca09b249bb71a4af8e16749f3
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.10.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.10.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 +}