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: Sun, 03 Jul 2022 07:39:06
Message-Id: 1656833930.751afb5b3d46d6673425dd0682a269d7a2373d8f.mgorny@gentoo
1 commit: 751afb5b3d46d6673425dd0682a269d7a2373d8f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 07:38:28 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 07:38:50 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751afb5b
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.52
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.15.52.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 f973836e7edf..156743084f9f 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.15-54.base.tar.xz 2203912 BLAKE2B 36e27d2734e9a62b1900907ea372
21 DIST genpatches-5.15-54.extras.tar.xz 3936 BLAKE2B 259497959ac6cd96036809fbc1634fa174e611f626b0f36c8003587ec0825fd75431b34329ecf4a9d9aeda3803986b2e3987f27d37e0fddf27eb83509c248548 SHA512 7c85e42f6195f6a0bdafbf0be5fbbab1b7a634a922c5233d1dfc2c29842fe4617888cdd7769584d2e918457bdd1a295b8761e354772d78b05cd1e917e9f71abb
22 DIST genpatches-5.15-55.base.tar.xz 2235252 BLAKE2B 7304a492e04d83ec505c76af4f3eb61999547647bcbcfcc82a2211aadbbd2fd63bc3335eeee9ccb8927d3d0486e41afeab6adbe3d3e8da4ad0c13d39f1ff4139 SHA512 47c488dcba5854a28a6b8f968e13f97fb31dc5f31a5a3abde426df7972a890c8fa36530ead386f02f3ecfaf2ac49da1e27d8a2de2df5c6a5c5fdf302e3c492fa
23 DIST genpatches-5.15-55.extras.tar.xz 3932 BLAKE2B 50132ad9a1b3a9012ff46cc2ed8c0d18ffd7c48aed1c481eff24e4757652e3787172049a3025b2586092382c827c6d139930d157d039258d07ad228ea716c12d SHA512 188abe81e73bf1a809125dc634e10be8427c1d11f696f4ad7fa60a0ba269773278e3a9e568e3640f7ad8fb8f4736de7292a154b05f8f7bfab4fe1fbe341bceb8
24 +DIST genpatches-5.15-56.base.tar.xz 2245780 BLAKE2B 0f5e5d7c8a29f590598f4721307e3b1a316342cc31b8e5ab5496ed58b65470d19bed59ff40cf7b26bd4970eee04581ee8ac544eebe63c54063c161a55c828cea SHA512 0a1c4edd8f863f2c77a14cf48d79c35868ba8b2f02fb2436e1913e97c8285046ecbedc33e6faddf02a0c813e677492be0fc972e3731c733e488006602eb6119f
25 +DIST genpatches-5.15-56.extras.tar.xz 3932 BLAKE2B 2b167a35d9dfe16a18b22318ac4597147fb25bef53a66108c2f2e4d6e6d3df1c9d4b1fd6d63ba4a8078f94f8cd69d14b359123355ba266ef72b44f7d9addca9b SHA512 ce91556981720f3718921993eb15f5af623cad8dc40a36bec6cbb0d52153fd1288bf97927daab1b1e3ccd1451d4295b109ead0160c657a00c62c2d6f25fbc09f
26 DIST genpatches-5.18-10.base.tar.xz 500696 BLAKE2B e6dfe7b2f752aa0cadb2de11ed7e9e77935abf4d61c99fdb4f6790853364c8b8b189d25b2190b3c85b51ef355b085d1ab740599a920843534f0d4a840fbe8733 SHA512 d425826ca98a5600262485aae057401c131e63b2b84ef6eaea287a433acd4b0f98e3899bd931ac73eda5651c57bcc4bec730469655d54aa1f176ebfda6724aa6
27 DIST genpatches-5.18-10.extras.tar.xz 3924 BLAKE2B ea024b19777b6fd59ad5505eaff41db7dc793f5f29beca1d70c2ab60829f5864f1b78f9b809fa9443f995f70df82746d33ac9ce9453a564b77c3964b49afe822 SHA512 7468faea1020335f546c69d331aa864400687056a01cb54a888f3d4bbe6c9061fc2a5d519f93aa362b87df953bb13c06ea2dda403e48f63ca259a6990120ff5f
28 DIST genpatches-5.18-11.base.tar.xz 547804 BLAKE2B d0550c546e93b806d96c8e64c5ea90d22f9675f2c6a020032ce5e35b7401601c79d2849c0d82cc53673e6c22fafc975035509079253f235c7db769fe20670e59 SHA512 4301f61e38ede94fa5c6e02f67e22dc32cb1078463aaf641ac81d959444e8088c1e7da6c3ac7d877f1f94777bf14de1a24207caaa8c560fdfc352a6972ea5b47
29 @@ -70,6 +72,10 @@ DIST gentoo-kernel-5.15.51-1.amd64.xpak 69309556 BLAKE2B 67da4e954e56e2a29572b88
30 DIST gentoo-kernel-5.15.51-1.arm64.xpak 64196759 BLAKE2B 0a4cda382732b176a5154b20170b563c0833f1a7eb3597ca9b25ab7ae1e4633485403b01edd48918a72147ecf75d8dc2b9d64bfb1ab5c97539232ff2bedcb77b SHA512 08a9ea4f89b17a391047e82f35f7ebe0e4300721d3cacaf850eaee841bf6e3a599ba1a0fc6858ab5c3225ab2d8fe19bc556d026030dda557c386e78156a5647b
31 DIST gentoo-kernel-5.15.51-1.ppc64le.xpak 58159508 BLAKE2B cff69bf1ebf4ca29dc63a449a1fed9401b0fd564ccaa571dd05e4e2e2ff661d8bf5599984045e29c026d3b6eb3b6b568b3c6cf9297355ecfea42e3f5e10092cd SHA512 2d619d149ae96cde6e91f89be128535aa798e1f3a344a7d5d080a4c5b6affb3d13b9ee279af445825267e13f6d595d4c3093c8b5ae799398d8a538c3f4590220
32 DIST gentoo-kernel-5.15.51-1.x86.xpak 60074334 BLAKE2B 3a4244484c3a8eb35e084e22c2e8d2dde81fea2333069795b66bb2eac7f6f5012871a0ce6cc53dad19888e065a46ab3f082c69abde44136dc5bfceccebe53af9 SHA512 151c5570d473aa88c8ed6e6052d68b19b6150df1c0e7abd08b6dc7213103693f28d9f856e05f60e79142c46fc89c50b2a511750561df0a63a9dd420383b0accc
33 +DIST gentoo-kernel-5.15.52-1.amd64.xpak 69378739 BLAKE2B 410ce229e5392547374c5554ae09447869e7101aa4b71d95fe2fee95e4637e529c43c784d35d6e1297d1d8b0a6747f14e977480f907154b1d23ee3f571e4a9d5 SHA512 cf8c27e0ba2d7feeeb20c90f3247ea6334775bff8560c385924b7949d8f34da33d53b35d75b5978515882caea0151a30bbc43c6130320221332103ddddf4e4e7
34 +DIST gentoo-kernel-5.15.52-1.arm64.xpak 64180081 BLAKE2B f0c4f0991e106bd70b81962b3ef2b2e4fb2bce26f80f5cfe3563c2277bb87236e7d4a2eb7685f0cfe4f7400f0e541cc8b86b7d722d5d72e8ee9afad031b36a9c SHA512 a2bc5409f92f7665350f44307c310b03beb0a2928e390d01408708b12802a9833ad7a732874d71114cb50640b31c633ba8a0de030e6ebe205f2f0bd707ad4c90
35 +DIST gentoo-kernel-5.15.52-1.ppc64le.xpak 58183126 BLAKE2B 8fbc979f03617ee0146fd891662d244f109976c2fa142364e6ee48095072c442be2c4f46e859209fe688c6def9f7829884c1ba0db654befc4bc4f78c06771f9d SHA512 7038984aa9d4f556cdf322476b29b61ce497017291789eaf99d8b2f03d95d9c3e0899608dcc93053524f2a9415297ea89c4c6738b6add722eba8e25c375e3893
36 +DIST gentoo-kernel-5.15.52-1.x86.xpak 60091381 BLAKE2B 87f97f1a9c20f95c79b367922ec6ca97b1d21ade64c1e459bb7ec13ee36c05e7e1b8ed079a31706f3bda2e9b1d248a1111b08c373e128d17bac0a1b1e7111553 SHA512 7477d45a92f56dee74f8dceab168b1523e351825b16b6535d1151eacff8d9e9ab48a89d4bf041e0ac2edde4a8ac145e96f0ceea1b727f566f1218f5fd12d1418
37 DIST gentoo-kernel-5.18.5-1.amd64.xpak 71624251 BLAKE2B 906903314080f075709b091cac9471975a7af4833e76a6ff6143aad4a1d4e3bb258a350e15573163eae0a018df917c965cca1d35404c2cddb7777a2a300fd345 SHA512 eca0e7978e9e214d3d18a9cd78ff62e9ec2b1c320f030ce45996743cb809a1072cffe7680065c7f8272eead9c9ff25a04e956a9af53f9ab2013a4a12a5660b5d
38 DIST gentoo-kernel-5.18.5-1.arm64.xpak 65223184 BLAKE2B 9b54ac0556c6515a9303f6c636cc32c78c8c2b5a0afa03ee7f1ab627a6cc51847d2e606d4beedeb0373ce00d87f7b41b49c8f6173d9154721113051e6b335f6a SHA512 109860d371ddfc7f17c3ff0d41e683f9adf8213aa880f8171e212b7d5a4109098f6ea2cb51355de0622ace8c3c69f094ff12331f230b618d912e85e4b1944f4b
39 DIST gentoo-kernel-5.18.5-1.ppc64le.xpak 59550570 BLAKE2B d22a29421f489f9e27018b166801fb039b7a7c58e45efad3eb2841a2e9bc2e554da116c469db7ac0845debd86969ce975ed5c5a4392e33aa8b3a626882a52fc4 SHA512 005450035299a52699bee929bc7135a25536f633ebf23cee71ef771760c93104fe8ea63016e367fa7ffdf7d1b42b8f173b8a87c6a2aed7b868ff4bf35bfdf767
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.52.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.52.ebuild
42 new file mode 100644
43 index 000000000000..0787e9b25ee5
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.52.ebuild
46 @@ -0,0 +1,135 @@
47 +# Copyright 2020-2022 Gentoo Authors
48 +# Distributed under the terms of the GNU General Public License v2
49 +
50 +EAPI=7
51 +
52 +inherit kernel-install toolchain-funcs
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}.xpak
66 + -> ${BINPKG}.amd64.xpak
67 + )
68 + arm64? (
69 + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
70 + -> ${BINPKG}.arm64.xpak
71 + )
72 + ppc64? (
73 + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
74 + -> ${BINPKG}.ppc64le.xpak
75 + )
76 + x86? (
77 + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
78 + -> ${BINPKG}.x86.xpak
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_unpack() {
105 + default
106 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
107 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
108 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
109 + eend ${?} || die "Unpacking ${BINPKG} failed"
110 +}
111 +
112 +src_prepare() {
113 + local PATCHES=(
114 + # meh, genpatches have no directory
115 + "${WORKDIR}"/*.patch
116 + )
117 + cd "${MY_P}" || die
118 + default
119 +}
120 +
121 +src_configure() {
122 + # force ld.bfd if we can find it easily
123 + local LD="$(tc-getLD)"
124 + if type -P "${LD}.bfd" &>/dev/null; then
125 + LD+=.bfd
126 + fi
127 +
128 + tc-export_build_env
129 + local makeargs=(
130 + V=1
131 +
132 + HOSTCC="$(tc-getBUILD_CC)"
133 + HOSTCXX="$(tc-getBUILD_CXX)"
134 + HOSTCFLAGS="${BUILD_CFLAGS}"
135 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
136 +
137 + CROSS_COMPILE=${CHOST}-
138 + AS="$(tc-getAS)"
139 + CC="$(tc-getCC)"
140 + LD="${LD}"
141 + AR="$(tc-getAR)"
142 + NM="$(tc-getNM)"
143 + STRIP=":"
144 + OBJCOPY="$(tc-getOBJCOPY)"
145 + OBJDUMP="$(tc-getOBJDUMP)"
146 +
147 + # we need to pass it to override colliding Gentoo envvar
148 + ARCH="$(tc-arch-kernel)"
149 +
150 + O="${WORKDIR}"/modprep
151 + )
152 +
153 + mkdir modprep || die
154 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
155 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
156 +}
157 +
158 +src_test() {
159 + kernel-install_test "${KPV}" \
160 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
161 + "lib/modules/${KPV}"
162 +}
163 +
164 +src_install() {
165 + mv lib usr "${ED}"/ || die
166 +
167 + # FIXME: requires proper mount-boot
168 + if [[ -d boot/dtbs ]]; then
169 + mv boot "${ED}"/ || die
170 + fi
171 +
172 + # strip out-of-source build stuffs from modprep
173 + # and then copy built files
174 + find modprep -type f '(' \
175 + -name Makefile -o \
176 + -name '*.[ao]' -o \
177 + '(' -name '.*' -a -not -name '.config' ')' \
178 + ')' -delete || die
179 + rm modprep/source || die
180 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
181 +}