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: Mon, 06 Jun 2022 17:14:57
Message-Id: 1654535606.882ce004e398dec063db8bc32522d11c4aeb1535.mgorny@gentoo
1 commit: 882ce004e398dec063db8bc32522d11c4aeb1535
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 6 17:13:26 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 6 17:13:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882ce004
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.17.13
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.17.13.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 8c252522cff7..8a34333cb216 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -20,6 +20,8 @@ DIST genpatches-5.17-15.base.tar.xz 769140 BLAKE2B dface984138a5b7f75911c7d6a4b7
21 DIST genpatches-5.17-15.extras.tar.xz 3932 BLAKE2B 8084ec2b3be0e27280efc68d58db4fdbbdd0441fdc6fe89eca6e422d84d8c306122c5fc235c58b8ca3f2af58f5923ab7102a3c157b06e321a4f3c84b5fd951e9 SHA512 bf20e023296469cb4767dd7088fb0772142deec3adac89fe581153dacff74ed4517e8a121aad70004b1f1b21dad40fe0c072817c4043e7d3d8ac0ff3c551ea31
22 DIST genpatches-5.17-16.base.tar.xz 803164 BLAKE2B 5a5d96e856476fc0fbab018db9276b770d30521d5878c0390098ae4654bb915aa33959da66c3b7bdcd05427b2870527bbd806a8926ff05de9b53b5cf9d0a2bf7 SHA512 66d0978276021e392fef20476e0056bfcab76a55cfbbb1fe84e913a70347db8fe8c8c0b6c7b50f24da4a192517156aaf88449aaa495133f6d933f24b3b7b8d6a
23 DIST genpatches-5.17-16.extras.tar.xz 3932 BLAKE2B a0f7e32a2f67d3fdfbc1706207f17b18ac2e55932bf7a969762674afb9d4b506e9d3095f811e72ab47addb439cc29c3e98ad16e09f0fbd3e8724477d74baed1a SHA512 07475d9cb94147449765b98acedb9709a707dcadbf293e3cfc927a338e716a45ee40ec26ee942d356ec8461a1bc20ca4eb93d589187759aa52305f27e67bc951
24 +DIST genpatches-5.17-17.base.tar.xz 823112 BLAKE2B de53871be24c0c7257de3b2ac384bc3de480b79161353fda2cbfa1c26b94d80dbe6257443c630f5a050436a2fdf865ff580db503dd0dba9db9e41f3b357292ea SHA512 345643550ac05c33fd3ba54aae1a70a0a07498eb6a97922f2ea4291247c10a9f3e5f5f0bfc9cc1c0669c95cb5d6f94ca20e01539218b8c5b128f544003a23421
25 +DIST genpatches-5.17-17.extras.tar.xz 3932 BLAKE2B 8c858ea2d37aa0a60752e051af6a400253e79ad69eb186b5b358ef398992ee62bbd9896c68db0c5e16981ad020f24718f584e5765c6f16d4eab3dd6651940404 SHA512 1a032cbde503850d3ad3a81b8f4fe845d8cd2bb7da6979a676a4c4ed641ad9bffed6cf89aa870fd3f1e0cb9569668a431d7d30ff049ec7c669a06a11896f6c10
26 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
27 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
28 DIST genpatches-5.4-200.base.tar.xz 4700404 BLAKE2B 8420d667947cf912a8d6419581377b5d7daea5a3c03e333403a4c0d0d55200afe4bd7f379c786ff5904c8f1cd1d7735cb7df95a5a5aad93fcb8b90a8750683d3 SHA512 771883d2b15e92dd5e2ea31e9566d3e1d210389323521be5af32fbea75c168d17e947bf004eb515c54f7b0880fa12fde236045bdeb35e08aec8b54465cb253d9
29 @@ -64,6 +66,10 @@ DIST gentoo-kernel-5.17.12-1.amd64.xpak 70371512 BLAKE2B 18ff154d6fb9547db9f81b2
30 DIST gentoo-kernel-5.17.12-1.arm64.xpak 65894363 BLAKE2B 1a7157f133581a7fa420e619d4f8ab7c411b34f19fdacc8d594f729ee74bcc54d03d1b5be8ceb3611be518626b94c6674693ea91946ecd1a86df9d9635157568 SHA512 e228d63c23348063b03922da51402b93b85ec892dac743611880b7d23e46d4a38d57a4699583ac287137c5de29c741373949efc327cc5e108cf247a901c3602b
31 DIST gentoo-kernel-5.17.12-1.ppc64le.xpak 58892144 BLAKE2B 8899d09b95989ee9ccf411fa855fe077cc70559bd0581284e2c4c21a2f0b56062455b30dcbacf45d00240e5d5f603025c42912d0e0944eda4c87304ecdc1016f SHA512 14bd19a7371c0e818a98e2aecc352c00616890a222d099a539cce6cf5b9c2f9c503b7b172a6f4223055ab528427df7c6d7048d681b12e3f3b6dafbd604da95ae
32 DIST gentoo-kernel-5.17.12-1.x86.xpak 61114450 BLAKE2B 4818fdb599bb493d8592afbca09c6d610cc9a7f3e8d05a6fdac7e1f64718f03d66bd422f907f5d377bbd450063dd3f03b92150620d7b47bfbe0a6ab3ae75811e SHA512 2d676f179aba5a66caf342b327544df97bad2bcb9c2ef89cd7b54d34b136a99f0b94a2b0253a63fd9ccf27816ea3db6b46fca9890aacbb54a7d55946a528ed26
33 +DIST gentoo-kernel-5.17.13-1.amd64.xpak 70424341 BLAKE2B 8bc648d74300adb0a45e35c1ca0380b3ce6cc155600d79de536e103405d4db4cb7249efff1efd570ff58e2c270b946c6676dad2562956515038aee9a7a736e6b SHA512 09243746bb81838dd93eaa58efa3a4ccecba488d704783c2872960b804ab4b0d50696d8f1230f0e0ed5bde513fcb7b299575d347ec68b91127d5feedbfe5f8ba
34 +DIST gentoo-kernel-5.17.13-1.arm64.xpak 65859176 BLAKE2B 2afc47aa267c2c3eed832d6280b231d06db19d506a86bd0013f9e46c8ed32cb699d9003e036beeb06f6e533945af8ce82e397167945688bc6b8bdb8e6ce58f0b SHA512 5626ad9cc652756b59179e6aaaa91d9f3fa4ddb90ba3d427b213491013d70f9a51ad66cb6d91ee6d97a62b03b5d02d647f3a685f153c9806ee0780d561740d07
35 +DIST gentoo-kernel-5.17.13-1.ppc64le.xpak 58824325 BLAKE2B c4ae35d077ed1b5ae484c035ae3bab7b10baab97a96b756cccf596a05ac3817fb1d3e67546d4232250fb40b575f56550175239eddd307b55c53136d278ea2d74 SHA512 0f08cac501c9961d0e1fce32543b42591b5d5ef3c2d77948666aba6db44774c0486aa1c036d27ea1922f72c2ee73b8cd95f47850e18aca0f520344c1a2955092
36 +DIST gentoo-kernel-5.17.13-1.x86.xpak 61170230 BLAKE2B ed5b6f4f61b3d4715f950702bf4091c5edff6f422a6487d8525d1159876a789d0900c29a52eb8756ed92f9f3d08819987b12075af38d9c951e66ee22c486b639 SHA512 3362839daa51e0a23de6b5baf9f038b0d881a7a2f7d7c9a64cacc0e6e9cbb37cbfddfb4f0f909fb64afce25d519d99864742c95cfeda61aa80d504d18d6dd4eb
37 DIST gentoo-kernel-5.17.9-1.amd64.xpak 70359753 BLAKE2B 42994479de1aa72a97f73207406cd47986c7d0c545d681b00ab3edb380fda1d34fe032360868dea6099eb69507ea4ee9a4401e37139460ce4859359372627c62 SHA512 3521ee3fc95d7ce6e6cfc1f68bd46956df598b416be176d97b01f914843f9071635e21cb7e7b3d29fe29426aa5ee50ee124430830e64b6f670ecadaf8f58b957
38 DIST gentoo-kernel-5.17.9-1.arm64.xpak 65823951 BLAKE2B 648ca1341d90acecc50e1d021df9665a8ade52e6f77e8480638c9b411e835f3a2c5c50089d42cb560a19e2c3f0777097330867a6f15e21aa8a282669895e8ad9 SHA512 d36d663220171939fbc6eb25b99375c2ae8bfeb06ab3dd8f61ad864591a555f287e687261e9b31c6d180399ea5fbec6ca5690f8d894bc0f8266ed7cfc9b192e2
39 DIST gentoo-kernel-5.17.9-1.ppc64le.xpak 58892612 BLAKE2B 0d64511f201af38dea549e22526f9cc87069dd6e2d32be5153bb258cbc3d71bdc8b399e73367070c046c33a6ed6636ff89822b0e7ecbb2f97a7541370a7eb4c3 SHA512 4e8e1f35828d44dea9bd93b46b923137bf61049454720f8778ccb9d0d8495f14806738591b7765ff4c0b033f94e9b866ab91f845c91cfe9c414d235eae306b99
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.13.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.13.ebuild
42 new file mode 100644
43 index 000000000000..0787e9b25ee5
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.13.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 +}