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, 22 Jun 2022 20:01:25
Message-Id: 1655928073.0f704792c8c11242f9170caba0bae2619571633d.mgorny@gentoo
1 commit: 0f704792c8c11242f9170caba0bae2619571633d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 22 20:00:10 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 22 20:01:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f704792
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.49
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.49.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 55d614015fa2..945088f08a09 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -4,6 +4,8 @@ DIST genpatches-5.10-133.base.tar.xz 3705140 BLAKE2B ea0136c10a49158b3baff338a09
21 DIST genpatches-5.10-133.extras.tar.xz 3868 BLAKE2B 30b7a0fc22202becd9b3517aff1f4ac797f6dd1437b108d5c694307641e158c68078514d7c2e32456162ee558659391092ee6e8e5cd0e7d620481563165605d0 SHA512 8e3ad4883726c772d2988ce9618c8fd1236760ca87c6645e1c7bab99fd540ae9cc1371a566bcfcb52bd816e3c21f5c83821b4e77831efe4f1b89eea63b3ff544
22 DIST genpatches-5.15-52.base.tar.xz 2177024 BLAKE2B 2fd4767dd3ae66cce6a179105389ce6e57ef0bf46f2ed5cb9a350d300472f813d22cdabbde4201acd6c76ca0c7701d09753351c12b4eea05fd1e93142ae4d526 SHA512 cc5fd2f260366f8b2715e09c4124d269b168bbacfd40ff36d6ab113419b30331ebd000adb01e5e6df4aff27487e528dc2f3e154b7df32d37e1f30f5c13e247be
23 DIST genpatches-5.15-52.extras.tar.xz 3932 BLAKE2B 8735d0c2d8e5e3a14f01893109e8feb179d6632e0dc3254b57d7545fb6280ca09bf9c2baaef7ec02bf337cb0f1a0d42f2e44dea2168cfa2c2ad20969b64a178c SHA512 c461a48096d46bacfc4a2d89060b6e72584d74b215b3ba5c969529bfb4330672c15b7e5f015492e5b1ef081942eea60342a7d413af3fe28f2fde730b41553ac8
24 +DIST genpatches-5.15-53.base.tar.xz 2200544 BLAKE2B a6f1e11186e771abe56bb453d45f6228aed255ef6e7f8b93cde7cd22d5d6068dd7abc1a7025851ae27f7bf8e6076d5a78c009e940645fe39926ceff20cddece2 SHA512 bcb691818b050f1c9138827ca2c86bbfe43cf6521b9f802dc41c4ba4f6e42e11e79494cd54ac391bf1129fc30f7baf9272f81821df9ef8ad79e2553655606d39
25 +DIST genpatches-5.15-53.extras.tar.xz 3932 BLAKE2B ade13a83b27b14cf19f455539599aff1db3bc6caf99d07e746b292be702c49591519b63f754c4651ac3e0e867412cb5ffb588d5056cf6066c193e09a0c3feaf2 SHA512 438905963b586148d6385f24549343a6fc4d623f24aea089f52af44f772eaa62f0602d729b0232620d8ca08d440210dc7dbe7b5259a3fc232d603f574b5bf714
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.4-203.base.tar.xz 4798932 BLAKE2B dc918ca3e7538b66b87a8bd8d2c673f56b71706d913007176de20014a2ebe38889541aa3441af7f4d6db69044779a1e54dadc122e59d180c15fe5131b8056aca SHA512 975dd953d5baf0e72e5718dd4979657597adc380559f41e769e94d294a08b272ba06080517d134a3b2611a6d4779cc3d8b423d869b7dec5e6c43af0634996871
29 @@ -22,6 +24,10 @@ DIST gentoo-kernel-5.15.48-1.amd64.xpak 69354442 BLAKE2B a95c782168eac06b73cbb26
30 DIST gentoo-kernel-5.15.48-1.arm64.xpak 64179857 BLAKE2B 776c33bf26548d64ef57a1e6519e03d7697fb3e36687c9d821f224398e87608ef6c19f03a45c5f73d2cffba03e7d5e698ba7b3bdf038a6a3da61d1253e81c946 SHA512 dfa64eebe6bc9ec9fe3dbda8903d4631c436ec6de5dcb549f320f439142f4b4e9a633b0be39ce3b5045bc9dbd44746e81fa9b60105d262c9d1f7aa6d09a959a9
31 DIST gentoo-kernel-5.15.48-1.ppc64le.xpak 58119260 BLAKE2B b651299e4c429a2c56ddeb4e5997c696ff78ee5b5197be7e86446615204d9f7450b695f11002d9424d2f3284ba11ca4113122d035e2bb28bb030f57b9d04faec SHA512 fc3b787f4dffe4174a7f033204e4c93fe03992ae33a9091736bc6c15fd3d7e828b1f6e57889b9c1bbaf3f7304ed8153ad6868d74267157dfa9172de007417785
32 DIST gentoo-kernel-5.15.48-1.x86.xpak 60092955 BLAKE2B eedf565d6e148bca0566f2059bd7c2029eb3a98f1f3d2837890e98ad2622c6eb8b09b02a7045b776ebe8a8610841a718be7cc6c48e72ed25cae3e3d1b8b4736c SHA512 c618f8ecf33d291f80c23508131a898fd0d6d3149da5b522439733a90ffb8f67eea13c9c64b3c726832448d08c534696d0fbc2a228600e85d98fb1b44b8168cd
33 +DIST gentoo-kernel-5.15.49-1.amd64.xpak 69290409 BLAKE2B 2eb80b52277e11cada454ea17e5054cca4803570f21bd85b3919f48872b3b451547610dd12cb5acf1258b4f38be85ca24019113faec4bfdb8804bcf32545a80c SHA512 b07fc048d0eb40315e8fd8b89a19ab3d3a97bdd210c0b6278891c3936c306a0ec5a61332efb9dda74ce9af351087f00cb8aa9d17c08397477de38155deee5fc5
34 +DIST gentoo-kernel-5.15.49-1.arm64.xpak 64187081 BLAKE2B 72d2622b62569121c179459f0b40a6b03209198dbf311b5f8f73756ab29435040e170c61d27e89042fc3db22ae18bceedbe2db703e4608e6717842b89b481b22 SHA512 f4bbd4c26849f6a3377e6347833c81fd780342c1c93553c2084debb41ea6f197c1198c407a8b13143df0be4b4539e48c4868dc7f6160bd4c36fbc70eef2c2b11
35 +DIST gentoo-kernel-5.15.49-1.ppc64le.xpak 58209893 BLAKE2B efbde20446abfce3dd39b1eca02611f7c7b78f208a203151f705e4d8bd84a8ec5606fbf31f0ba891990074bf9c0a6dc01527740dbd1c29aa9bda4d34009121bb SHA512 e1324ca6fbf0dc607e6df64ef9ecaaa0ab2031719c89ba5ef356f57cce344e1c6cfed2546cdba6e89d23acdd71e2eb2cdce3e8c7d26956bf2749379cdb9afdd9
36 +DIST gentoo-kernel-5.15.49-1.x86.xpak 60082105 BLAKE2B 62763153d4b794588218548b13d490a6a0052719070a1547ad5c45e44943bc6074bb397f482bca5a6f9badec80b573422b57ebb6164024fa51814c3e1fa3ec5b SHA512 0c867a486e35c0abc5ece0f07775461db0171ba4a84504252cf0acf024e805707b057d9e1b564b97c2337da255bb7d775ffc14632fe5d220c81773c4b0c9e094
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.49.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.49.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.49.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 +}