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, 26 Jun 2022 09:08:36
Message-Id: 1656234505.611743608442f0909c6c3ecb7b2f6ff9645cd262.mgorny@gentoo
1 commit: 611743608442f0909c6c3ecb7b2f6ff9645cd262
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 26 09:05:22 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 26 09:08:25 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61174360
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.50
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.50.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 653e343fa574..046c4e3e6b7a 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -8,6 +8,8 @@ DIST genpatches-5.15-52.base.tar.xz 2177024 BLAKE2B 2fd4767dd3ae66cce6a179105389
21 DIST genpatches-5.15-52.extras.tar.xz 3932 BLAKE2B 8735d0c2d8e5e3a14f01893109e8feb179d6632e0dc3254b57d7545fb6280ca09bf9c2baaef7ec02bf337cb0f1a0d42f2e44dea2168cfa2c2ad20969b64a178c SHA512 c461a48096d46bacfc4a2d89060b6e72584d74b215b3ba5c969529bfb4330672c15b7e5f015492e5b1ef081942eea60342a7d413af3fe28f2fde730b41553ac8
22 DIST genpatches-5.15-53.base.tar.xz 2200544 BLAKE2B a6f1e11186e771abe56bb453d45f6228aed255ef6e7f8b93cde7cd22d5d6068dd7abc1a7025851ae27f7bf8e6076d5a78c009e940645fe39926ceff20cddece2 SHA512 bcb691818b050f1c9138827ca2c86bbfe43cf6521b9f802dc41c4ba4f6e42e11e79494cd54ac391bf1129fc30f7baf9272f81821df9ef8ad79e2553655606d39
23 DIST genpatches-5.15-53.extras.tar.xz 3932 BLAKE2B ade13a83b27b14cf19f455539599aff1db3bc6caf99d07e746b292be702c49591519b63f754c4651ac3e0e867412cb5ffb588d5056cf6066c193e09a0c3feaf2 SHA512 438905963b586148d6385f24549343a6fc4d623f24aea089f52af44f772eaa62f0602d729b0232620d8ca08d440210dc7dbe7b5259a3fc232d603f574b5bf714
24 +DIST genpatches-5.15-54.base.tar.xz 2203912 BLAKE2B 36e27d2734e9a62b1900907ea3722a522ddc61c991b5c751dd09d055b9da0fa92bd0de3eeee8b1560ff9a60c8d80181904dd14b7db7878b499a07bb31b0b5f90 SHA512 e751fbd89b91dc59dd0ac87f906ad1c4ae69ccfcad97db616bddd0d25184c133cba8af1141f5e32f690199d6196d0a5035941b70576cd4dd80aea750d1ce0c27
25 +DIST genpatches-5.15-54.extras.tar.xz 3936 BLAKE2B 259497959ac6cd96036809fbc1634fa174e611f626b0f36c8003587ec0825fd75431b34329ecf4a9d9aeda3803986b2e3987f27d37e0fddf27eb83509c248548 SHA512 7c85e42f6195f6a0bdafbf0be5fbbab1b7a634a922c5233d1dfc2c29842fe4617888cdd7769584d2e918457bdd1a295b8761e354772d78b05cd1e917e9f71abb
26 DIST genpatches-5.18-8.base.tar.xz 440848 BLAKE2B 8a965867409cc340b13687eec9c7391bbaf26b770ba8d4b657b923226a539b7b68eabab6f12bae4bed09a0d198917373a6ab4f707831c652e2461a49f8dd4981 SHA512 057a00d62f4d8ba7be4ea26aeaa4bfbd5581b22ded85dae71aaa693621eda17532ac00bbeaaea1689f552ce2b95a04e9aade603f6236c2a265aa8fea8231c5d0
27 DIST genpatches-5.18-8.extras.tar.xz 3924 BLAKE2B 3f575b12166621c67c9cf6ee15a76af551a039d142a85678abc10829e9a573641be8557b9b606352d46fa4d123e95071b2946447a6f53afef5b37eec5f342cf7 SHA512 7aab8d9d18dfb6129ee0e995450c9d9d759545a9fa2cde1d26dfc03d677b9133a310f3943cd77b5981830a6a1cff59463e85759ef5cd68bcb2838dd96104f590
28 DIST genpatches-5.18-9.base.tar.xz 495452 BLAKE2B 244e049522e9b8586081b9eac59fec51184c532bca70fc1d451af1ded646df9bdc7e047cea0963fd07ae8aa04bd4158d64854a2d790ec90be37aa467c7e8b646 SHA512 b90abf747ae92bb4ac7ef94646aedc21a89080d10f8aecae63821d59c0ac29b3b94c0fc6b862d87eb8b86442c2d41cfe16e3a1341d3c146d2b3c678c2f2cdf9a
29 @@ -38,6 +40,10 @@ DIST gentoo-kernel-5.15.49-1.amd64.xpak 69290409 BLAKE2B 2eb80b52277e11cada454ea
30 DIST gentoo-kernel-5.15.49-1.arm64.xpak 64187081 BLAKE2B 72d2622b62569121c179459f0b40a6b03209198dbf311b5f8f73756ab29435040e170c61d27e89042fc3db22ae18bceedbe2db703e4608e6717842b89b481b22 SHA512 f4bbd4c26849f6a3377e6347833c81fd780342c1c93553c2084debb41ea6f197c1198c407a8b13143df0be4b4539e48c4868dc7f6160bd4c36fbc70eef2c2b11
31 DIST gentoo-kernel-5.15.49-1.ppc64le.xpak 58209893 BLAKE2B efbde20446abfce3dd39b1eca02611f7c7b78f208a203151f705e4d8bd84a8ec5606fbf31f0ba891990074bf9c0a6dc01527740dbd1c29aa9bda4d34009121bb SHA512 e1324ca6fbf0dc607e6df64ef9ecaaa0ab2031719c89ba5ef356f57cce344e1c6cfed2546cdba6e89d23acdd71e2eb2cdce3e8c7d26956bf2749379cdb9afdd9
32 DIST gentoo-kernel-5.15.49-1.x86.xpak 60082105 BLAKE2B 62763153d4b794588218548b13d490a6a0052719070a1547ad5c45e44943bc6074bb397f482bca5a6f9badec80b573422b57ebb6164024fa51814c3e1fa3ec5b SHA512 0c867a486e35c0abc5ece0f07775461db0171ba4a84504252cf0acf024e805707b057d9e1b564b97c2337da255bb7d775ffc14632fe5d220c81773c4b0c9e094
33 +DIST gentoo-kernel-5.15.50-1.amd64.xpak 69277543 BLAKE2B f3ea00ad0b9708c68a07cd780f18b98e4f219cd93ed669b92c463d08ac4eab9a2c4d8be2577f17dfc63d9c2b1ada784fcad2b867ae47f5970f8d1d37db8164dc SHA512 86f430d1f7de8a7c54f6c9d2b475b3f5787a9ff0089d394582be17ab4c11a3c42fe44a9b720303479d67ebfdc20beaf82b6479a34c869717384d8ab659389180
34 +DIST gentoo-kernel-5.15.50-1.arm64.xpak 64189904 BLAKE2B 8fab84733c326dde8dace4fe0b6af4799cf06607447837a510b7d82904422e069da8d0c6690c2a8ed3d72453f02c478b83e993e3405f2e223752b6b631cb963f SHA512 e9009648544997b620ad833d6fa52f1fbae1d37674b449ed60d74ae066026cbaed573fc8eac9dfca6e384915d6595de2e7b2d8a2fbed7edd1f3693c1ae652bf6
35 +DIST gentoo-kernel-5.15.50-1.ppc64le.xpak 58219901 BLAKE2B 115a8ba67c3b55dcc572107e925565305283a2817b6c51083d478a253425e35a5eed55f72fa92c798f0cc95b14d7a5405412436b76b4042f6fc0f8dead956a54 SHA512 73d5583adeaae8851d59be1c69242b87480674ee9c3fed4fbbe1bc9e269ede6683b3817a56b424016717ffc7356d7e751204cbc7b5d83022c9fa975ebfc47c5d
36 +DIST gentoo-kernel-5.15.50-1.x86.xpak 60114559 BLAKE2B 7a10a4e4b4bc2c006aae202db249fd6d593e22ac04210aef8c7b5582081d4c18ef128de1640d7586e6efaf47847e036bf1b9508bf5171b3842ec323b26e4c7b6 SHA512 bae8a1fb2b5312f7c59d25162102fda069d2d1908ebb0baa9c9be3c4c52cd49b1d37abfd6c8a719c1a84bf4d332b6245c1a54e6635b7a30fc590bb7791175065
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.50.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.50.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.50.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 +}