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: Wed, 31 Aug 2022 20:47:48
Message-Id: 1661978859.1aae3ca90060ffe559de6e628335de2dd42dbfa0.mgorny@gentoo
1 commit: 1aae3ca90060ffe559de6e628335de2dd42dbfa0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 31 20:47:03 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 20:47:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aae3ca9
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.19.6
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.19.6.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 d92508632430..14e156700611 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -10,6 +10,8 @@ DIST genpatches-5.18-23.base.tar.xz 1206204 BLAKE2B 12a7b9aa7d72f27e64c4cb8f5607
21 DIST genpatches-5.18-23.extras.tar.xz 3924 BLAKE2B fad401fd783c72bd695425a106813ce8396c6d15154fc627fb456b16f6ddff1f6326f54e1399c1369b6da5e3f57da89bc9e769bcbb5d4b612465fe187145ea17 SHA512 c25a09e1e2ad091e5f8480419e921e8eede512dcc6aeb46792a92844948eea5890c5ae8d164ae9834356e00216d3978cefe5f07b046cbaa30dfd4af73a1ddaa3
22 DIST genpatches-5.19-6.base.tar.xz 595780 BLAKE2B 87db7f493d421ed3f0991278f16aeb984485ef5f5ef390d18cc37b27e2dec27704c1575e5ef0a475da6a5e87d68a119899d4a827c81a368c255d45887ea8a681 SHA512 2af94e970216f5297ad791496d6245fab8a0c037d5dd57161f2428dcc9c742414f0073c35be515bf6714a4962f7cc13a023e590e15902c6d68921e93a8bfeec3
23 DIST genpatches-5.19-6.extras.tar.xz 3772 BLAKE2B 48f01ce8b863f73dd12e06d51e9716e6b5ca6694ed0612aabfd51e6a05a4289cdccddc6061c84a5c0c32878f6b030343e31bc29dc77161226b70d1b09448337b SHA512 550123defebfd2a2d0651840cdf6ce5b47f7b79c874fd97c766e758c72f7412053f682f1d3187788ed15a59b73e09356937329d1ca49b90fa0565cf25dec44d2
24 +DIST genpatches-5.19-8.base.tar.xz 643396 BLAKE2B c383c7efc908fa3e8ebdfb750d92df6adfa1e0d00f253eae40fb5db5b84f8848a5c1a4fdcda693da998b1ba9d1afb1019cbc2574ceff2b099d2125ead515efc3 SHA512 ebd5eaaefbd362d85fa8cb95b0ca4192bf7a0835ec58ea25def13e502f87f74bcc29219083f39b85462b262f526f771270b5a8d93ff49126e1653d948a9ccb9d
25 +DIST genpatches-5.19-8.extras.tar.xz 3808 BLAKE2B 8cad0dd5deaca8f8b379c96cfad02add0cfe7498f17e84d11e6b809e366ae0476734bd003b287456459febe2ff4c1fa7b3e54c47243cd571a34ffb1cd927a1ea SHA512 a183d09ba7b1fc3f89b7754709df8d093ba70b09f71e237844214d65bc5821b6328c436c7ef697c30bfd38fc833bd178497190a2e73914a03ec0dfa4cbcdf7f2
26 DIST genpatches-5.4-216.base.tar.xz 5015752 BLAKE2B fd736588b9cbf9ba0a48ad838a17eda669e56d9d0ec4dd903f5bcd31ffa2c428d14ebc7bc35a709b3da7bf7f22403c5b01a9314dda60ef955d7674af836e2481 SHA512 62cd9deb29f863babbc9dc5116e5c5bcb34c0f29325276da80fc9b040004ba9fcfcde380779bf8ea8039f3098da88c59e7fdcd2d0f6d6aa5034df59ac9b55914
27 DIST genpatches-5.4-216.extras.tar.xz 1812 BLAKE2B 7dfc1025fc395883debc819c3fd5840c423d8b3f1973104906545086d35a966551fec967da9ec976257e231c4270c7b091e7641353f89c254c974b848607e5fa SHA512 aaa70a72cfe0989f5ebf2e3f57cf55c6faec4e2c605fef7ecfd425c47574765fc0a2ad5a7b9fcfe33dd70060b52d4dcd44d2849fa0fe203612c0ebacd2b171a6
28 DIST gentoo-kernel-5.10.138-1.amd64.xpak 67522997 BLAKE2B 16679700f076e28ace346487f411c653cab4e11b391a32982b8165239121430335acfeb089f40a16261999ab36147fe259025edd063935ae9c036d38130e705a SHA512 3f967bbb188cb178301d22573e73a9791d569caf5f5452a518ab639d83dca5e8992eabf2756513aa92075b70992c7de92b0de773dc674f26387b57160d386b38
29 @@ -36,6 +38,10 @@ DIST gentoo-kernel-5.19.4-1.amd64.xpak 73516311 BLAKE2B 017eceba7a60d16384360b2d
30 DIST gentoo-kernel-5.19.4-1.arm64.xpak 66395062 BLAKE2B 581297d47a4af5c43cd78b073fbf98959033acd61092e958f59524d710f0d2ed151e847770bbad304ab7d3014604816676a4bf9235eeb690c102c4f8fd38b120 SHA512 37c407d0a98469d59809788dc0bdaa27748b8b836b8c3c3c77d94de360e7f77fdd5a41635e16e70d78c3a70844bcac5c322e64b6639813b5ffbda1dbb5089d47
31 DIST gentoo-kernel-5.19.4-1.ppc64le.xpak 59977405 BLAKE2B 20fbb9645168fdb888ba68e760c01e45e1d9cc0d2f563c22135fc9d7715107ccc9cb82649593d4242a399ab330c40894f58b7f79509b8af28ea67801038e5b8c SHA512 14a9f69f5c0ef1ed6d658e4a28ce937e5941c0268cde4c92a67ec1d7e36ee6789e33794a5190ef6ac27148da5efad88253ef93045d5524defa43255095a0c698
32 DIST gentoo-kernel-5.19.4-1.x86.xpak 63382575 BLAKE2B e3d24f2576b1015e574ecdacc8f921ad811dd090cf8fe19c7b2b8c6ad217d2fea3c43e052d76316cf713d6b84c6dbc7e6b45f5c72f4da521809ec58a5b0691c9 SHA512 cd8f1731b4dd2d7ac19bc4b5df5ef813ca384b20c6d49719f8423bb3a45f621df779ea25206084d4b8c528b467b4f7ae0afa9c0d42a7e77a616a363eb4b2daba
33 +DIST gentoo-kernel-5.19.6-1.amd64.xpak 73549646 BLAKE2B b41eb12cbf86bb8f015411ae4a00a7a077e77ceb257671db891e3abb409dca86e2481840581435fc5c4df05f336b2e2a6b237de985ff295ce903ffba3d30f001 SHA512 55dd49b39c4c37536cd4d084b6eaaffb4f2138e7837a2f08b68eb2179043154099ea7e1b29f2d98719c2202304e04f8b8ad3440d31c0083f31763164feca6b82
34 +DIST gentoo-kernel-5.19.6-1.arm64.xpak 66387997 BLAKE2B b46d2cb7e17f50919f1b27d938ce6dd841217bb1aafd6af59a289bd89f70ea1c2145dfa07aefc71a4ac18ab3e0ff863d48b457d388ecb292cf8d8b97aedbd7a1 SHA512 731c953d6ee1112392c2cfb4ebf968f4cc71e7beb5bc986f9934d2a37a8011fbfda327a4dfc29c3f075ca60f1142ecdeb0f780b144d525ac434340b469d5c142
35 +DIST gentoo-kernel-5.19.6-1.ppc64le.xpak 60014130 BLAKE2B 1fa35be11714caae645b0d0de4d708cf82ac5fc0372adb8331b7f8c036f220662dcb892e69a346f24ce86ab40ef703d691c59511d303319f448a357a9b9d91e7 SHA512 8c28ee3dea8343821241627d405342c2ff24a4b74eb2a24ceca2498b138cc25404e96a1efa1a4eb5d41d4c701aa2a2f64dfc53d9a0011887735cb2098164303e
36 +DIST gentoo-kernel-5.19.6-1.x86.xpak 63409571 BLAKE2B 57a7a458311a6753beaf2d6ab8fefbc6d2ffd5b411fff96f09deb5620b2767a037d24c152d452b5242011278e5c45c102e3f4443baa70f77f30c37d46247c3bd SHA512 eb6f036e1286729d7ac61b4034fd0639e560894e3e10b8937272270cae07a25d4e7d1b6c19917408a47097ff3e4a493a34f7b51a64c72356c284fdb2a6396715
37 DIST gentoo-kernel-5.4.211-1.amd64.xpak 61552101 BLAKE2B 155a613cd985a819a8c62ed82a882b6da8a2ea4a4e728533d2eb499bcd0abf4202a8f2d2b0337c3bc0e7e082ed6e6a4ea7f8b394b50fd7b37e493bf53171664d SHA512 40d913186bcb8829f55bf9899641a4064932144cc16595adeaa2262b35014996c1dd0d95a54d8e6968d83bf24558eeeed87f09b2b7b99c55a157d5f37e098d49
38 DIST gentoo-kernel-5.4.211-1.arm64.xpak 57941206 BLAKE2B 2ab52e0a114fa683d9ae6c0cac7d196e409cf00b61ccab1e7abf8ed0ff274d4514c03d0162bef4a79b1f9ceee5b51e647ded4be3d006f55111ba56020ade0f9c SHA512 d4c1439f8ed418aa4b073e9c9ae0d8b0972fd652244e489d6fa9b222b8736bd4ce110f0f7fa1182c3b658a07fcc1cfb5523b27dd13f3f7e7a33a164c5765118a
39 DIST gentoo-kernel-5.4.211-1.ppc64le.xpak 55270077 BLAKE2B b322db72bcb47b2a3095290e4be922b11723256150eb6882beb19a64b1b47a5fa8dd033da887964411f8e5481e573f7d00842a0bf959f455a6b36ef3f56610f9 SHA512 900ebac4442e3c92e09d33818d00e9869ebe821185a757f62a030eb3822190b91c2f1f672e66192635ae2bab18505ec5860f400db08c5f14c3d916f929a2de71
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.6.ebuild
42 new file mode 100644
43 index 000000000000..0432fc354ea2
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.6.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##*.} + 2 ))
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 +}