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, 28 Mar 2022 15:52:29
Message-Id: 1648482737.8ad1ee8ea23bbe5496b6c215c0be5cb12c49af9e.mgorny@gentoo
1 commit: 8ad1ee8ea23bbe5496b6c215c0be5cb12c49af9e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 15:51:37 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 28 15:52:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad1ee8e
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.109
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.10.109.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 f19199611f06..a0601ceddf5d 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-115.base.tar.xz 3150232 BLAKE2B 1cfcbf4855ac4eea3331ab7696d
21 DIST genpatches-5.10-115.extras.tar.xz 3872 BLAKE2B ec14f023762a3c235648ec52e895c27cd472c4a9c2304ce0519b3526aedd8ae83b98600f4b0724730d34aec02bd4e00857289007894dff282e2eaed107431359 SHA512 cacc5aafb79c02e32059fb0f820897a1c688e93aca64ac4c8c3e700dca747a052541c678dc5acb51f65bb343cb1ab9dc359109b4fcc30b08a28fd852673bd104
22 DIST genpatches-5.10-116.base.tar.xz 3156432 BLAKE2B e5aeca5226e01239e656045b1aedc5fb7c98f4848ecdd742a740a17194d2c3a3676cda189f3577bd102aba2d35daaa2f6c4afa0eb943772b9cbb1c5020443ac6 SHA512 6972aa205a3d7718490ef39cc46af7277a49c5d777c8c131b85db07a23a2c4825350ad1493fc9d17a5bca85251e961c3092585c58008df2ab2094c44d9284a93
23 DIST genpatches-5.10-116.extras.tar.xz 3876 BLAKE2B c36a485ce2cb9916d163be827bbfd0fa687b4d106dbddcec3b657f4740896157b4442a4d21ed195a1542ab4680894857afd3f08c6111effb32214b626d6bfba4 SHA512 a6d91a7beceb43a9f348bbea9d7c0a78daec405f1d39a98321bc34efaef4d8f6f40f1351cc6e96f08ff86203b91bd911a8ec7eb689070c835e53890510b1df2f
24 +DIST genpatches-5.10-117.base.tar.xz 3165564 BLAKE2B 0e41b33af63a5b6da920d194166e75b32812231f7b13a56211ad390d744f889dc8b024328dd2048e7c7bc356ea04936716c295cf4d33d731bbc7521b9ed720d9 SHA512 421a487bf1914ee42c8b6c39a6a99f4841e8a38e293024b4367a10391b1ca973c041697c42979b7e4a78b56b9e871034b0703f8bfa6c1347f3aef39eb49f9066
25 +DIST genpatches-5.10-117.extras.tar.xz 3872 BLAKE2B bbac7edcded53e4205c58e1404692b753d57f306b98bfd7e718206e25a947b2e1e565ae33712b64f9b24333df30c32c975af71c5a9d11bfb836216a27dfdc782 SHA512 b192de56c873740d963fa6689f7d9dc177b25cbaa2847adff2d3a5ea7c6c541161c4518f389f7a5f2294b878dabc0d06844bf4e45cffc87ce8f9649d55a4312e
26 DIST genpatches-5.15-31.base.tar.xz 1285168 BLAKE2B 3ca09c8deeb3487fd69fe1b26ba36410c67f7c0728767999f640dd8b1655956ec4bbee2006052ded21da4f83fdba736a26610399a7580c874b1bceeda62e9564 SHA512 6330597eac5391f12fa6821d66d36fae95465fbf53d15404cca1e2496601116fbc2688fcea7e4093e00aeb241efbb1a22f4f925b5d96748004abb50ae0b21c6f
27 DIST genpatches-5.15-31.extras.tar.xz 3876 BLAKE2B 47b21170f3fe46257b20f4cd63288a8f61a3600746883baa2931253d2924696e4d445404746f1a656adfa390ddf8f24780ec6688aa835467deb75dfa0d9f2fb4 SHA512 c0f866410b3436f5c45c117f1dc49e3b1d99d77d41de66ca6d08213daf6bf3eb1e8875e75e1674c3f78c7beddb6dfa2d47dc9fb75f8dfedd169f1c3478b74db1
28 DIST genpatches-5.15-32.base.tar.xz 1289524 BLAKE2B 4fc3b82df9a96c5e91cfb93bc68597afa1524bc8c1a49f9a803d72610307551b9675b4e014c5ffd0b3e273b2a660546f274b27ab5425e9aa6eafd03719e5ed74 SHA512 277957056d9c8c8cc8f6a5a26582f35ae594c26e6e29b755b9214a91624eafb2917c67a612c231d8862831f4aeb34a725502c57e9063432d9597e24abf913947
29 @@ -36,6 +38,10 @@ DIST gentoo-kernel-5.10.108-1.amd64.xpak 65764491 BLAKE2B 86c7b9a7738a122507ee8a
30 DIST gentoo-kernel-5.10.108-1.arm64.xpak 61035587 BLAKE2B d760eaf5772d3815c1f796f10c713be142f81309cf0135ed43dac7fd8a4ca017b04fa1fb25590d5fb9fe1847376293db43429731c74b0cddc5d15d226e7f11ce SHA512 02aefa8b9ef8d52094a4e4676abdbf2db23aeed2a6b43e9d8fe72197b57cfd3bd9c4daa11411fd855cbb8c4a14ea856057b54c46859d2f12a4a52f2a617581f0
31 DIST gentoo-kernel-5.10.108-1.ppc64le.xpak 55783172 BLAKE2B 875f801d63a1a2da248be4ef691dcc2329efb5e9bfd0de95f668e24d1d20f6826da35c0440d8302d43d901dbaa4e39fdad08b12003636eb2aa59db328ffb87cb SHA512 1b02dddf25a95fe709273304ac0033e8232c0e04926a6997118ee17dcee0b358d97e4a9754dd92386a03bb6bab56095d84124e910150f12bbbcf1a0b9f69906c
32 DIST gentoo-kernel-5.10.108-1.x86.xpak 57383447 BLAKE2B 492f82eef93bf5d4b88e157bb57006185e220c91ff3d7d3ece023e89366d2cca397c88da1c6d456b467078d97bd4ffc019cef695cbde9dc0612d58acff20d8fe SHA512 920632435ec46aaf5f59a44b72a9a3d1db120405b9c0044daae1aec58b5eae43876287840fba9f024243a54adbe0f5e80f2c4f6c9f2e51717d05e0faf3b01a15
33 +DIST gentoo-kernel-5.10.109-1.amd64.xpak 65727782 BLAKE2B 5fa0d5f189dfaa93b3ef1bde853efb1473ffd37711439a40009b329929df2c93b490331b2d8149bf7d30d07edb085e7c9eed7ce66aea3d9085d04d33d894b511 SHA512 1cc3dc9fb5a73cd1cfb1b99c3c1366de5d0c15377ada5fd4a251d774d00526906db395fcd6fd82b6b42abeffcbc3b4a4ff31ecb4e28dc81f69305ee0018e7bff
34 +DIST gentoo-kernel-5.10.109-1.arm64.xpak 61045068 BLAKE2B df8a0214d4cf59e0a49f075180860645cf8fe1a0e1a1f62bb7265b9b9d5056834d328cccd1661e80c7ab1a8a651f57a2d3d8c250da6ba3b25dc5349ed95b6f41 SHA512 bcb625eb11362f4872bbebab2562ad75567e2504194173671a40aa810ac9d0282d72f55556e749b4447bc7d4df907e58fbdc8a1fa0587050c3c0fda62b6a2bff
35 +DIST gentoo-kernel-5.10.109-1.ppc64le.xpak 55828184 BLAKE2B acdb17f64eeac0f2a292902f020283ee9e3836cc9428d2b2587f53755e791370f611bc50060a73385aa4171ed5284cb2a5b6d3545873914fc68075fd86551cf9 SHA512 872df4d6cd4a010445c406cd8605a24c2292e76f9f07ca79c1ad728d768af255e3be9c2d4069415e46d2697d3af22b340211cbe4e02bee40ae483b6bf12078bd
36 +DIST gentoo-kernel-5.10.109-1.x86.xpak 57377986 BLAKE2B 9de3db8e2cbecf1b7f9d6b7ec4a54adc318e556a7d2bbae952da36fc113b7ae6b44148629ff7041f584096d4240203747cd5fd9983454e3ba7ef08c814d0e836 SHA512 6760fed9c33fea05f7f4b5486a0486d3a562bcd1c9ce7a64161ac86fdf660ccd7302d094aa8bea6fb2b10713b3a76b9b82b97421d40e702172dd9cdc52004cc2
37 DIST gentoo-kernel-5.15.29-1.amd64.xpak 69179015 BLAKE2B 081a08b4da2cf0a16d77b9f692cc88c1294d0eeb4d502963a06a80fc77c6ae8b450394613d5b239703b6fe2e3e7a154d5f251e93ea1ef13a267a4985e5c7799e SHA512 39c44f0b419fe4852d1a310842ccdc65c1c5c7675839f8de52aa31a6cef9d7e7d8aeae18ba3268435fddb2c6e6748901505bca54e9035b3f678c4192ffd80479
38 DIST gentoo-kernel-5.15.29-1.arm64.xpak 64104223 BLAKE2B 0032e0a506b843bca1d5c2e7a983b396f2e0f89f039fd7ed38b34499b214728f6c77de58e64612384c9ecdb84cbba7c76eaceb6ef4e9cd387607f5fc09f6025f SHA512 66c46479e26d226b248d4fffbbfa75e25894588b1570c36685f6af550d3ed50649f3b76b724e1743377164043c090a7af1e3c4571c83dc27fee2b78f9d799c34
39 DIST gentoo-kernel-5.15.29-1.ppc64le.xpak 57953767 BLAKE2B 22813171a3f0daff4a0d54430d2fbf5173bd03dc8533f80864de5ebbf394f2274df7fac57ae6f6e1547df587b96cdaa2d991f8bf5f05cf7c9191ba5572fc90c7 SHA512 c7ab73438eb617ebbc4d1b3b742555e4867914a2fc82b341595a137b58ac719422ef245cc3f356f49ab328a377f4a6a432f2fc1649c56a7f3ea4d065c1616859
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.109.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.109.ebuild
42 new file mode 100644
43 index 000000000000..84bead9d866e
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.109.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##*.} + 8 ))
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 +"
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 +}