commit:     0a30be045a4ffb39faf8b57f4763889bc2cd8f08
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 22:17:02 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 22:17:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a30be04

sys-kernel/gentoo-kernel-bin: Bump to 5.15.21

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   3 +
 .../gentoo-kernel-bin-5.15.21.ebuild               | 119 +++++++++++++++++++++
 2 files changed, 122 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index e507c5d8148a..26c77f03ff2c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-21.base.tar.xz 979868 BLAKE2B 
217af3325d15020a43cc661746272
 DIST genpatches-5.15-21.extras.tar.xz 3876 BLAKE2B 
4c07b166a474bc11502de000f1bb00d8f0c25914a7877b2a94db844c694e0e7a4c757e8a10880eff40438b97214326ba50e716070d79ce1ef7f68c65d876da39
 SHA512 
384a2111655d8fd78a2f6165e99be0c74b36cf90333a465a4bb4cb6cda5ba32e1d435958987094a2d1407f02df7331ff2bd4fccace4f0a6ebe0c300692598f41
 DIST genpatches-5.15-22.base.tar.xz 986832 BLAKE2B 
48fcd267e6e28850d226693b902fd66696024e75db6a75bb78ec79c7ac8afdac62643c4113ff205c301024d245f075716e0bf8083f97917dcfc8b1fcd71b674e
 SHA512 
e8c64bd91caedc3dcd98301dbcbd2003b4aceb5a9713bd908a69448eaa2aea945fa8162e57442862b03daa0e1a4e7642e4504701b1f34a6edb127692e582e0e0
 DIST genpatches-5.15-22.extras.tar.xz 3876 BLAKE2B 
95daac6c95b82d628c0551b4e18e7c3ad9a5722b5ab8f087889b15bdeea8c6f5e232ee8b365bfb4a7c6730207d4735a0fb648b389626f35cda2593caa83ff3e2
 SHA512 
0616c4a976d22a5491039a6bc3babdd7e9095a2c53e2a1530d1ecfcf50a2dbfca637c1b6771078efc92e3371ac15f332f85f653d267ea8e6262ffd305be2723a
+DIST genpatches-5.15-23.base.tar.xz 986960 BLAKE2B 
8c64fb7038c358c4249af8d9274bf406249246ad0315d87266b6f22435e24105269797815679f863a4827aaed70e42471f2c4b82420d8f7021eb35c13a2f7f64
 SHA512 
0ad59d266c94ebc7614f2b8308d2a81c260677f7667de1bab58d5d2bc41a55bce7550e2f109bc7fe69303eeac2d58fe84ffd03c5d389433942928b786208a79c
+DIST genpatches-5.15-23.extras.tar.xz 3876 BLAKE2B 
d41bee55c7c742a138bacfb45459f6449a80521b6857fdc55f675cf2434102176c493b9239ba73ab2d07df3062d995f9cfa76a168ad4913e5623453496519464
 SHA512 
3171e72c60211f2c331959851d85954ad94c947884408934375a4b495fe82c35f66c7408e6b3edff18ceb6888819c9f64b13a8b7c9433c80c802cf0316bf222e
 DIST genpatches-5.16-6.base.tar.xz 410464 BLAKE2B 
19e5c3718dc8bd9b10f42b4448da16717f95da8a5ca33145bec2703c850ecfe4978144530823319bce945287642a44d368eef24448b45b12d28f5fe450325e99
 SHA512 
80c38fece09b566dbb65b02beeba3b895c41f18fec08ab9b09a6200450a88be8fb10c04dd80c88dadb13e3aff56f2e5983063cd2d852d9f1fd7ed92113e74887
 DIST genpatches-5.16-6.extras.tar.xz 3800 BLAKE2B 
43e9801bfd91b817bc56eeeecf9a86c77ef00c3899a13d78b022dc119c4130d2635fb801b1e638877b68bb17c2ce57edea5d14f8a93acc165c715dc0f5615173
 SHA512 
cb4570ee5ff2dee8a8e992c7f9d173e4b4c7a680cc8225a53ed9e16887d7ceee3ca7a461aed80bbdbd90dc236b26b1094ee6be207afe1bd15117dbb4025b9c9f
 DIST genpatches-5.16-7.base.tar.xz 421780 BLAKE2B 
a4d43c5c598c6c263330acf21502866f0d6698e409b51f48c1690e98204e786d4ca8cca252dded8ea276124e9ee0598e912d42cc458ddf096239f3b97cbf392f
 SHA512 
e76e4ffe549b2533f8c1674963a6fe22f70ef169f46ec13681efe896f1141b6a0341f942856a6ba934e2749589fa68512870e727e2fd411b7d2f5e4cb9b86594
@@ -32,6 +34,7 @@ DIST gentoo-kernel-5.15.20-1.amd64.xpak 69164075 BLAKE2B 
81adfaaa8ac7f61c7ae3225
 DIST gentoo-kernel-5.15.20-1.arm64.xpak 64077658 BLAKE2B 
176f5c7f076b8f54f9870bf34b488afcc7f37454f5c2677297f56511c819b810a60f40b15e678df9a736ccf28e8bfccf4370c8899079da34d537d29ed03e77e9
 SHA512 
e01fa47311154d25f2ec82afb78d6287caa0dfe95624c4a1523f06166e8ffd8d71933ed6f6a4a1148afaae9ea3f6ad5559977f283058d05cf1dd49edf31f8d6a
 DIST gentoo-kernel-5.15.20-1.ppc64le.xpak 57875770 BLAKE2B 
9ac3a88f8200154bf5c8bc10b44dd02d1264397ae4d7c648ad518c4d9af70654336427c1d4e7b6c44d66200106ab1030a8d4f58ef09ed04ce0ef98ca1885be20
 SHA512 
9cf231b6005a399d776dec5b1c22fa8fb7914d7631f8cfc70bcac24d8a91cc1b54b28a05c7b2fa3544a9b123497a8ba709f6def358059b3bd68b19bf511622d6
 DIST gentoo-kernel-5.15.20-1.x86.xpak 59968495 BLAKE2B 
5031de50f6b2f57235b3dcfe58c2ed2ad07fe281541c8004f881daf313303cb32d3ebe67e3d7393837549dfca9d0c954edb2feb0110a487d1e423b1081509489
 SHA512 
1a11c79c27cd89a003f3d2c330b17d8b153b459158bddb2f08277472ae6fbbe13b1fc3aaf46df3a96ecc382baf987783874e8299117c3e3f6457f3357acc82d2
+DIST gentoo-kernel-5.15.21-1.arm64.xpak 64067891 BLAKE2B 
5c009c0a55c97d7c67e60b9081f8fc558a6df7c862b6ae1d250161e0525d88f7278b9e5a67ac795126409fcea58c5b0eabfef2caa08adca62f7d886f8787fb48
 SHA512 
3734b2715e25e1977e747fc77cc2ebc4cda668dd7b6f1b34933b51846a50a96a83012dc71306bf26bb1ba211b4f18a08b88880aad7ce16775ba2b5ceb2e3b01a
 DIST gentoo-kernel-5.16.5-1.amd64.xpak 69620204 BLAKE2B 
3a97499960be60fba4927ee160ef508363cd8efebddb0b6a4f7fae1f865d47ea7f5167ac862c4e2a7d1b2117412ec0c5914b19216e933ed2a72e24240289dece
 SHA512 
19d15ed4e39ca8d0ece619712774460b62db6f286222fde4e0b99dd73ec2a65acb9e5454d4ea4a99ed22f22ecfd437d00a66e78e561e91bc87e4b207cba94519
 DIST gentoo-kernel-5.16.5-1.arm64.xpak 65025315 BLAKE2B 
17e0ab2a7047e968b06fb254926d55c7f52a019773393504e64d993a30804d918153eaa448aa60799a7fa667ac2dff493b5737f0be5b4ef703326fc2caf3916a
 SHA512 
332fa02243573285c70644158b2fa44dd787bdaf445883107782cf17f30a72636c7039a8e96f6237ea7fde0a64e496d681ecba7fdea6c281ba1f9ecfabefec01
 DIST gentoo-kernel-5.16.5-1.ppc64le.xpak 58365242 BLAKE2B 
764b8fe708d33fb4680c7159b3a0963da59942b2ab94a01ab566cf429b887f087c76cb2fd7421ab7d6f94c0e93f63047d28c2b76014feb549ae9cc00f3c2f3ca
 SHA512 
ae57f6a0470a7b89defed02307e68169c01f493ef230283619e9a0795b0788b4faa776880905e5880d967e3b78ea0a6d97947be485a1d53c573e5b9250649a50

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.21.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.21.ebuild
new file mode 100644
index 000000000000..7a90cb8c3a7f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.21.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       arm64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.arm64.xpak
+       )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+BDEPEND="
+       sys-devel/bc
+       sys-devel/flex
+       virtual/libelf
+       virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+       default
+       # ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce 
ppc64be binpkg.
+       ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+       tar -x < <(xz -c -d --single-stream 
"${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+       eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       cd "${MY_P}" || die
+       default
+}
+
+src_configure() {
+       # force ld.bfd if we can find it easily
+       local LD="$(tc-getLD)"
+       if type -P "${LD}.bfd" &>/dev/null; then
+               LD+=.bfd
+       fi
+
+       tc-export_build_env
+       local makeargs=(
+               V=1
+
+               HOSTCC="$(tc-getBUILD_CC)"
+               HOSTCXX="$(tc-getBUILD_CXX)"
+               HOSTCFLAGS="${BUILD_CFLAGS}"
+               HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+               CROSS_COMPILE=${CHOST}-
+               AS="$(tc-getAS)"
+               CC="$(tc-getCC)"
+               LD="${LD}"
+               AR="$(tc-getAR)"
+               NM="$(tc-getNM)"
+               STRIP=":"
+               OBJCOPY="$(tc-getOBJCOPY)"
+               OBJDUMP="$(tc-getOBJDUMP)"
+
+               # we need to pass it to override colliding Gentoo envvar
+               ARCH=$(tc-arch-kernel)
+
+               O="${WORKDIR}"/modprep
+       )
+
+       mkdir modprep || die
+       cp "usr/src/linux-${KPV}/.config" modprep/ || die
+       emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+       kernel-install_test "${KPV}" \
+               "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" 
\
+               "lib/modules/${KPV}"
+}
+
+src_install() {
+       mv lib usr "${ED}"/ || die
+
+       # FIXME: requires proper mount-boot
+       if [[ -d boot/dtbs ]]; then
+               mv boot "${ED}"/ || die
+       fi
+
+       # strip out-of-source build stuffs from modprep
+       # and then copy built files
+       find modprep -type f '(' \
+                       -name Makefile -o \
+                       -name '*.[ao]' -o \
+                       '(' -name '.*' -a -not -name '.config' ')' \
+               ')' -delete || die
+       rm modprep/source || die
+       cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}

Reply via email to