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, 27 Jan 2022 15:06:24
Message-Id: 1643295970.1e2737e65698fea1560e202c06b261b131d2a3ed.mgorny@gentoo
1 commit: 1e2737e65698fea1560e202c06b261b131d2a3ed
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 27 15:05:29 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 27 15:06:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e2737e6
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.94
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.94.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 f3986bae4ba6..dd8807ea0d73 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -1,5 +1,7 @@
21 DIST genpatches-5.10-100.base.tar.xz 2822696 BLAKE2B 8958af480d9babf927d8b1ac5ff0198549b6052b1c2b4cfad900c63e50b8ac7c396b3a8d3cec59406192f578eb871ba580b14398a5b6ad4ccb9d2f379d181b8a SHA512 27fed61b21ebf39e7c16d2d0a447160d0abf0ac50fbfcb924f1adb38a51d6683f70f911d3f8e62c084d2555ea14dedf8335f25ac9140066f88812c47d5f9b0ab
22 DIST genpatches-5.10-100.extras.tar.xz 3852 BLAKE2B 7ac718b6080adb6a641ef7b976185b09ddf7f225fcaede25afbf6a15bf855eb6dbbe44416fcddf1ea466c36433e04736c68f032a1c79bde858434427c6658a1b SHA512 558c9fc3279d7fb507ac8251369966dd40282776890da045d96eab328fd7300a93dab12afbfabc3dd52f61d49c0020b87cd4087d4c8f840f3443ed8ffe89c81d
23 +DIST genpatches-5.10-101.base.tar.xz 2955936 BLAKE2B 3370c569b41cace5d3a2712ade28dfe0abb2be3e4a5578356a6c53dc241a38eaf402900a1c1c1598dbad32f304244a286b538f98318f4cf6e66c18b74ec5bb7e SHA512 901de3d038a85c673a1645e5e58ab5ac195cfb1b449dbf424410db22e5855dadcb75f70b406bfee37220652f300db3a8588d093db9da3d011e2d5f100486d184
24 +DIST genpatches-5.10-101.extras.tar.xz 3852 BLAKE2B dbf3e7e310992dbaf119a9f9e0784e63bc9a37588ffda6f532fb70c798ab50ca97e5083d3e63451d33d67ff46229b7c67ee0e92fc1d72d96f4a64cb605a232fc SHA512 31ca45cb7b38203f39e1b10d5e23835e226b3adcfe83fef0d9a6cf9d7fce88c1249f25aa19188d39042e44d733ab4a6cfab1ac37b5f945488e81e157a1b9cd8c
25 DIST genpatches-5.15-18.base.tar.xz 697228 BLAKE2B 01a377a9c1f2709ad2cde18e3094d37ba2414c7c3d949f236d41f5d36e8c4513331c4859740ec34bc8418d6fb2457fbb7d9f7c64f6f596795e1abc9a02c9e340 SHA512 14a652cf64e8e22539a61f14af715fd1a59644875a8a61473b5eb66bcc7b5f4bb34602463b208114bb4dbb73f159932983d48c0567a44b5090b9ff8f52920eaf
26 DIST genpatches-5.15-18.extras.tar.xz 3852 BLAKE2B d3521142bf5ece893429ec7e1b6aec724fff15fbba2f80e9fb092af4d40bc258e034226989d2502ee258faa0c7e0aacd885499d22f4317060d61cd916e00e7fa SHA512 f1a98d3875541ec4b8f3461c1af8a9b37fd4f5a64e7d717e906f851bf4e976e4509df4b8cb67b9e210215cc33924d039599cecc8f4892dcbed510e00f8119df8
27 DIST genpatches-5.15-19.base.tar.xz 925776 BLAKE2B 040a1cabc9217a91e8bae89ef7878e61056f3eccc97472a27dd2b3c695b2bce59c487ff303048d1f98553349c0b6227d0a3dfa837ccfd6cfd7b1147606b4703f SHA512 b2facd0ba66001ce9327ef2d037097e78e4b9c8e02eb5b66f9ab9bacc6af5800ccfe576ca4383c263c597a67e92b96bb0287140396a602f15fbec403a4173a53
28 @@ -10,6 +12,10 @@ DIST gentoo-kernel-5.10.93-1.amd64.xpak 65587762 BLAKE2B bd99d1842a244a3424b8351
29 DIST gentoo-kernel-5.10.93-1.arm64.xpak 60910039 BLAKE2B 362765c54257379558cfdae5ed7603646e693c239147ac33f4994da8cbd3e0525fb4f859838ba60dd55eb7df4ba6cf2f8d7d660e6acdc995d9983bb9725c298a SHA512 39a7f6e4b9fbbe8188c8dbfbfd7d141e0d87eba038c9766874cfe37c202d87fcbfe7c44aea1c7edf100852c4859d1c9891ed1018ec8bcd8e45ced8c5b2032e7c
30 DIST gentoo-kernel-5.10.93-1.ppc64le.xpak 55673233 BLAKE2B 1058a631e87d651ff9f3514595e93af6b796819d508730c6357ce7db701c1dcc9a27f05a6179183cd1679e71ca7eaac4bc335e40869efbd8dab2f94cf5ddfc12 SHA512 0653cb1877b7f1988964c310703462dc010213a1d63641f6c9ea7dc7e3eeb3686baff88f765ee431bb4d6865b12fed92fae26cda46b5c61ec9a100750a57a7b8
31 DIST gentoo-kernel-5.10.93-1.x86.xpak 57270486 BLAKE2B f32d127cf227aeecaed0207111a6f7049e37144aaaaf352d64b19e7b4ac6a2dc7cb598823017952b2fc85086b3a413e7cb6455b742d6c7b1ca46c7f081a7649c SHA512 3cc007cda8bba74369ed11f5d8ab9a97bbc5d8d575efaf6f9b4d1d03b6aa187e80e9c74277b54be99ccc4c7d2b325f38718dbc142c480d92367b9d63e655855b
32 +DIST gentoo-kernel-5.10.94-1.amd64.xpak 65625902 BLAKE2B 73053b4da769a768cb589e50437dc0a73d3a78fe375c47bd44507ddc17058f1bc7d8ae70238bfdbda69ba583aa4b835e0518f437ea68ec2b35aa04766d8592de SHA512 0ecfd84a7be9dd8af5103ca4854ce993e7e4b21502938a1b79e5b1215f6f4a279f6bc31592755691ac652a1bd12aa209434e26b4b63e503027e2eba536616bf0
33 +DIST gentoo-kernel-5.10.94-1.arm64.xpak 60935202 BLAKE2B 39bb07264772f1957e46fc7040893e40fd05b471ebd849f84ea430bc9a3a76aeb886024877889b2a8cf537c16e03e9e36eeb44131e35729a5a22da28bc6f24cd SHA512 6d81502f8961dd64f6001c1f81e6a233ad4839b14c67d822b5b3e0965a856c771ef4d5e1dabb1b279deebdf0049e16cc850e58a1b813471410cde2527992d264
34 +DIST gentoo-kernel-5.10.94-1.ppc64le.xpak 55686563 BLAKE2B e6a5a588ddb205248a0bd2f8c5d1a27a523f11909c580a83efc63bf00a8d482add9b49fa7f14520e95e7183531e9d233ff8c06c9d08b2eaaf41cbb727d5a5196 SHA512 a316eaec3f88f4dbfcb8d4ba1e8333a361a07c9fdadde1f6f2532f2213ceff0ca1dd1e08498db85ff15c474d901fdb0a7afaada91ce6952c942e2bfe6c5e096b
35 +DIST gentoo-kernel-5.10.94-1.x86.xpak 57279632 BLAKE2B 3d2d14ec811893237b938e937055ddc234043d8137e9f2a97567749c3ab6cd9af8b3dc6d7fc708401d33181d1f9e6e566f978b27594dadad7b5fd6d4e9113db5 SHA512 e46025f507d9b25c6e5cf34c731fa94957553652db6ea23ebff4ce6e6105e8345a9753ff20e1a23257a3b7dacaff4c9ef9c0dde4b1af99269130dde83c17cb61
36 DIST gentoo-kernel-5.15.16-1.amd64.xpak 69106038 BLAKE2B 78623923862279db4eaf1561fac7caf5e880a7a76a7abd636b25143f79ab0a1a84efa41bcddd0b85d080be4537d7dbbf7c7e7cee761b25836adbcba90a18846c SHA512 3251b45a41c696c047414d7eef2a3cb694d79b5de677b273ef32e45d785cb64b31a2418a621f1f2c306a9c7df5dab9278323671a6ec454085d1b63fc5cab0136
37 DIST gentoo-kernel-5.15.16-1.arm64.xpak 64049610 BLAKE2B 0d1ca4fc9a688627ccfcba8c5df1834e3788c321a46d9beb8e03521f786a2b5d8d9c5a5d53b45cae81b50f12d33cfff023ac1dbbbd0267d67ab0cd0cb37c925d SHA512 ce6b3741a01df1fd724d92a1543f71a09564230ada4b552bb05eb7480123db4406e25898566080ce81122fb64e94cf04fd161f1d04788b73a641cb213cf677c7
38 DIST gentoo-kernel-5.15.16-1.ppc64le.xpak 57775378 BLAKE2B 54cd093059112ef1f92eb813be1717757fc398e6c5e8b5b1e961c43c4f585aa385eddd339c73dea161b623194e66df915d580576cfb52199356c18db7245bebb SHA512 ecf60dd546c5a1a63b2dc66f4e368a7a5797b193f382024c372af0a53fc6d1dce33e9e79023bc593fdfb9d0ecadf1e48765852b790024f3b0ac01e696d8bbdf3
39
40 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.94.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.94.ebuild
41 new file mode 100644
42 index 000000000000..75080d99ff99
43 --- /dev/null
44 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.94.ebuild
45 @@ -0,0 +1,131 @@
46 +# Copyright 2020-2022 Gentoo Authors
47 +# Distributed under the terms of the GNU General Public License v2
48 +
49 +EAPI=7
50 +
51 +inherit kernel-install toolchain-funcs
52 +
53 +MY_P=linux-${PV%.*}
54 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
55 +BINPKG=${P/-bin/}-1
56 +
57 +DESCRIPTION="Pre-built Linux kernel with genpatches"
58 +HOMEPAGE="https://www.kernel.org/"
59 +SRC_URI+="
60 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
61 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
62 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
63 + amd64? (
64 + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
65 + -> ${BINPKG}.amd64.xpak
66 + )
67 + arm64? (
68 + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
69 + -> ${BINPKG}.arm64.xpak
70 + )
71 + ppc64? (
72 + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
73 + -> ${BINPKG}.ppc64le.xpak
74 + )
75 + x86? (
76 + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
77 + -> ${BINPKG}.x86.xpak
78 + )"
79 +S=${WORKDIR}
80 +
81 +LICENSE="GPL-2"
82 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
83 +
84 +RDEPEND="
85 + !sys-kernel/gentoo-kernel:${SLOT}"
86 +PDEPEND="
87 + >=virtual/dist-kernel-${PV}"
88 +BDEPEND="
89 + sys-devel/bc
90 + sys-devel/flex
91 + virtual/libelf
92 + virtual/yacc"
93 +
94 +QA_PREBUILT='*'
95 +
96 +KV_LOCALVERSION='-gentoo-dist'
97 +KPV=${PV}${KV_LOCALVERSION}
98 +
99 +src_unpack() {
100 + default
101 + # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
102 + ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
103 + tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
104 + eend ${?} || die "Unpacking ${BINPKG} failed"
105 +}
106 +
107 +src_prepare() {
108 + local PATCHES=(
109 + # meh, genpatches have no directory
110 + "${WORKDIR}"/*.patch
111 + )
112 + cd "${MY_P}" || die
113 + default
114 +}
115 +
116 +src_configure() {
117 + # force ld.bfd if we can find it easily
118 + local LD="$(tc-getLD)"
119 + if type -P "${LD}.bfd" &>/dev/null; then
120 + LD+=.bfd
121 + fi
122 +
123 + tc-export_build_env
124 + local makeargs=(
125 + V=1
126 +
127 + HOSTCC="$(tc-getBUILD_CC)"
128 + HOSTCXX="$(tc-getBUILD_CXX)"
129 + HOSTCFLAGS="${BUILD_CFLAGS}"
130 + HOSTLDFLAGS="${BUILD_LDFLAGS}"
131 +
132 + CROSS_COMPILE=${CHOST}-
133 + AS="$(tc-getAS)"
134 + CC="$(tc-getCC)"
135 + LD="${LD}"
136 + AR="$(tc-getAR)"
137 + NM="$(tc-getNM)"
138 + STRIP=":"
139 + OBJCOPY="$(tc-getOBJCOPY)"
140 + OBJDUMP="$(tc-getOBJDUMP)"
141 +
142 + # we need to pass it to override colliding Gentoo envvar
143 + ARCH=$(tc-arch-kernel)
144 +
145 + O="${WORKDIR}"/modprep
146 + )
147 +
148 + mkdir modprep || die
149 + cp "usr/src/linux-${KPV}/.config" modprep/ || die
150 + emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
151 +}
152 +
153 +src_test() {
154 + kernel-install_test "${KPV}" \
155 + "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
156 + "lib/modules/${KPV}"
157 +}
158 +
159 +src_install() {
160 + mv lib usr "${ED}"/ || die
161 +
162 + # FIXME: requires proper mount-boot
163 + if [[ -d boot/dtbs ]]; then
164 + mv boot "${ED}"/ || die
165 + fi
166 +
167 + # strip out-of-source build stuffs from modprep
168 + # and then copy built files
169 + find modprep -type f '(' \
170 + -name Makefile -o \
171 + -name '*.[ao]' -o \
172 + '(' -name '.*' -a -not -name '.config' ')' \
173 + ')' -delete || die
174 + rm modprep/source || die
175 + cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
176 +}