Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/
Date: Mon, 16 May 2022 19:57:13
Message-Id: 1652731009.2ae4731bc48830d0d0e11d4d6b4a85a2d01861d8.sam@gentoo
1 commit: 2ae4731bc48830d0d0e11d4d6b4a85a2d01861d8
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 16 19:52:55 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon May 16 19:56:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ae4731b
7
8 sys-kernel/gentoo-kernel-bin: Bump to 5.15.40
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-kernel/gentoo-kernel-bin/Manifest | 6 +
13 .../gentoo-kernel-bin-5.15.40.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 b96df016434c..f6ced8dd7cc6 100644
18 --- a/sys-kernel/gentoo-kernel-bin/Manifest
19 +++ b/sys-kernel/gentoo-kernel-bin/Manifest
20 @@ -8,6 +8,8 @@ DIST genpatches-5.15-41.base.tar.xz 1716640 BLAKE2B d2a37f5bdbb541bad670240ee6fb
21 DIST genpatches-5.15-41.extras.tar.xz 3868 BLAKE2B 11487f062c49431af029fadde1f01a95386d42e1349a658bca314bd26d356eb82d0292ca68ac34d4ba4593a25d7422458a7dcf306431dbe46e68c9306bd8ec82 SHA512 3153848739687683f02c65d1dc87b4aa27d0fead27ac9fee28acd2f8d0fdc118473445059bf756650512c5f3fa79b8a4a70882c2ab2d4329c4d7aef982e5e4d6
22 DIST genpatches-5.15-43.base.tar.xz 1785824 BLAKE2B 435e3a48c6d8b01d71f203e7373ca44b03794f7ec5dcb84cf919b0b0cea0fb06edadc4228b0c53cd71ec6b80f7a0b2040e60a3223dbad0d9fd444e4980528ad5 SHA512 b78e665d7e43f5de92f83e9d464da953aad3136dc35a63cbe1a5f098cc8133162cb5d47a7e9cd323d86f5835194c27daa48a648bef4e6fce29d706e5be33a0c8
23 DIST genpatches-5.15-43.extras.tar.xz 3932 BLAKE2B e6ad29d61c10175e8e31c91edbef3056922aeaa50583c64770fb1df714dd6764099b213a85c109d1057bec95aa5bd4485e8dcfce196ce7a6a0bbb682a7475965 SHA512 f85e4a409d4240bbb17ac3e3ca38afca1fa1a3ff8b31e9e2f7b4d5dfe6a255be38073f3e2dc02657bc309229281862d066851d4f57cf7213d8500c7efe64af8c
24 +DIST genpatches-5.15-44.base.tar.xz 1805920 BLAKE2B c29bc5dce61deb71cce45dce36ef12f72674b9d04af57fcaa0a78da936334709e84a0660ff9e80951bc73e22dd9a803e942ca88a0f72a38debbb64909fe9b126 SHA512 e71b0088ce398102baf6a80d41af8662e9c712ecb8eea67db1fc83cd75c82943ea444671b43482ba445e0b4aff3ef38ddac10d90fcb7f48f09ad7ae4806155de
25 +DIST genpatches-5.15-44.extras.tar.xz 3932 BLAKE2B 47d98e8b5fb0362cbb565cbde17c740c55909cef9958865593e312d47c52a7a21becda8bf7414482423732422118efaee87e741ccaa2f8b5231b111f5150a6fc SHA512 092e7143107fb37a83fb0658729c1ee5621a0c63d3e8a38325db598b65579d84089115f37e65d7fed45da3b3181b3edd32d5e1f01cc2e7835668251394b434bd
26 DIST genpatches-5.17-11.base.tar.xz 684208 BLAKE2B 1c1f7a450a1f30d18f8e3eb7cb2db8b170f503a1b17343b25130408725f08c6ce0db7fe91eddb1b8d562bee0b6e60360baca4429aa09ffc1e7257b531ea6ed4e SHA512 5e0f2c89b93bd492c49d36627e6c6ded98e49f210e4c4880f84717e4248b711b5bce3d0db04ae78a29a01a47b3a2ae3ae5949cc02d755a22d63e6b7117477398
27 DIST genpatches-5.17-11.extras.tar.xz 3932 BLAKE2B 8f65276ac101924b918379e84da046a8fc56ba293ebf5c9ace449917e58400ef8ed5cd947d9de558ed95735996eba42e01053c8e71f1a3782696e1ddccfe22fc SHA512 d7baa2bbcf982ede22dbc06dd1a452759c876357ee65750b21bf5a6b22939e5a924311c6e2315f222a65386ec028399d5c82eb0a1b8a215757bcaad1d83b001a
28 DIST genpatches-5.4-195.base.tar.xz 4639264 BLAKE2B 7a3558a8bb125d616bf10dc29045ce0e5b6432eaf4e38326727ee184ae38d90937fc0168bd2654a8c871b7a851a7977cb9ad1b6b258073b20988b51be189235d SHA512 7add11fe740fe7ebb785f6dd2548ce908a053e30fe5ae8eab3e2b95eb6c8da9f9c5dfaf3d2e50a0a319389631162018ea2675ff8770779e8be39bf10a8e21890
29 @@ -36,6 +38,10 @@ DIST gentoo-kernel-5.15.39-1.amd64.xpak 69282147 BLAKE2B 8381f051a8804ef57900303
30 DIST gentoo-kernel-5.15.39-1.arm64.xpak 64211676 BLAKE2B b23a661108767c8592988ef4575fbf02c4cc4b42d999c91de31c2651246599185ded9560242a8ca2d5dbe99d91323d6d3bbef1ce88a7b907ea664d87af9898fc SHA512 7405e20b84a3be16a4dd977b8aa86afd336534a88d2d1b41941bdc6863ca19a05038fa3a63b80c5e099fa7a2a08b02f28f537821289c3a18da23a21d4ffd1027
31 DIST gentoo-kernel-5.15.39-1.ppc64le.xpak 58016132 BLAKE2B 881f9ee8bc2c46bfed16afab4791943e3f8fe1a35f91a239c1c7fa7c169ac1901298540c775ab08dfefb438bebf566fdfdea29a3f96c599e33e449a0f8a48ad6 SHA512 c09daa6d80d7176bb7493a41ba38429ed5f4952a8214c760af7613eac95656e3308249eef7e03a2a3aa6b7021809e1b923c386a8c3c9969ec0f2edec3c59d30e
32 DIST gentoo-kernel-5.15.39-1.x86.xpak 60035980 BLAKE2B d6864179687623a55192e4c5fc0419da2c936bc8d66f69b0dce4909f8b06f70cdd12316ebb83fc4d4a805089cc6ac4918432464de1b1ce6d0d4276e22c059006 SHA512 efe793f9dcbc103d55fb9a8522da19be19a83251e0308e7f778423e896abc74da1e1062117dd90081c3f8182d00617844b85e04f34cfebe288760f583cce6ba8
33 +DIST gentoo-kernel-5.15.40-1.amd64.xpak 69390874 BLAKE2B ec6b75b21ee79280366a98993ed931a6a259e96a3f60a6d804b4d4fcc027ba0aaa9c1054878e406991a93e179d823401f7b7f342d70d083ae036cb021db3e687 SHA512 0e359f63ee00b70c80869c1de334c41345a63c8c5453f82d07c4a280f2990519324d6224b2514af3068fafc10a0ea9f304bba7a437fc8429fa165d0845d1f1a6
34 +DIST gentoo-kernel-5.15.40-1.arm64.xpak 64224144 BLAKE2B f2020257bc746880537d921cedd9c4c9cf29478190a83eae4d12cc862756aa16b1f7877929e562a05f5488efca1eecb802bcb64dacbb7e09f39476c572e0c6b5 SHA512 73c965aabcb539dc6fc831f70a375e11ab1f3cf8698464dcbf6b996979fc91ea95d93c615b56011c1d0a649669568d6841671088a8885cee859634164fb51cf6
35 +DIST gentoo-kernel-5.15.40-1.ppc64le.xpak 57942004 BLAKE2B 000009d26ce5c691d1db5ecb50012af25ec0871a3b19c6d8e26cd15b4c72cbec7172379951e5cdb06d617e8243cbc9bba26785a5816623a6a7e97144c02af427 SHA512 cd0e28edc2b9f195094b689463f405df3f2836976b70153c7dec8b322d268c062ca4d6ccc9b638099f61cb81b937301553ff2993b6b0a35cc08d67673dd6a1ad
36 +DIST gentoo-kernel-5.15.40-1.x86.xpak 60157131 BLAKE2B 6b6b330a55795f3f60242e6c0078ee0d9192374e2454c38d033257c687699928db6baab579e2c0315cdf4afb5616bb7f0a81d2832b7fe92f23976dffba84b487 SHA512 c5f74f67877698da30ed4a9ea2b6f19632f61c0d69906a553bef86199d8a17cac214276886a14424b85843322580dc889744bbf3cd3ad31d3fa1d405c322bbb0
37 DIST gentoo-kernel-5.17.7-1.amd64.xpak 70401580 BLAKE2B 5d0f987d09eca6443c6f61b2b13c13391bcaedff22c2ac9450f038d1006d17b2334947a5116417487c301dd74e1a79163cda35ecc1152b2dcd8338d394862ea2 SHA512 7f0ba74fb311946de5d2a0bc8a398e12e43de69000e7e1683c8215f2be6d13152c9793da6a12b8232ec8071b0003205ee54b89a091ac34a72297259aa0ce7995
38 DIST gentoo-kernel-5.17.7-1.arm64.xpak 65831397 BLAKE2B 9d243c0c8d3403c4e13fda747df7c73e1127a34090b11aa1d3a41459fea1cb1df4ec14f6e7a14a25aa6f13af4f1e93b816e5e62e4d54a21715940996e376c425 SHA512 ebb97a89d20d174f70498482c4fb362153bfe28369aa3acffb740d761e65ceae0d10b7c31ff0bae45334b855c18dab0d96412c183af5059635451afa97300a38
39 DIST gentoo-kernel-5.17.7-1.ppc64le.xpak 58829967 BLAKE2B 8594dac1da94ebd7e631597358e8537fd853452fa116557ad96f072b693c54c31b16277d7cdc91a456217079f26e64f2b02236f0aea5268fef9bff685d198c2a SHA512 7b5dc8bbcd57bcce88cce96373361cab614c40878cc708992b3ce08395ddc2d29e884992179c158b5523c1185177dbc01f86ed5f64d6da78d4c9ddac4e0b7dd3
40
41 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.40.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.40.ebuild
42 new file mode 100644
43 index 000000000000..cc187009eb97
44 --- /dev/null
45 +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.40.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/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
66 + -> ${BINPKG}.amd64.xpak
67 + )
68 + arm64? (
69 + https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
70 + -> ${BINPKG}.arm64.xpak
71 + )
72 + ppc64? (
73 + https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
74 + -> ${BINPKG}.ppc64le.xpak
75 + )
76 + x86? (
77 + https://dev.gentoo.org/~sam/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 +}