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, 11 Aug 2022 20:36:14
Message-Id: 1660250164.37181705cb84af387d962e1a8cdf650b9f233277.mgorny@gentoo
1 commit: 37181705cb84af387d962e1a8cdf650b9f233277
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 11 20:34:30 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 11 20:36:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37181705
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.136
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.10.136.ebuild | 135 +++++++++++++++++++++
14 2 files changed, 141 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index cd2ac811ee67..230574e7dd1d 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -1,5 +1,7 @@
21 DIST genpatches-5.10-144.base.tar.xz 3907764 BLAKE2B 41b8ce08ca73879811e11d91f9365ddfbbc15617a4b825ba00144e71feb86e0ef24b3418b77b203a13ad6299237085a2a1c796beb6ac9aa98a5990a39fd1dd02 SHA512 1b946439d9cf6d97df1acadd7b36ef657fac40ff98b31e2237f3cc412e9efd6d4d1d409339af9d48779dbd9d88aac124f67e07afcf99e7760f93afb6d226131c
22 DIST genpatches-5.10-144.extras.tar.xz 3868 BLAKE2B 0d956a61fb525b8ce3b14c215a0c0a6ffa46f21fcf87a63884d31418946a64de0c680472a62fc9bc0d83f67b49dfe88ed373e3ff2ba2f369a0909e3947b27c16 SHA512 c870f84b1a4ae7b95518d08ab46fc7e632a47884e43a9c774be34335ebf825388136ed360f5129c8c97567600e79ce2889d64d9b60a1a8bd2a5b4052e74e2973
23 +DIST genpatches-5.10-145.base.tar.xz 3914420 BLAKE2B 0d6f00cfba2ea5bc70bf44549e82b79d8e7a59b8e34ad7b94dc97c0ab1059ad005b15d09ab51fd9dcf65243dbf0abc0221d26ee06708adacc7dcc7aa18e7939a SHA512 4b2cc1f37d0dee2bb8181be5ea4030b3c9f2035c688cba3e5d512584486158cd7e1d944d089bff7a28d55d1353ea500de6adaaaf282767fadb1f1d206a2682c7
24 +DIST genpatches-5.10-145.extras.tar.xz 3868 BLAKE2B 1e6d3c0402bd46656c9f524ff9b309f4d8f4ba85be0dcf210774b5975d85d2098301ff8e6b33fe419d1bc70faf0a4d1d7572fa5c70122a5508a66790a2f18c4b SHA512 d51bcafbcd6cfa70b9aefddb416020363720c152944edba3a41ae152c9b3a0ef1ca3fc70252d9a75b0b636c3480890aa8bd727e18b699d789ad5b08fd065cf7a
25 DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6
26 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
27 DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
28 @@ -14,6 +16,10 @@ DIST gentoo-kernel-5.10.135-1.amd64.xpak 67502330 BLAKE2B d138fd2cd1ff26e3256277
29 DIST gentoo-kernel-5.10.135-1.arm64.xpak 60985844 BLAKE2B a8e22cec67675594160e7f661a3952e59a0c53338164f70b23b9acdc8a304b1414e188fd51bb96de1972422654c966a78add201f38d3f2f3de3f2745d934ea97 SHA512 c5189162285035a036e23e5075554dd5aab1e8db9df6425f3409455cae61dd5a43a97fc3a47f287699399242ec4f841bb35b5e5f441d491f7de72e7448082326
30 DIST gentoo-kernel-5.10.135-1.ppc64le.xpak 55988769 BLAKE2B f77eede27c91ce30fa556abc8a2e7af42aa984d8e5b973d0e9f3fde77c05790ce891d44d76d6e8c7fdbff608e3be80871b3afdda3b30c36abb3127fe9007c28a SHA512 05a09e9630c427b23905cff1074d4007ee0aa4391752419dba4e0f3dadc6fe913b394dcb76424e303943df54fe14a7ac8fd10d9755cf77dee64f2672c87b3322
31 DIST gentoo-kernel-5.10.135-1.x86.xpak 58295706 BLAKE2B d175103a6756af83a12ed720750178075414a9c4ee899709018b3f65863cf99034f29e9d1cbb967078b207f72e45f961cfd34f35e6d4beb508fa984239975cbb SHA512 998a4a6419f05e7309070449a4182cd8652634c8d44a4e38e266c0d848f8afd4ebe115b4c2ee443882a7dadc3aaa4505199a7091fba64815c4cc55101f5f7c62
32 +DIST gentoo-kernel-5.10.136-1.amd64.xpak 67498296 BLAKE2B 55b5f54f3d2c9550bc845c3ac2ad8a453d7dfd1709f4be6f4e2002a2f393fa55e88eddfe03cf680cb922798e3f2be348772b132c3648f19dd7d391d2f15b862b SHA512 54f6140e7b5c41c68843c1c7b52da8a3acddd173d1dbff3e2fdd4cf28153497d8c13bd164442479f23ef57212f60a452a9832533b7cd6874766298fb6342e1f0
33 +DIST gentoo-kernel-5.10.136-1.arm64.xpak 60968266 BLAKE2B 8340fbbda0ab5a7c8516e19a0bfb57ec2725db2f17b1220aba126292d78820a15d2bf754a257be537ffc4ab423457914283ebfbeaf083cd7d0c1b3dcc74029ec SHA512 9b142d6d55993f61460fb0eaa2912b96121b6c810403fa7f0316d8048111350574c9855e9a7877701d77705de28b70a0cdef39420e3ab1d39518504ceae110ba
34 +DIST gentoo-kernel-5.10.136-1.ppc64le.xpak 56047302 BLAKE2B 42ea77f7788bbe8bca138e52d0a87213f16535baecc5a02663cc059bcd1728cccd694f40932fb2b1db60bc66fbb58870fdac8122f51e0bee6009652dbda90786 SHA512 e1ec838c90d86e977bff7180a1dcce90d6a34c4810fe84dec2c14ca0d6a6b554e2be935d30a09220104070b66950b6b08f5fe0672f14502aa5cd720863be806d
35 +DIST gentoo-kernel-5.10.136-1.x86.xpak 57418535 BLAKE2B 9562d6101f2508faf32dfac3f6f6b3387815660f59303b281bb1c71ae04a4266f016c08bf726df2f04d586d3b55498f8128b70428bad856e1abb1828cb945bae SHA512 f049dd9912b6d82752a4bc32d99af546c9301112bcd1524cab0d06d7989e3e9d96d4ddd4615fd7ae92b42b849e5b7e914685c3bdee5eb8664640879230980d10
36 DIST gentoo-kernel-5.15.59-1.amd64.xpak 70780970 BLAKE2B 6728820f88324d719530871e41d40e80fe9f7324c6d51695687e83f9ace6f40e373f2d1e4cbbeaee671141a9036c3a27ae00d165033c21cc72d4e9154a402db5 SHA512 f6c12a43c6a192fa2b298903db53d6ae73441a659971aad990235bdb1847df79cf0cd1ca4f8ec4cf30a421b847be274c8c35dee43479dcaf4f95609473fdc108
37 DIST gentoo-kernel-5.15.59-1.arm64.xpak 64214058 BLAKE2B 8c92101954e62c9ba3eddfd04726dbd03d254d6f506f5072dd1c7d725d29c498d480a1697513a3459127ab133aafc1657d1c9872beb7d5925adbb7bb5fc16ee5 SHA512 0d21c083fd3f971d2fbeae1d012dc03d4bd17bb37ab59e5bab6e87f171554e5ff19703b234c0fdfa9a9e3e98a295fe8037d49ed252a141603debd0d33149bd09
38 DIST gentoo-kernel-5.15.59-1.ppc64le.xpak 58200347 BLAKE2B ee5d04f4455c9ed7449e06078f96a5372379bb11ab34b2aa3f39bb3d6941959a4ebcb99ecc3f47532944588c92c4c59078ab1a0f2a2d32b459ec6c8082546850 SHA512 63e9a38db9414b8851d274942df40ea5f35cd0200743aae906288a436cd0121e71e1a7541224a0707e261b51a1d474d5921838a134bc4597b009c7b8bf9885f3
39
40 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.136.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.136.ebuild
41 new file mode 100644
42 index 000000000000..da84e07f808e
43 --- /dev/null
44 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.136.ebuild
45 @@ -0,0 +1,135 @@
46 +# Copyright 2020-2022 Gentoo Authors
47 +# Distributed under the terms of the GNU General Public License v2
48 +
49 +EAPI=7
50 +
51 +inherit kernel-install toolchain-funcs
52 +
53 +MY_P=linux-${PV%.*}
54 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
55 +BINPKG=${P/-bin/}-1
56 +
57 +DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
58 +HOMEPAGE="https://www.kernel.org/"
59 +SRC_URI+="
60 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
61 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
62 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
63 + amd64? (
64 + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
65 + -> ${BINPKG}.amd64.xpak
66 + )
67 + arm64? (
68 + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
69 + -> ${BINPKG}.arm64.xpak
70 + )
71 + ppc64? (
72 + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
73 + -> ${BINPKG}.ppc64le.xpak
74 + )
75 + x86? (
76 + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
77 + -> ${BINPKG}.x86.xpak
78 + )
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 +"
88 +PDEPEND="
89 + >=virtual/dist-kernel-${PV}
90 +"
91 +BDEPEND="
92 + sys-devel/bc
93 + sys-devel/flex
94 + virtual/libelf
95 + virtual/yacc
96 +"
97 +
98 +QA_PREBUILT='*'
99 +
100 +KV_LOCALVERSION='-gentoo-dist'
101 +KPV=${PV}${KV_LOCALVERSION}
102 +
103 +src_unpack() {
104 + default
105 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
106 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
107 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
108 + eend ${?} || die "Unpacking ${BINPKG} failed"
109 +}
110 +
111 +src_prepare() {
112 + local PATCHES=(
113 + # meh, genpatches have no directory
114 + "${WORKDIR}"/*.patch
115 + )
116 + cd "${MY_P}" || die
117 + default
118 +}
119 +
120 +src_configure() {
121 + # force ld.bfd if we can find it easily
122 + local LD="$(tc-getLD)"
123 + if type -P "${LD}.bfd" &>/dev/null; then
124 + LD+=.bfd
125 + fi
126 +
127 + tc-export_build_env
128 + local makeargs=(
129 + V=1
130 +
131 + HOSTCC="$(tc-getBUILD_CC)"
132 + HOSTCXX="$(tc-getBUILD_CXX)"
133 + HOSTCFLAGS="${BUILD_CFLAGS}"
134 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
135 +
136 + CROSS_COMPILE=${CHOST}-
137 + AS="$(tc-getAS)"
138 + CC="$(tc-getCC)"
139 + LD="${LD}"
140 + AR="$(tc-getAR)"
141 + NM="$(tc-getNM)"
142 + STRIP=":"
143 + OBJCOPY="$(tc-getOBJCOPY)"
144 + OBJDUMP="$(tc-getOBJDUMP)"
145 +
146 + # we need to pass it to override colliding Gentoo envvar
147 + ARCH="$(tc-arch-kernel)"
148 +
149 + O="${WORKDIR}"/modprep
150 + )
151 +
152 + mkdir modprep || die
153 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
154 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
155 +}
156 +
157 +src_test() {
158 + kernel-install_test "${KPV}" \
159 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
160 + "lib/modules/${KPV}"
161 +}
162 +
163 +src_install() {
164 + mv lib usr "${ED}"/ || die
165 +
166 + # FIXME: requires proper mount-boot
167 + if [[ -d boot/dtbs ]]; then
168 + mv boot "${ED}"/ || die
169 + fi
170 +
171 + # strip out-of-source build stuffs from modprep
172 + # and then copy built files
173 + find modprep -type f '(' \
174 + -name Makefile -o \
175 + -name '*.[ao]' -o \
176 + '(' -name '.*' -a -not -name '.config' ')' \
177 + ')' -delete || die
178 + rm modprep/source || die
179 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
180 +}