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: Tue, 26 Apr 2022 16:04:47
Message-Id: 1650989072.ec67c3094c5c0cf9e3ec59f77286f458d6e84788.mgorny@gentoo
1 commit: ec67c3094c5c0cf9e3ec59f77286f458d6e84788
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 15:41:29 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 16:04:32 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec67c309
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.17.4-r1
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.4-r1.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 94f28f0ed000..164fa477ffc6 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -24,6 +24,8 @@ DIST genpatches-5.17-5.base.tar.xz 498648 BLAKE2B 07dde85c14b37b5b2e7716de408247
21 DIST genpatches-5.17-5.extras.tar.xz 3800 BLAKE2B 84ff6d95364da66b1ea0a8cb830e855aa4bf262768385607d4ca59c09dd5159073a33f414facce97f3b1a90ec3f055adf03d48f3fae9d05609b75351375af422 SHA512 e4bf053bea92bf10d62dd4a7d07b9f135d540996f3f503da07af9259f6f1f86e17c00d0d1c955b5bb339a29b577de1df9936515e7e0c617847187d77c3b37bef
22 DIST genpatches-5.17-6.base.tar.xz 557368 BLAKE2B 7d9668f583167cb46a87a451416a69e1f1042bff745cca1394e83649580f920fd18aa030f558975f9ac4e256f70336ffd3b238616fd58697f9370753d7753d22 SHA512 3164fe7a6907bc7ceaf48dbc474c8d3807aa7499cb2a706995d3c27da89a19b34990d9b981d5d0e583ce23973a9a4dd2ad251d44c1f8d539dfd6e64d93416d28
23 DIST genpatches-5.17-6.extras.tar.xz 3796 BLAKE2B 6921f442b3c5a3d1f5d437504668488c96879cfcbbfc096275afccab4664d01a0748b0a72e4bbcc1f1564829eeb8346402a14120d79a7be923cf08c0ecacf385 SHA512 8049dfa5390180a9d0cad7d18ea13cf2620e9883d733d8d5e2a09c11b26e4afd8ae28f81872e7e16bd6107205f0bf17edb475b390384fb4989d688b7b49630ae
24 +DIST genpatches-5.17-8.base.tar.xz 558192 BLAKE2B 8135b5dbc28154d346f1e24d915e1d80098764186a28638a147d3f840c431c7a44b00f80166d1acbf4181ce295c2655be4b7939919158ff2fd65174bba7bdd7d SHA512 3577093fa8b8961fdee9e52e67c0681055f26db4e5861ddeba8146cab3e63a1ca97287114feb79deb8a82518d7915cd213af01c18735207bdb705985f276dd5f
25 +DIST genpatches-5.17-8.extras.tar.xz 3796 BLAKE2B 149f398df8860fae67cea4431affaf4a8ef5bfbe570434e5c7878c3bc1f8fdf8a56fb069ec79bc1fa65a5e0189a302162a1cc44865739e52a1af6db74cfb86b4 SHA512 14a850ca0481eb66da3419841b5c80b25bd00da30454b3101990399bd9f8551682ea82006b3a223fe91ca2c977a45aba983914943d375ae4c73904a2f5a318c2
26 DIST genpatches-5.4-192.base.tar.xz 4516512 BLAKE2B dd316606186f305369ea67348acf0b6afbe2eacc16564851a1eb94224afcbdc066f920578092a15bacc7abb7a8f659aa44bde26859aae2525eaa84e8cd0447f1 SHA512 28bed80b1bfa457d24f8367a3a76460e569f7c8eb4f0a6b632f1898615ccb4da4c2fbba95dcfd1cce5675fe6151cee4c0df6bc0fdb158c25c25cf71a9397127b
27 DIST genpatches-5.4-192.extras.tar.xz 1816 BLAKE2B 2d6760ff367ee0ba6ff8d56f81c7c3587ccd8c4f8fb952e3380148b2f3532a19cd614f352241134eb3256f8e59c000806f3d1eb33caa582e0c4be813d3275672 SHA512 f8d43a3a80abd947cbd667b3ed449215d98967fa8dc2200efbba86db946a04dc7dc971d74afe1aa6b923ea3f9914b28c3bcb9f6ec205b1bfb0cd60c0ae57758a
28 DIST genpatches-5.4-193.base.tar.xz 4614484 BLAKE2B 94f35c7399a4912dc546f80271989f63bf0c838d953bfcc05cdf3240b7d88e0ce542b44000b21af0b88871d8933e637855b0f42bf3efe523eba2e93933958381 SHA512 9f3d60740388b4947d039f218b5f9e886cdfbe3e781109b6c24cea67d29408fb8f49f5a92fb6bde31bfdd131f6fd329ca2a867819d4dda7666ed84aebce2d5a3
29 @@ -82,6 +84,10 @@ DIST gentoo-kernel-5.17.4-1.amd64.xpak 70391649 BLAKE2B 5e3871f7f47cf44c0939112c
30 DIST gentoo-kernel-5.17.4-1.arm64.xpak 65823372 BLAKE2B 8d9a44972b11884595679d619e9d0bafa3253c47c6ba7508617de6b4fd61dff917706329033f89500b744a53ea06eb15e4006d8a3f9c2ce5ee4975c9f122182b SHA512 58eecbd067d3fcc95a74661c7f9f03597542f8d5620677cde440b5ac03c62711d8c01c3de642dce8c0f3404aa0d88f5580f5baf94ae449129f8461f724017b0d
31 DIST gentoo-kernel-5.17.4-1.ppc64le.xpak 58776917 BLAKE2B f52ce6b944588f0e4e884e170cb4f43b74ce5acd283604b7c323a22f3221810b7e39043bf2596965d5c3da91e90292389d688a19848b1ebc4c0bed0b92168d49 SHA512 7cad34b1497d25c159f754178f6f067ee600f81e742dd9ef94f5d1bf6a65241168bdd4d8057ac91631d1a3f936690706f897cb9b0ec9114c9adf347b50017392
32 DIST gentoo-kernel-5.17.4-1.x86.xpak 61103293 BLAKE2B 07975bda89d67fa8a7059d98464c69d3a2627b1aab396fd0aecdf26e15218f2ab224c9f3053707adc1a5df4559cee17e6a5c8e18e92148ad27746d01f4dece62 SHA512 f4f769c98e61cf3b43957baccddaffc429cb29dc4116f96f7809005cb270e661aaa136c696ae8a4b905678908bb431fd4251bb225c576d8d5f8a700dc3200600
33 +DIST gentoo-kernel-5.17.4-r1-1.amd64.xpak 70430680 BLAKE2B 8f246d8b11c900b9d090f4fac263d0a054a4bfe467f9f28abd416a78581d5fc89d08f6ade95f82f6bd182d7cef98b8d243f3d49ccfb141d0c61f7e583bd6acfb SHA512 cd5c00cf9edcad010187f6f8b022db0b3c52feb48830b74177dbfd0c2a1e901e125250a9a203b70dfd252677d1f944a25bb2e09ec1954239eaecba324ed64e0e
34 +DIST gentoo-kernel-5.17.4-r1-1.arm64.xpak 65839972 BLAKE2B 36731d61f9f4a105123e367c24a8e902d1d48cc19c4414a72aca928ec4d96375720ccc45176d486849e80b4688f4cb6860acc2ceaf0aff479e8a75a3d62d857e SHA512 6ffaf431b0ac41713437b9ad48b9e15d91757c95fc0f17d8f08d92e931f3bfd9d57d5726c56d98022aeabc8358c1e7635a6992ae317450ab556549b03f0b3cbf
35 +DIST gentoo-kernel-5.17.4-r1-1.ppc64le.xpak 58851867 BLAKE2B 0c0a974aabc5f147608380cee73642ee6ef0bf9c7f92c6b743d44d0a9444abb2cd13d1e8429ed3b0245d909cd0705564d83edae66af6bc1ae111250b20bc9f47 SHA512 e5ec809a2454d4668bf66e77b5281486ecb62c56012756e94fe48de06105d99a52a9187a0dc807a2bac44ac79dd639b09e85ddfc6d82922a6a8221c8f64b9bc6
36 +DIST gentoo-kernel-5.17.4-r1-1.x86.xpak 61089636 BLAKE2B ee4861eb2de0ae637bfdcab1087cc2e267bc883275b2f852852d50dd0430c5cd03bd91c00d0cb28827f162ee0dcabb10504080462a452f280f83f12fa3d12477 SHA512 dfd0c546c0e2ac10d2dabeceb025fbbc23bc220476b62e064416b117120fd7d377541206dc5f0ce0b0db57c757ecef32e877096e5389e0451f4f6fc7e3634a8e
37 DIST gentoo-kernel-5.4.188-1.amd64.xpak 61601422 BLAKE2B 99c6cdc76e5dc2d778ae57fa4a09f06eb35208f167ec93028c52d72fc61d8b3c672c082210790646fad3c0e752964a05319e2fdb24c92cbafc9017c336caf920 SHA512 3ef221e440b9d5a1f7bf6bb4d58bd4dfa021d20dc230accb16207c27007e8e51aad73e36306f3161bde740a228c66b9d3133bff07d3b9e05421577bde30e8a75
38 DIST gentoo-kernel-5.4.188-1.arm64.xpak 57741944 BLAKE2B 95b3a954db55df7c00fe0bab94b82e98237f39bfa54df697d94de151ee66ab6107b0f0fa9c954d785b69b801ed589a53da5d0f8777873df3e7e6a1bd89867843 SHA512 4a293801db3ab0cb18f51067d23d5f59aa50996362410a5ccf510573e17b6d611bb328c11e0f91bb47a66c0b773d79000dff91cb76faefd517e410967eae6ff9
39 DIST gentoo-kernel-5.4.188-1.ppc64le.xpak 54984206 BLAKE2B 51d1b01bf56ee1491cffc11910e5bef1af473d129e640a071e73a44c490a703d509e5d9343d207953e5deaa89e9831490a4edcc7bfff30b69f37a875d3931ce7 SHA512 beaa920f5b6acd7e58b980e9677b980b2daf0413938bedb6b30efdc5652c5154dbe12af57fbd21660466e76063ceaf98012799400ef163086545500d79753dc7
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.4-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.4-r1.ebuild
42 new file mode 100644
43 index 000000000000..7b2cba6c08d8
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.4-r1.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/}-r1-1
57 +
58 +DESCRIPTION="Pre-built Linux kernel with genpatches"
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 +}