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: Tue, 01 Feb 2022 22:03:34
Message-Id: 1643753003.c18401a862ccd69ae886e892b475b034f8d42ac0.mgorny@gentoo
1 commit: c18401a862ccd69ae886e892b475b034f8d42ac0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 1 22:02:09 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 1 22:03:23 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c18401a8
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.10.96
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.96.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 5a7e41edc3cf..531e7e58c4e3 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-101.base.tar.xz 2955936 BLAKE2B 3370c569b41cace5d3a2712ade2
21 DIST genpatches-5.10-101.extras.tar.xz 3852 BLAKE2B dbf3e7e310992dbaf119a9f9e0784e63bc9a37588ffda6f532fb70c798ab50ca97e5083d3e63451d33d67ff46229b7c67ee0e92fc1d72d96f4a64cb605a232fc SHA512 31ca45cb7b38203f39e1b10d5e23835e226b3adcfe83fef0d9a6cf9d7fce88c1249f25aa19188d39042e44d733ab4a6cfab1ac37b5f945488e81e157a1b9cd8c
22 DIST genpatches-5.10-102.base.tar.xz 2961600 BLAKE2B cac29a452129492227feca71107c20eea35fc7712604c5d124c15e326c93cfba3105f1d5e08486e2b8f1934983ffe7a8a52e6b6994e101a55a5a1fca832c2fe3 SHA512 b40778eee0defffe381864edb70130a000a9380358f6061439e2e58f37ee798afacef9599d1454a519a29e72bbc1fbc8cdffc50454fb2ab3e12df4b36b45bc8a
23 DIST genpatches-5.10-102.extras.tar.xz 3852 BLAKE2B 771f6f91cc36f7c18ece75ea1b5f5bfd47a304ae60b6c1307164e5b96e3cc22eb987733368047d48193bac0b16ca7be9ddb092d8abbe1ea710614ff1bf31dfbe SHA512 8058f4cd33ab70adaebbf0ef6981950c35e7a3f2451c4e7f81ceda786838150d514661d3ac51764e48747e1db14d5d1c03de64798e2003c600dd28ad6a675e5e
24 +DIST genpatches-5.10-103.base.tar.xz 2987764 BLAKE2B fab174b3219d24b39f22dc92943af5cf9397b5c7920c082b295ae26fede80be5b6e77c0f3e9265d4f2b37932fa12d61ecf65511c2959874209e80fbf08af7c1b SHA512 1b68470e55e64c9461a2806580fd1732a1bc75d6ae061975d7b75e47acd487cdde0f045d8bd82012681eebc776d1422bfbf5352fba352668967bb5abfe14ae5b
25 +DIST genpatches-5.10-103.extras.tar.xz 3876 BLAKE2B 8f8a1ec8ccb9874660ab1a357a28bd48f622affd173c459e7014a737435c8ddaed5ea086adef4306298f3ff1779b497832804fc914c895d74b750e147d99969b SHA512 656cd727882aa8eb4b86690fbcb6c56a20de2aabd2d7de0e29ce2807b12e738a085537cd94cd37020b1d7c95469ac1566c4e2b7a3ec67ab7b88f8cf98de66a9f
26 DIST genpatches-5.15-18.base.tar.xz 697228 BLAKE2B 01a377a9c1f2709ad2cde18e3094d37ba2414c7c3d949f236d41f5d36e8c4513331c4859740ec34bc8418d6fb2457fbb7d9f7c64f6f596795e1abc9a02c9e340 SHA512 14a652cf64e8e22539a61f14af715fd1a59644875a8a61473b5eb66bcc7b5f4bb34602463b208114bb4dbb73f159932983d48c0567a44b5090b9ff8f52920eaf
27 DIST genpatches-5.15-18.extras.tar.xz 3852 BLAKE2B d3521142bf5ece893429ec7e1b6aec724fff15fbba2f80e9fb092af4d40bc258e034226989d2502ee258faa0c7e0aacd885499d22f4317060d61cd916e00e7fa SHA512 f1a98d3875541ec4b8f3461c1af8a9b37fd4f5a64e7d717e906f851bf4e976e4509df4b8cb67b9e210215cc33924d039599cecc8f4892dcbed510e00f8119df8
28 DIST genpatches-5.15-19.base.tar.xz 925776 BLAKE2B 040a1cabc9217a91e8bae89ef7878e61056f3eccc97472a27dd2b3c695b2bce59c487ff303048d1f98553349c0b6227d0a3dfa837ccfd6cfd7b1147606b4703f SHA512 b2facd0ba66001ce9327ef2d037097e78e4b9c8e02eb5b66f9ab9bacc6af5800ccfe576ca4383c263c597a67e92b96bb0287140396a602f15fbec403a4173a53
29 @@ -30,6 +32,10 @@ DIST gentoo-kernel-5.10.95-1.amd64.xpak 65650777 BLAKE2B 7196ce60d1d4f3a17721f96
30 DIST gentoo-kernel-5.10.95-1.arm64.xpak 60977898 BLAKE2B 8419461a8835770b257b7c7bde37bc1811ef65e4ab775544469c9202c5380cc451b680d25bec30633cfc53b0397a618143ac3af776609418b861ded4b1980148 SHA512 ab0779cafb11ec1fac832bdc68df6d472c24e5230e55b10f61aa42ee2a8e033cc6ffac88c6f01875548cc504b51ca8f146da6fc5841fd54c0fddf42cc79a1048
31 DIST gentoo-kernel-5.10.95-1.ppc64le.xpak 55800003 BLAKE2B 15d1cd5466c38111a096de0f218d66aeaabf5f27cdcaba09ee2d1ccc8fb8a531bba72929cb89bbffb2653d689501fb45d7caf4aecf2c88ec043658e0c4c69e9f SHA512 05aee25c61c0d986fd7aa8f557e56820a0548fcc458d0c5854d49be98196c58592d47d413aa51764e4606ece0255dbaec86aea689b547a4f408ba241c83fe5a0
32 DIST gentoo-kernel-5.10.95-1.x86.xpak 57285663 BLAKE2B 0d37e605a844435b114ec72e364d851342aeb0a1a6788d9dd51a676a33c365cbef913be19dca3c70979aaaa33fef4992176714053b623e58b91678b54a5479e1 SHA512 128f800655a8f1114f4aef4d2553c044c6957c289d960048325953c3a0b7dcefb2e3cd441bc76363f05b9605dfa65a40017cc416a2a4dcc3f19dc2468771f012
33 +DIST gentoo-kernel-5.10.96-1.amd64.xpak 65578388 BLAKE2B 611a4439152c65792311c622756d580437b1688941cce2a8fbf7fb06b04aff48d823307fcefe7511fb51912140bfcc7ffb35d919c205b14eb62e51ca7e713b33 SHA512 7e2a4fb13b0cac86fd12f2d53670f37356224d1953d1ad0aab85c84d5f8728c1ca285e0df6c4c2bc911b3b12f8cb08a130c387544f82430dfe9bc474770b251d
34 +DIST gentoo-kernel-5.10.96-1.arm64.xpak 60915455 BLAKE2B 536457d961ee6869fab37503691ddf94cbb0f07db981f6f93e19a02f74f6a07a11916efa0a6900cf575921f8d41fa4764ba6c0119f585a904b628f8d916d1b5f SHA512 0a6c4918e478a985299d4b9ad3e8ac7e97cb70ac9fe0860e21fd69f7617255fc4d4214cd3e2b1a4f8a8e93aaae4e814de9e9e8c4302cdacdd3159b370bbecac8
35 +DIST gentoo-kernel-5.10.96-1.ppc64le.xpak 55706221 BLAKE2B 4088b886b980d08cf5d3baae64bd066ff742227d7bc581838bea59af2c35afaa4372dcdaecabc98e697bea5e0e9710be8b457e7d9600254448745c1a93c0010c SHA512 e4987deffd43a78e8ae85b5940e81ebb980dcb552dd929c59a6d7590ba0da40501aaade88addd774a4e3c1b319dc9b466be996d07e487dc6e653304deaa46dc8
36 +DIST gentoo-kernel-5.10.96-1.x86.xpak 57272091 BLAKE2B 8351732d8e962d58ec37e1031e9de4b50164e6de9f9feb8c463600f11deadf47c574adf0caf53dad36f0fa7ad1c70a7393c42dd8265843a635dae6456f335e0d SHA512 3d417b6a7118fed2ad446bf1b8e1b938e8aa05ef116906c8e30c652a0eb98c0b6c4500b2a0ab3c0966b070b7e460ddba6779ad1aeba0b1e946652ee039a646aa
37 DIST gentoo-kernel-5.15.16-1.amd64.xpak 69106038 BLAKE2B 78623923862279db4eaf1561fac7caf5e880a7a76a7abd636b25143f79ab0a1a84efa41bcddd0b85d080be4537d7dbbf7c7e7cee761b25836adbcba90a18846c SHA512 3251b45a41c696c047414d7eef2a3cb694d79b5de677b273ef32e45d785cb64b31a2418a621f1f2c306a9c7df5dab9278323671a6ec454085d1b63fc5cab0136
38 DIST gentoo-kernel-5.15.16-1.arm64.xpak 64049610 BLAKE2B 0d1ca4fc9a688627ccfcba8c5df1834e3788c321a46d9beb8e03521f786a2b5d8d9c5a5d53b45cae81b50f12d33cfff023ac1dbbbd0267d67ab0cd0cb37c925d SHA512 ce6b3741a01df1fd724d92a1543f71a09564230ada4b552bb05eb7480123db4406e25898566080ce81122fb64e94cf04fd161f1d04788b73a641cb213cf677c7
39 DIST gentoo-kernel-5.15.16-1.ppc64le.xpak 57775378 BLAKE2B 54cd093059112ef1f92eb813be1717757fc398e6c5e8b5b1e961c43c4f585aa385eddd339c73dea161b623194e66df915d580576cfb52199356c18db7245bebb SHA512 ecf60dd546c5a1a63b2dc66f4e368a7a5797b193f382024c372af0a53fc6d1dce33e9e79023bc593fdfb9d0ecadf1e48765852b790024f3b0ac01e696d8bbdf3
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.96.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.96.ebuild
42 new file mode 100644
43 index 000000000000..75080d99ff99
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.96.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##*.} + 7 ))
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 +}