commit:     6647cf4fdb34a66a286462e1c720da44ec87aa87
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 20 09:01:05 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 09:08:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6647cf4f

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   4 +
 .../gentoo-kernel-bin-5.12.18.ebuild               | 117 +++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 927281ac7df..ff16a5404a3 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-5.12-19.base.tar.xz 744220 BLAKE2B 
63163732eeff70cf0eb344950247f
 DIST genpatches-5.12-19.extras.tar.xz 3420 BLAKE2B 
dd43bf044652067aec7069cc2e8c1b9441ac06750b64dfd355ad53221df08fb68981363b9749a6f93ebfe81e728ad8791f7a5ad2e9d4557da6d2a1904efc05cd
 SHA512 
501379a816043c5bc0c4724a999957d8c5b4cca214d12e2d64577ff24943230e6ae5e60512b634a5507ea5f8823e7511b20a5c099bab149309045e0fd17c4b24
 DIST genpatches-5.12-20.base.tar.xz 920044 BLAKE2B 
97f6f4af62985d17004816190f55919cd937e29e24c753c0c6d82ec6bacf89b4faf01585f941ae33c5b37d994888b7362d2ef22add518e4f6a2df3fe3b23953d
 SHA512 
6f5940eb48c8167c7492701968e72138ec8a35fcf889a45158321a4507c45c5a930b68b2156410fbd063155093767a239d4d9cb3711c81ef47a13313b327c07e
 DIST genpatches-5.12-20.extras.tar.xz 3420 BLAKE2B 
c161c55413cea9c5776773d0910219a801d21c6e16de8816bc909d120477e7d6ab0d40c8a4bcb7b09f2227dc70c8cffa86392147acec9e20d2bf0179231c0926
 SHA512 
143eb7972c11aa69d2a81421309ba84de370ae28511366dc8264c52a073a4069bbca19cceb6fc0bef9410441ced95d1984a18142df3207aa20ee783e40688801
+DIST genpatches-5.12-21.base.tar.xz 986736 BLAKE2B 
d03cf3e746227f1bc21cfb70cee055baaf9c39faea3f3b19086692e4828931675902028e5b5b080d5cbff6491870fd565589efb60b7cb62966cef67bfdce45ba
 SHA512 
691197403994e043b443875862986150ad0053aea69317ea7b1e3b9d476c7c26febdea4a7a5f778641470b05d25f1d447a705ea0c864e0b0c06f2a89d304cc05
+DIST genpatches-5.12-21.extras.tar.xz 3420 BLAKE2B 
6961616c9a05b2147cda9d86cd687fc2baf432ee405535b68d429b292f1d11868a99a212101598a18ddf51ff0b25307d3f74722f6952b0f1afd335c5704d0c7d
 SHA512 
ae3269dd4b8afaecb854c7cc6ba52c25425a7d6eab9deb5af80601e01f21040683e2dd1271d5b89294900e406edb566b6c9071ab77217d30662b59d73d6faf08
 DIST genpatches-5.4-132.base.tar.xz 3628504 BLAKE2B 
d3d99348c475bbeda9a1d0a7e3637ddc9c0896ae0de51fb6e9bd111ac94e3fefc717f84aea32a14410aa7257cc95b381c54b1501ae720c4eda569d0024206463
 SHA512 
d12584ab78c9cd7d3af459701eeed80519bea7e03dca6630205cc279bdd65c71a14d8738f2c29816a5b08381301210116fb769b583e3f6b83ed5e54755a00003
 DIST genpatches-5.4-132.extras.tar.xz 1768 BLAKE2B 
abad0014d2d982087ac982d0f017587fba8ea2b5180e67a92ed4b5a62c4129a5d275f6556cbf782b459900e03696355e4017c4c833cefc571c7cf4bbf2b5c907
 SHA512 
121ad821cd6628166a1ca005f2b408737ba8c9c1b8315c13926bda862b49d2ed330fea169a348b0209d903fca7a8d4ebdb50cf7dd527efde49ca9d69de4106df
 DIST genpatches-5.4-133.base.tar.xz 3628504 BLAKE2B 
d3d99348c475bbeda9a1d0a7e3637ddc9c0896ae0de51fb6e9bd111ac94e3fefc717f84aea32a14410aa7257cc95b381c54b1501ae720c4eda569d0024206463
 SHA512 
d12584ab78c9cd7d3af459701eeed80519bea7e03dca6630205cc279bdd65c71a14d8738f2c29816a5b08381301210116fb769b583e3f6b83ed5e54755a00003
@@ -51,6 +53,8 @@ DIST gentoo-kernel-5.12.16-1.x86.xpak 58066447 BLAKE2B 
34d639113540707e4fe2f104f
 DIST gentoo-kernel-5.12.17-1.amd64.xpak 66386296 BLAKE2B 
d3295c68205b40db976ab8a8a98a354990339fac12c7bc7b7e5267e4e5d794dbf707641c62a7fcfcc0302282c9bb3f2e2397383f8e288e611a64413a04cccc25
 SHA512 
86e51ff6e17adaa8a3210c7ce1926cb0f3ab71fcafa54b883c288a67334d02a5d1045b8329f3f300f9a8bc723af6ad7b1601521066c64afe5c030492a8283986
 DIST gentoo-kernel-5.12.17-1.arm64.xpak 59979517 BLAKE2B 
8fdb4bd2ad39ccbd9a4176c5a1154eabcd8ba94eed84d497ef69fe280aecf8dbb2031a15b54974fc94497a35c94712e0a3ccf9bb38fc868211753161b0eec3c9
 SHA512 
f9fe1524596a0d9c5fc1cbf5985480c53412605ead30254bc17696fe7807b7c9feeb84c86e44fabe015013be6efa8848303b1a35f53af662369023e3a29203fe
 DIST gentoo-kernel-5.12.17-1.x86.xpak 58117300 BLAKE2B 
eecdaefb730a38d2b4b5d02dd880f03c841694fea4f940de0dbea28bbf3539b24e34eea97d11adbcd68f709d7d8b1663ab0efa587b6ca163f68a2caf7b04368f
 SHA512 
2d8e4b3beafcae99ade25195a45ab26305e8f600be33992357678e31c3e0304e6812f79894a705d72e418fde7825f50ca905e92b559e4d392f151b776ca1aabd
+DIST gentoo-kernel-5.12.18-1.amd64.xpak 66375757 BLAKE2B 
ef75d22524ff3b30c93da5d69e1a5484f6fa7f8cfc9fa24dcd88020c58a63ace0fe908b25b52e8a897267286e13f19099c2c58d89e2e5f5c717ce36397daa74d
 SHA512 
5ea36ebaed95ef9f15fb5a104783d91a47951630698e1f505f50804aba2b1927d92f2b89b189adf4bbf8e9e9e76dcc39c4c2b71b54db8e6eaf1ca955d64be8f2
+DIST gentoo-kernel-5.12.18-1.x86.xpak 58073426 BLAKE2B 
50113380cc4c6ba98090675e186b3913d82341389c9cbf5dce0bb10957eabc079d6903eb955fbdd96042f9a330d550603649618162cb60c9ab0017e13c5953c9
 SHA512 
b7692f7ce78b3b67459fed8a6036b5eadb2107fd1c0c400ab570d4b5f59b3aec69a3ca4609505cab0da1882bdc885ed789cce3b51969816dd7cc1d33727d8572
 DIST gentoo-kernel-5.4.129-1.amd64.xpak 61346649 BLAKE2B 
37d29b604a69fd8bc84c41bc619bef982d10cf31d7220ff79bb853a674eb594418338748968042d19352458ba61015bf631c8f36f3a1a6674bcaf228dfaac240
 SHA512 
30601d1b125d1bf1999e49f817d8a553f387c512a85cd2921e201e7e06b85b90148aef276fdcdfa50f5da477a067bae52af5c400f1cb596f9fec21bb3162db44
 DIST gentoo-kernel-5.4.129-1.arm64.xpak 56131771 BLAKE2B 
5567df5a41ccd99aca489b8b35718eefdfc9ddb0d9bbe6158abb32c59490278c6e1456ed021f9a08f7bb9b0c206fe503ab31cedadf0276a01f7fbe56e8ea8270
 SHA512 
8be57abcb7533b8f47a3bc11302e3f9b0ff8c33f67e6830210030a2caf3215b708856c899ecb7dddf9af707e39594f035a21e503c98a909ca1ddfb156d121554
 DIST gentoo-kernel-5.4.129-1.x86.xpak 53134201 BLAKE2B 
c7d76168ceb139ff7e206e5005d6cad2c7c54320967ca9e9c8dcf493677527fa3712d43c9b6dba96a54ad8b1d68cce937dd3643b0ac2d1e8a32c1d27361f578a
 SHA512 
edf3c3f744738bbc06f13307259ef6315cb5bda60d9ca165853b7ea4b2f983ba72efa3bb1b4db1a0b21deb5060b7636a5c41840b36cd1ee224bce69358db6e4d

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.18.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.18.ebuild
new file mode 100644
index 00000000000..550411ea18c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.18.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 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##*.} + 3 ))
+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
+       amd64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.amd64.xpak
+       )
+       x86? (
+               
https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.x86.xpak
+       )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+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
+       ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+       tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.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
+
+       # 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