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: Thu, 08 Sep 2022 14:05:22
Message-Id: 1662645366.40e832906f3f9868692320684b5ecebb776bb46d.mgorny@gentoo
1 commit: 40e832906f3f9868692320684b5ecebb776bb46d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 8 13:56:06 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 8 13:56:06 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e83290
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.67
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.67.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 0b6c0da2dbae..70280b64e526 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -12,6 +12,8 @@ DIST genpatches-5.15-68.base.tar.xz 2897744 BLAKE2B e1aebd74737e787df999aabb0153
21 DIST genpatches-5.15-68.extras.tar.xz 3932 BLAKE2B 34fd77b8464322ad369de5b86dd8dc83ce7510bca139d4e6036b0b2ab34d1c80698b5f965e44a09dd25ee3b4d80abbccc5920e7984803be2451281c74ff735ea SHA512 970a1e5a03f786d05bb1ae9217a467442f16344fffcf2c77a2572c6db656b0fcd5b3329eae193999c47bbb45c8b02f0fd9010760ef74a6aacc474729f0ee9369
22 DIST genpatches-5.15-69.base.tar.xz 2924208 BLAKE2B fc4f14592624fe2516c917425c04eaeb7e45073fb77e5830fefee93e3d25c448c8a523862ae89cab99220599c7ab5992d03cb5f81354236f77bc2e21ee802fe9 SHA512 ebfcc2c23304a6b316ecf226fab1200cedc7893093c99ca50cca4c1ad393dc5abcaaa0f2d4789909425a8eae2ebf57d4651f95eddfe40ac39522c95de59961d9
23 DIST genpatches-5.15-69.extras.tar.xz 3932 BLAKE2B 03a0b738dd90047356abd306bcdee18e7468d111dcff28cfe4bc39c7328d146c69178b1fdd19cef92c0076ad981e845f2ad37778a0907bcf0fa572011d747b08 SHA512 bf29f35d834d6113b68a3ab0a2c2ab2b241c2fa13e47f59669d23a6510cbfb29d24f5947582b2c24f2e4e3170e798d6d0a4171c47973399431a32b76a770488a
24 +DIST genpatches-5.15-71.base.tar.xz 2956404 BLAKE2B 20b54274b121a6e15d8960cc62e63e822db1d5fcf3a3e2f3810b70026015b405af6c5840702e418a13da2a712653f06a3f5d8af3de2157e40f1b41c8e0299a44 SHA512 ca2e20c2b6db7b2d064730650c1645524558d91de787aa947849541f2a6b0d29c919307373b6ab0a62cccaa0bddfed382c7aaf5d4b00620e1ce97d4983ade3c9
25 +DIST genpatches-5.15-71.extras.tar.xz 3932 BLAKE2B 53ae8469ceaf8524672ef9f7155dc092558135681438ca8dc233dcf99d458a538902ee805d8572b8ec47203966177e3cf199c47ba3ff48ceff7ae1e7844c2707 SHA512 c35adfff42a907787088d7756f77672f321b5311e08c639bf4fefa344517ea5f1d038e50bc3bbac3e321c16ad3b0ee9a35ca96f031820817ebe063b79a98a7fb
26 DIST genpatches-5.19-8.base.tar.xz 643396 BLAKE2B c383c7efc908fa3e8ebdfb750d92df6adfa1e0d00f253eae40fb5db5b84f8848a5c1a4fdcda693da998b1ba9d1afb1019cbc2574ceff2b099d2125ead515efc3 SHA512 ebd5eaaefbd362d85fa8cb95b0ca4192bf7a0835ec58ea25def13e502f87f74bcc29219083f39b85462b262f526f771270b5a8d93ff49126e1653d948a9ccb9d
27 DIST genpatches-5.19-8.extras.tar.xz 3808 BLAKE2B 8cad0dd5deaca8f8b379c96cfad02add0cfe7498f17e84d11e6b809e366ae0476734bd003b287456459febe2ff4c1fa7b3e54c47243cd571a34ffb1cd927a1ea SHA512 a183d09ba7b1fc3f89b7754709df8d093ba70b09f71e237844214d65bc5821b6328c436c7ef697c30bfd38fc833bd178497190a2e73914a03ec0dfa4cbcdf7f2
28 DIST genpatches-5.19-9.base.tar.xz 665036 BLAKE2B 0d0f0305b82cf97240237cbde866bccd757a27ef91d23843feaa5d05be9f4d647165ad69b796d21a30bd7d92674b6be873aa529052a41ef8c200ee781a3bcc6a SHA512 e86ae26fdc5e0cedad066be47ac7d162ac7f546f253855394abf5c6da02a1c2ad99ab601fbb54775ab36720ac3e8161c9bd3fce2ddcf1ab451e30bd680ebf33b
29 @@ -48,6 +50,10 @@ DIST gentoo-kernel-5.15.65-1.amd64.xpak 70834024 BLAKE2B 97385aeb7ebc8906ff27f41
30 DIST gentoo-kernel-5.15.65-1.arm64.xpak 64204873 BLAKE2B fd3727ff04fdd1373052b34873b6512342fca30970375218a95c3c208c2972a2375eb7571fbe80976b4883356bbeef3de3611c02b93e99e618f6126befb2c1f9 SHA512 6d9c8b7dcfe94494b4858c39cf547e720d0c595353ebdd692fdd08f1e77de010734bf66cc169bda234332c58d805740d9b88a8ff8fe1e8b9c4b6e92d4fb5703f
31 DIST gentoo-kernel-5.15.65-1.ppc64le.xpak 58125320 BLAKE2B 0254a15c7add13fc270bb4f4a0b1edc490fa8a9f7ef747623a9c747db53d64b5cee24d625a6936ee9242f20a5e37fc7dd920a09aa966b45e25e74e9f503193b0 SHA512 7c003a2f7eccd80b6693667480ca652f1b8c18f1c34c6a69286d76ef3fbcf3c319332a70b54b1f4b3984a53c3080f0355b96acc54b34c405eeba81be1f437ae0
32 DIST gentoo-kernel-5.15.65-1.x86.xpak 60165596 BLAKE2B d152578747d7207f2e30137164841b545b76a308a48e547ec1b596ab97acfddfac11df734894707ad0cee99a6755042c0c503996750f4d5ac0e9176a0443873b SHA512 41d339bee7b7749bb28ff0769179c0e8646bacf3e0cb027fd4133df8827e81f9302c052b4a83b632414f8b2db9e3e4a80bb5606d08af7cbb364b9ef06a1ad7e6
33 +DIST gentoo-kernel-5.15.67-1.amd64.xpak 70832447 BLAKE2B bd96bf9ea0ff3a2a557542141ffcfcb07443ba20e6362cd5eabc31372f75e2cf0f37c7f6ec7558443227ff0da73a99cc65d471e3f5e053fac60198098a99ca5b SHA512 0633d846d093e44a00799e5a1f31da11432f25d142a024b9df5d12763a20ece80f710ddfdd0f765e7c5713eb24d641c4aac9f6dfd88bdbdc78bdd9c99c249c2d
34 +DIST gentoo-kernel-5.15.67-1.arm64.xpak 64210848 BLAKE2B a940e3f4d4a1cda699ef12b5c3950928f51bb127c30eca3cb891b4a45f741be228b55c426fc75e220f816e089940776715d6ffb22ec6dadc578c41fb3a015795 SHA512 1e4fba67f44b32fad6c35835a826456d4660e0252ee5caeed06420f87a8ad470cb7779faf6531c03d5483117f7667fe1c4163a6cee55338dbd1b002e7d6727f6
35 +DIST gentoo-kernel-5.15.67-1.ppc64le.xpak 58203745 BLAKE2B 70743f00da183b162a572d12cf6924f2c4ed3224112b949e821ac1aee7499ab798ad829304f12628af1a9b78cd9ac8a612c2b0ff1798ca5db823f643b16b04ad SHA512 fc2305121d81d7a38c29a28bad6b1cf34c421b0c9074e796d037d042666524ce39d4ff5845cc6b42811ad8f877f6aa561bbfbf16523bf880b3356fc04d475d8e
36 +DIST gentoo-kernel-5.15.67-1.x86.xpak 60126211 BLAKE2B 6c543e1925b57816a1854c09d2256808ba06e8682146bd4a985160106c13b872724cb32555e6e96c6d81e8e82289ea45bea614965cca69c158373da7d82400fb SHA512 b314bfd21a3d9540ce0797114cc3e2d90b8c1523b3ed8317fb67479ae5789cc2263817d6b9e7e2ec92329625c370712fd82854ff62e1467f75ddd2b58d9a3df2
37 DIST gentoo-kernel-5.19.6-1.amd64.xpak 73549646 BLAKE2B b41eb12cbf86bb8f015411ae4a00a7a077e77ceb257671db891e3abb409dca86e2481840581435fc5c4df05f336b2e2a6b237de985ff295ce903ffba3d30f001 SHA512 55dd49b39c4c37536cd4d084b6eaaffb4f2138e7837a2f08b68eb2179043154099ea7e1b29f2d98719c2202304e04f8b8ad3440d31c0083f31763164feca6b82
38 DIST gentoo-kernel-5.19.6-1.arm64.xpak 66387997 BLAKE2B b46d2cb7e17f50919f1b27d938ce6dd841217bb1aafd6af59a289bd89f70ea1c2145dfa07aefc71a4ac18ab3e0ff863d48b457d388ecb292cf8d8b97aedbd7a1 SHA512 731c953d6ee1112392c2cfb4ebf968f4cc71e7beb5bc986f9934d2a37a8011fbfda327a4dfc29c3f075ca60f1142ecdeb0f780b144d525ac434340b469d5c142
39 DIST gentoo-kernel-5.19.6-1.ppc64le.xpak 60014130 BLAKE2B 1fa35be11714caae645b0d0de4d708cf82ac5fc0372adb8331b7f8c036f220662dcb892e69a346f24ce86ab40ef703d691c59511d303319f448a357a9b9d91e7 SHA512 8c28ee3dea8343821241627d405342c2ff24a4b74eb2a24ceca2498b138cc25404e96a1efa1a4eb5d41d4c701aa2a2f64dfc53d9a0011887735cb2098164303e
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.67.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.67.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.67.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 +}