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, 16 Jan 2022 17:09:38
Message-Id: 1642352966.c3f69ed3eff0d9ab08ad3744d0ba07b018b6ead4.mgorny@gentoo
1 commit: c3f69ed3eff0d9ab08ad3744d0ba07b018b6ead4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 16 17:07:45 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 16 17:09:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f69ed3
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.4.172
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.4.172.ebuild | 131 +++++++++++++++++++++
14 2 files changed, 137 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
17 index e98e0c0e394f..86eeb922ab33 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -28,6 +28,8 @@ DIST genpatches-5.4-174.base.tar.xz 4301872 BLAKE2B 0fba459073a7132ce714ba48a9e9
21 DIST genpatches-5.4-174.extras.tar.xz 1788 BLAKE2B cef1df26cc9c64dd12eb4f034a6e860d37bb1bbd7e1fb7b4f5c0be86f0415d7f3613a33e159ae742174bf947896024a119055b5713211ddcbda3efd8bd902417 SHA512 87f287fce0d40450efa306f3b44c5fcf1257aa6825b6f9894c29bef23791326666af38f561dd197e0c5c0511ac28297b3a5c0e976296fde13eb0bf99ddf3a3ec
22 DIST genpatches-5.4-175.base.tar.xz 4309380 BLAKE2B b560b26186c64fbe13da9ebdecb94c6d155071ec3ae27d96376f477d97d19b4ae99ba04ee6053c8e71982cfe9719b9b426ad00aedae00683deac2ec9e043a640 SHA512 0c4c7bb60b5f7b9c2c58520145880080244aa2aad4016da8d876288b454f722874e31d1b99e5bfdff76250062ebfa267c3b4a1679f1c1312aa90c948b4a309e0
23 DIST genpatches-5.4-175.extras.tar.xz 1784 BLAKE2B 392f95f0fcd23095be7f069f7c3f663f15c701e49753203db34d8d5c81e5cb340c62814ada8ad46e4b4c812560ae23116cdf901774c92733afc47fc0c7c4f741 SHA512 521a8607c5926344a812ee81ee22856363dcd8a08f2a6744580b09be5bc8514e0cdcba5090f22091e3f6a20a6e273dae5aff25ca4d20eda4a31a0673947e2739
24 +DIST genpatches-5.4-176.base.tar.xz 4314356 BLAKE2B 634fc60994b041c9a5900773f95b4be94566dc2c7d00a85eaee6b75a8193675ca6aeb05cba825a863d912607f7d596024d340a9b9ea5d1ad1219f65cc8cf05e8 SHA512 4049d64a06ab2b08d7e780bb2d5eb877ed611237a36ec73639aedc41752935fa599fc024636078a760a763f6701e74031577f2ebdcd1920ce7c32542f9a87acb
25 +DIST genpatches-5.4-176.extras.tar.xz 1784 BLAKE2B 0d6574addee2b524cbd3347b86fe880fa438a2fab8abca6b96ce2f3b15728c6358f3e87c10b4603afd4f5c131eb1466e5ed251b92dce4ab0c662e5f1f5a00cb2 SHA512 8d4086857b62c7048ab318729e841be72cdc48b9c93ee88614fd488d8ea74f775290f262a00a121ef9e3c259a8724bf290377b22f43b4cf0024c05d0108d03ef
26 DIST gentoo-kernel-5.10.88-1.amd64.xpak 65533790 BLAKE2B c0b944c638ea7a45846f679147918ea6252f8945021f4dfc4a4c656d3f2ce46c2e8727f7d4a5ace57726df88d23067d21210cb9b1a059ee6893d95dbafde90aa SHA512 f347e3b0a5be1110635ccd995a2c8f142e379c11a26a1901c988a86f57c8c50db285d3445321b38f11945585b6bcfbaafdaff6c0092f6ee189616a141eb65040
27 DIST gentoo-kernel-5.10.88-1.arm64.xpak 60908835 BLAKE2B 56dcaa2323a559a8c431fddc9889065f6f036b244dd29f203c7095d3e19939f8586c7e26d2f1ec215c8ea1e971c64ec7066c231f967a39b205b55575107ffea2 SHA512 0f96759440f48e895f015ae456a7d62f3a4d531d23557c461a05d176e7866fae189d47f9e300441987cddf7b88b2bf0ebcf8588fdb21d8b980b742fbba73f664
28 DIST gentoo-kernel-5.10.88-1.ppc64le.xpak 55791954 BLAKE2B ea69c83ece3d9bf6a96efe0b168bdd91a7f55e5887f2e8dc2af2f0db4e01499ece76f474d4877f2971905ba0c7ee47fd0ea6a3cc5bd0b9b802a8b0a240a85a51 SHA512 9552ed2e9c4a88c846b272817660e5844b1cfc5b5c81c7abcffa3bdc401bf8f93c4b4906b0a414a75685062001469de013fa43282e5fa88e82d84edcd348f2f7
29 @@ -87,6 +89,10 @@ DIST gentoo-kernel-5.4.171-1.amd64.xpak 61440560 BLAKE2B d96121361cf2621ec267800
30 DIST gentoo-kernel-5.4.171-1.arm64.xpak 57633922 BLAKE2B db6b9bdd1465ccf304b5d5f7c7f34796da7752be9266e3f5222d0814eb1e20a2228393fb62222b3cfd6e595bee31c643b3734561dcf9e6ab61dff97b72c98a1c SHA512 39c4fa4cd52c4b53423890154f696361df104e07637e95c9178c7541b1a886f55c37548957a37c74a919942ffcdfbb65b8810f7c2fb053cbccf498e188d8ba52
31 DIST gentoo-kernel-5.4.171-1.ppc64le.xpak 54868435 BLAKE2B d381ff7ad451d91cd3881bb19537daae6aada940f9637cebec734f6823aa5d4951c204d7e833d952c17554549d8ea203989c9e99a50c86251f4251034bac283e SHA512 08eb669830919b407822dea9792fc7e29404ea45823c18514da7aa294c8df3989849d9156eaf7b312e7225430a3eee97a42bd04473229320a8a208665fb7ca7b
32 DIST gentoo-kernel-5.4.171-1.x86.xpak 53168932 BLAKE2B 14d8b7bae62a88903e51fb2f653cf2d628ada4166406cfd9c93fef2f61cce87b1ed2574653fb60d148af1917a2e5c47869123b71568c076b3b21399371a0356b SHA512 550efcb44d7574af79beef3bbb990a2f4579381dc810c8201b727ddb8e3ab41e8e98f43ff2f3c31cf9508c0c8440b78ecf2864c88a728cf11cb0de59905811e6
33 +DIST gentoo-kernel-5.4.172-1.amd64.xpak 61471862 BLAKE2B 0d80ce644952d52a7a3940d332cc6af749c163427fd187f767f684c97a93669353ce3b2a9aa2ceee714774dc3ce1a477e3879ed65e3f00696890ca3e2c910e40 SHA512 9fc76d890b5f72d5d28d7503758b6b0fe6b40c0ff7cc93490536ff99addebd1e41028e2ceccdd3560551c395f285a9cd9208cae0e5e0dc79aa43eee9acdbc086
34 +DIST gentoo-kernel-5.4.172-1.arm64.xpak 57645495 BLAKE2B 9596de3af34c48c7f9ae8eaf133826d25bc1f86538d97f3ff105ec9c472a2a7c822a4e7fe3ddad93f502b48ab0c587add02db955837dd1ed1182c33709b86c75 SHA512 3e45079d7f07f733806c2df590c53cb53dfa37010a2cd41dc6672fe32c579e4f6d1501144fd4763e0c9e4bc48e256518cb34e55e5ad43877943f38725ec4dceb
35 +DIST gentoo-kernel-5.4.172-1.ppc64le.xpak 54888865 BLAKE2B 55b1d5085f63708434bc387d055abcc3f00b24f1784a38a5e8a250523b975317737cdca079d0830a19af03cdaa9d2a32a4e1f0c5614fe1b3b7bf861c42bd2061 SHA512 600bf9341f3d0f0f2931d9be069c9756dc2887224ec1dbb7362ffa474270e07f4c8a762702e2b27aad978d6c364c0c784f5718fcfe956f69e9777cbc8e554526
36 +DIST gentoo-kernel-5.4.172-1.x86.xpak 53173567 BLAKE2B abf8e1c36931ac91f3f8ea0021c005f00c11cb5a3d685468313226aebb3f47c83cfd8ddf22404f15f92c829a5b2a6132ad5364bcfec60e4c5532a56c20b65a4d SHA512 c74cfa8bc78e76f1e3191473f413e0359c381d13f5be437b2b2069f37c9f8baf1d7415d3c89c5dd99a273efd6a17176f71caa7699d6ecf917ab93c040c3d2f28
37 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
38 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
39 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.172.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.172.ebuild
42 new file mode 100644
43 index 000000000000..5bdada88d281
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.172.ebuild
46 @@ -0,0 +1,131 @@
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 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 +S=${WORKDIR}
81 +
82 +LICENSE="GPL-2"
83 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
84 +
85 +RDEPEND="
86 + !sys-kernel/gentoo-kernel:${SLOT}"
87 +PDEPEND="
88 + >=virtual/dist-kernel-${PV}"
89 +BDEPEND="
90 + sys-devel/bc
91 + sys-devel/flex
92 + virtual/libelf
93 + virtual/yacc"
94 +
95 +QA_PREBUILT='*'
96 +
97 +KV_LOCALVERSION='-gentoo-dist'
98 +KPV=${PV}${KV_LOCALVERSION}
99 +
100 +src_unpack() {
101 + default
102 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
103 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
104 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
105 + eend ${?} || die "Unpacking ${BINPKG} failed"
106 +}
107 +
108 +src_prepare() {
109 + local PATCHES=(
110 + # meh, genpatches have no directory
111 + "${WORKDIR}"/*.patch
112 + )
113 + cd "${MY_P}" || die
114 + default
115 +}
116 +
117 +src_configure() {
118 + # force ld.bfd if we can find it easily
119 + local LD="$(tc-getLD)"
120 + if type -P "${LD}.bfd" &>/dev/null; then
121 + LD+=.bfd
122 + fi
123 +
124 + tc-export_build_env
125 + local makeargs=(
126 + V=1
127 +
128 + HOSTCC="$(tc-getBUILD_CC)"
129 + HOSTCXX="$(tc-getBUILD_CXX)"
130 + HOSTCFLAGS="${BUILD_CFLAGS}"
131 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
132 +
133 + CROSS_COMPILE=${CHOST}-
134 + AS="$(tc-getAS)"
135 + CC="$(tc-getCC)"
136 + LD="${LD}"
137 + AR="$(tc-getAR)"
138 + NM="$(tc-getNM)"
139 + STRIP=":"
140 + OBJCOPY="$(tc-getOBJCOPY)"
141 + OBJDUMP="$(tc-getOBJDUMP)"
142 +
143 + # we need to pass it to override colliding Gentoo envvar
144 + ARCH=$(tc-arch-kernel)
145 +
146 + O="${WORKDIR}"/modprep
147 + )
148 +
149 + mkdir modprep || die
150 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
151 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
152 +}
153 +
154 +src_test() {
155 + kernel-install_test "${KPV}" \
156 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
157 + "lib/modules/${KPV}"
158 +}
159 +
160 +src_install() {
161 + mv lib usr "${ED}"/ || die
162 +
163 + # FIXME: requires proper mount-boot
164 + if [[ -d boot/dtbs ]]; then
165 + mv boot "${ED}"/ || die
166 + fi
167 +
168 + # strip out-of-source build stuffs from modprep
169 + # and then copy built files
170 + find modprep -type f '(' \
171 + -name Makefile -o \
172 + -name '*.[ao]' -o \
173 + '(' -name '.*' -a -not -name '.config' ')' \
174 + ')' -delete || die
175 + rm modprep/source || die
176 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
177 +}