commit:     c606d9447c9db5d3066aff081a0c9725b86c1279
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 14:30:02 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 18 14:43:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c606d944

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.4.195.ebuild               | 135 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index e64a64d3897f..079c7bf63c7e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-5.4-197.base.tar.xz 4667616 BLAKE2B 
fe777dfe7e9301dbda973c6bbb14
 DIST genpatches-5.4-197.extras.tar.xz 1812 BLAKE2B 
8aa22afa5b4f9cb1cf2a112095a694f6145ec9c3b4be99daff9a1fbfab6e1742d45a8f34bfb407d6f7622bc9f934bcf780d8ddfb4f2add165329cf397c0f08ae
 SHA512 
0b51076e9c9d17e094652288c8c0c0482a80ab233658fc84cd2db92414fef3965435a6718839b27361f0de802e70457f8ce32e9a7db33b30858e681a392d5355
 DIST genpatches-5.4-198.base.tar.xz 4675164 BLAKE2B 
df3392747e2aa0cecbfda049c124731bfb16b4ef2cdd3f973128c0f9b8c1160e941738f48092a0dc5a11f917fd6c3becd73dce6150c6d1ff17014b2c4c8197b4
 SHA512 
1e1a8dbe948b8a765b5ae4d98954a721586e5f7e0d4ad4bf579fd72002d78dd7074f535dc3c4a039c94c1c18506a2d000ef251318fd49913fc2fc56f710b6e59
 DIST genpatches-5.4-198.extras.tar.xz 1812 BLAKE2B 
4512e1007841a16ddc3ec986778def8ccb1b144758c0edbfe004e547332c18266e38e016d8b098985d2344ab0c9c516b663c8af35f0d5896f2ffac01cda3a94b
 SHA512 
ad74a36ebf4b5eb734f896718ee7e3f25a493904b30717819218638beeead2a8853bc64c0d368aae8f2c5957bc222ca2a296153aa492ef001ce9abc247b507a8
+DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B 
e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475
 SHA512 
8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
+DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 
03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4
 SHA512 
d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
 DIST gentoo-kernel-5.10.113-1.amd64.xpak 65766074 BLAKE2B 
ab023c423ced6ae0c7fad1034567151da967c56287665d8e9d764934925310ac6b4ff259e9e82a5bd808d9935c156972b7e64c4e25a4119eebdca8e08eb475bb
 SHA512 
91157b1f2f8b711ef414733b7ff3c5e4e224ab8f29c57c2651630d1f6ea9184d31940123cff3fc513db54f7369df85b6450ef6a3b5344e4077e9b2ad1d389176
 DIST gentoo-kernel-5.10.113-1.arm64.xpak 61045546 BLAKE2B 
b9c93bf32c5912be5d0bbb3996c8d138317381a23eac10ecb2071e8015339f8ce14b0eec962f468ef315b85550d702c33a0cf097bf96c6818bc1683f5ce176f4
 SHA512 
86d9df4cefae1ed5d4f65a5fcd41f1187fa6bfe5e269e07576dfef69e623d01e0992663416797d1b9f93233f99db680664ce1f9b7f4786baa469c089b4ec99b6
 DIST gentoo-kernel-5.10.113-1.ppc64le.xpak 55949135 BLAKE2B 
7447e2d29388236a4499f9dc0ca1c9a9b9a37860ba0b07b33b9c39074780daaabaab874c680ef958198ef5ca062d4dcfb961af515cd50539efd30466d87e2058
 SHA512 
4590cef1ead04f45b5fa18537274f3fa598aa53a6cc06cbd51d30249a3ca3f667f60177f9cc41a2c0feb72745924693606daf673628bd584886afd707b93cffe
@@ -64,6 +66,10 @@ DIST gentoo-kernel-5.4.194-1.amd64.xpak 61626123 BLAKE2B 
fff47e728b54f17ba358a8c
 DIST gentoo-kernel-5.4.194-1.arm64.xpak 57769761 BLAKE2B 
3a8cf2d7a6334899be806682ebb73228bbc78ccbbee20532e01f9e27aa52a0829e7e2fa139bf9df6405916532f4414c090a0213e312315cf4ac7cac690d8e98d
 SHA512 
dbec26d65cbebbeb455215c925e5bd8b9935f485a4846d07805081ec2a9f82b2ae069f16d337ba9b843e79d19e5a324dce2c2ecad5f9a2b3f0a49e6a0cbb8fac
 DIST gentoo-kernel-5.4.194-1.ppc64le.xpak 55040707 BLAKE2B 
621b5ed2570f218389618133d0e51b6c28a6e55db7b29e087a471df56fef05336a9526e38e6d27d9acd781cce1e837eea2e8408c168ae2693c5a85e66b26070e
 SHA512 
326d07939bf150237aa1825d20fdc2f447153ba1e794fcebb915ec5f22c9cc0dbb01460634789222ee39ecc5206d815c164cbe4aea0c4a8f65d1f035245292bb
 DIST gentoo-kernel-5.4.194-1.x86.xpak 53370327 BLAKE2B 
ba4b538e4d1094c6efd183d8d1b1af22534cc4b1a6414507a1309630e7279ea9e7f8022c1737b2632dd65f9617a3b096ad6a4bd6e984329c289a1a9d319005bc
 SHA512 
140af89c8ff24d1081591279b560b883baf2ea54c0288bb61bd4b738efdce12e5a11143bb3e940b871c5223d81b208f0b7c695047770f4511e2b3e7c4182c4c7
+DIST gentoo-kernel-5.4.195-1.amd64.xpak 61565615 BLAKE2B 
f0cad2381c28fd37bd9be906fdf2ad8a27f509e0ee5dbdf3b4634e100060c7aed60cd51cb9358a705fc6866b26374d95b47d22390bc400993bd3c48b11953293
 SHA512 
714528249af3914c5cbb9d2a040743195f2b31310a961f712ee48e936f9d45038cb5f7873376b8600a68062878506adbd7cf82c3711614264bab4301a502b773
+DIST gentoo-kernel-5.4.195-1.arm64.xpak 57777950 BLAKE2B 
c71a60316e4ed106716b942b1e39d9d077c88b38a54c60b571cf6c6ebbac6b9e4f509f6c5372fa2cf2a464198d479642e3543672011ffe07b607ece1ccc5c554
 SHA512 
48a51e86c7a3927036db11da66bdf99d36c7518ccdf4566da5c145342567a1909883ed375e633510fda532ceec39b552a9bd6d15b406020d78777c686a4c41f8
+DIST gentoo-kernel-5.4.195-1.ppc64le.xpak 55046362 BLAKE2B 
e99110bbded6458dd3f1c28c4a7c7b3dee759a7aff41fb7f065fc5a15dcd9f6774318dfffe70ecc88bd4254bc028b1a4d8b80ba1068c3d8fb0706e4d4eadee8a
 SHA512 
a5033eb68b7800401dcf078723607870a2d913b2ea8cee2cfccf4a4e08b67f469f8fa07c14904c2ea2d0a033c9c4d65641efe45cc647f0f656d81a74cd6fd8a1
+DIST gentoo-kernel-5.4.195-1.x86.xpak 53302412 BLAKE2B 
1eed9ffcb4f8a0a1176fe72d764f76169a6d5e6bc3d47b0506f699d0b072ef6ba7d6ca735ced8e8ccd1b228e80afcbe741f03de367910c9e707112b718f96e69
 SHA512 
7d7f1c227d1cebee03d69dfaa27d3823a6a9896f75a675571813ed1fc47880e053d81e0cec56770140b3eb51ebe73bb15db57183ed0b7cbe90216d104a882b5e
 DIST linux-5.10.tar.xz 116606704 BLAKE2B 
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
 SHA512 
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 
82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0
 SHA512 
89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.195.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.195.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.195.ebuild
@@ -0,0 +1,135 @@
+# 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##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+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
+       )
+       arm64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.arm64.xpak
+       )
+       ppc64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.ppc64le.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 ~arm64 ~ppc64 ~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
+       # 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