commit:     8ca9d8db9afb1ecc1a77477e7ac4f665b5fcfd56
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 11:16:21 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 11:16:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca9d8db

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.4.6.ebuild                 | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 561838a9a9fb..9b6e071aff83 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.4-6.base.tar.xz 314708 BLAKE2B 
815c36a6185cd1006596a4829462900
 DIST genpatches-6.4-6.extras.tar.xz 3696 BLAKE2B 
6a5cc63fc0e09b0eb697e34ec554153f179b0abc0ff5bf5ae06dc4b319b3343d0ba986f4a5ebb859c773c9dbb60248b4caefb192ff5c0a8f0aec115a4a67fbfc
 SHA512 
7ca005f7a822cc90a7a8399a7e7c277cc24757f689dfff9428251419e627510a3e4560448dc5a2c6901e2478288c9b5dac3c0b9973545864bd60feb0aa688e42
 DIST genpatches-6.4-7.base.tar.xz 412236 BLAKE2B 
923eacdb511942c4588aed97786aa931a2c3cfe89465c9a50aabe3c8b8c55408684ae33fe25af21bc240311339035e6129aa6d7e2c45f3e9e923f63e5bef34cc
 SHA512 
e5568b435f6e9261406742e95183574e3be5cc271ff8d55756921e0753e3239f3d2ee8be7111151488a899526f90a1d7ad27a9129a3c85520fd91a09e8043b6e
 DIST genpatches-6.4-7.extras.tar.xz 3700 BLAKE2B 
a264be6af2117363bc1bb94b5638eead9c01e15b9464ecaf1a5ceee6c7deb893832d11fe14a2d242089f81b1687b677fc784fa2ed7e9b4bc7fe4867dd078b6d2
 SHA512 
f7229f5293e50ab6fb93b47286c06ba96b2d7c03aa5c48fda6dd3639b53ae4da6c4d974d6a08828fda9a3963ab805eb02892e86c842b58dbde2e6b9563cb54c9
+DIST genpatches-6.4-8.base.tar.xz 414164 BLAKE2B 
f62a27a2a4ed9a80d830f5118c492c95b1400a149b9594e68b47011359fb02f5ab0a5f467dab50f730d56ac21bff0dd4ebf09251588a7bb4dda15aedc95ec729
 SHA512 
6d747b1b06d9fad9d53a293586e3bef465ddfbf2886ab9edee32b81282d4c7b8cf27d4edf4f8be1ef668ce55888ae21214ddc6dad0c2732698d23a77dac993c0
+DIST genpatches-6.4-8.extras.tar.xz 3696 BLAKE2B 
e1d121a35ab69fac09e935317c18299817c65867fb7cf7a6810f560af913a254b411259a78b61c0a31518629ad33e13e53910fbd9701602c733016869106e088
 SHA512 
11240038d70202c53ee17763de3f60fcb5ae0dffc8cf005d324a7cd15a865313b9da2a3e74e184090b2d674ca1a1515a1db9f2efbff7a0f5361563fc7895e87a
 DIST gentoo-kernel-5.10.186-1.amd64.gpkg.tar 66334720 BLAKE2B 
5f07b2c712e93102be6535c2ecb48fa3b735584c4370e869849b65de918e72a6952e602760d157b59fc79641524515691eae186ebdb235f10c79533acf4ac2e4
 SHA512 
c99a27afed991b2677400ce523d26be6b8b48cd355cee72c74f29fc7db1fcaaf6aa045a6037bc60e6d476821b10578f5b83d6b04d3e9a81321fe6a400c29184b
 DIST gentoo-kernel-5.10.186-1.arm64.gpkg.tar 59361280 BLAKE2B 
34ca97dd35463808171049926f98c2404f8459a6f993514479a1e0f74f3b02b550c8d981d98c3a150606e21fc87046221783da48a6652bd2dfc58200f290de79
 SHA512 
39afaf4bc802f51923b7ca452f1712130b9040c05f75e8b473764ba68f72d37da1a197bbd81711083306fbd66161a3e1d1f3cb230af6c39ad6cf30c0e84615f8
 DIST gentoo-kernel-5.10.186-1.ppc64le.gpkg.tar 54927360 BLAKE2B 
ead0cd95b3c4fe0620a6d3f5fb9dace4404f0a5f58b60f4dab2395fda349db2926a810cb20a491b80b43d0bbd19ec6044f88ce588c543915cc6549ea625b30ae
 SHA512 
fc48e77238b293aae29398544421c2167609d201e8fddebe41f47e7cb8e3554d1ea350da1b801169bfed75fbc4223e55613a9313bc63b98d60818804558fa0bf
@@ -58,6 +60,10 @@ DIST gentoo-kernel-6.4.5-1.amd64.gpkg.tar 83968000 BLAKE2B 
3e25880b82183b8eff78f
 DIST gentoo-kernel-6.4.5-1.arm64.gpkg.tar 72929280 BLAKE2B 
82d536d0515d50e1b0eb6054d63018344c220b2040bd282e4ff3928c58c77386d24d2772a3620ef42b25223ce604ea29309d84b88443316780f5c2db33b25f01
 SHA512 
fdc761a06033080bb9abe6cc3009d677fd22d8f05f4c1dfabf6c7277a3ccb848e0642800e5acf5212b85360af6c210e121f588913359d087ad1cee61b4d974a3
 DIST gentoo-kernel-6.4.5-1.ppc64le.gpkg.tar 64645120 BLAKE2B 
4492ff903c3ae54d0a612f4836c7173bdb982fb77565a659990eae79c43d5a36a017a3cf2e73a7daddc59affb6fe9e8e735e6f9bdb6f4a6b23d50041a9038def
 SHA512 
d82a56dc381a670c1f5d7ac0b946be64369c459e1cad1d1d88b0c197db3bbd6e1beb0f5b139fdd3354d689c9cb27a37a73684e45e1b2347af89e6d68df10e2db
 DIST gentoo-kernel-6.4.5-1.x86.gpkg.tar 67543040 BLAKE2B 
3ebec9e0aac723cdb74094dcf31e83f423de3be640598ff17f655e1282e7d7d1104d54a2e889d12e4c61ea81fe13a0d5d10b8d478e1ca6d5599831affe164dfd
 SHA512 
3bc6a256bd89208d1bd51483c8b5fadf96b337cc9919e83d808e21629db02133b13bd837eb5d1b1e480ebf61e7d37f1792b0936ed0da5ef2c82a1df9eddd9e88
+DIST gentoo-kernel-6.4.6-1.amd64.gpkg.tar 83998720 BLAKE2B 
4b6836c10d6c8e7123ddb5a70146fb094e294eb87f8d5f7012b2f981fae6bbafcec0cddad7d7579a08106dbc891c5bda15c39d50c4587547bdaa9fa3df2171e4
 SHA512 
546ff7c782a7637ce6997ee94d7570d7cb3cb27c8acfdc58a60f5f634b03f7477ecb019fddb5996320fa954260ef74caa794b6afef944f982d18f7416d171477
+DIST gentoo-kernel-6.4.6-1.arm64.gpkg.tar 72929280 BLAKE2B 
57e32808518b34e6e65b2835a87fd1c95f3d5b210d18bacfbcc107e243150fff592ea4dc2381d73f3c2c0f186ef70d742dcec056af7d6c2f1de1b7d5db2dcca5
 SHA512 
ec95702769561fafaf0d3852c96d8212acb0bcf958d461af45110234e2d7f6861f6d14ab254dfd5d7267ea42ca9ffa9789d7c46373197dacb6631e470e6844c3
+DIST gentoo-kernel-6.4.6-1.ppc64le.gpkg.tar 64634880 BLAKE2B 
4ce869aeae197e7811b5acdc5a9e3f17a0ee5ea0b5f9bf708227505bf52ddc44c4d485d00751f958c54036f977fc5e143ddac3bd7699ce07dd293ee8d2f71c9c
 SHA512 
35ebc43e11089279574bc84fbd10fe25a1f085313f93c94656617f24c1ccc276d641bb859140c6820c37ccd21c0a85cbf2bb3112b3cbcf90b9e21f396b60a45b
+DIST gentoo-kernel-6.4.6-1.x86.gpkg.tar 67553280 BLAKE2B 
d0fe9e92dbc7126d044f07dbf95b11edcdaeaaa77a856db4f60b329aa8ea55d02d2552e7d2ff2ca0d9b32e568caa67b203efdfe5214aa22609150fa39369c81c
 SHA512 
a8780f7258ca4717da2cd979f609c85b82215d1da04fc8994a8a2d4e5b9df8877ab42a42e02d2416e0386ed4e74cb874ce7dc1352923e8d397ffac21346346aa
 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.4.tar.xz 109441440 BLAKE2B 
193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13
 SHA512 
9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.4.6.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.4.6.ebuild
new file mode 100644
index 000000000000..3cd8c6516903
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.4.6.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${PF/-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}.gpkg.tar
+                       -> ${BINPKG}.amd64.gpkg.tar
+       )
+       arm64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.arm64.gpkg.tar
+       )
+       ppc64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.ppc64le.gpkg.tar
+       )
+       x86? (
+               
https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.x86.gpkg.tar
+       )
+"
+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
+       app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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 "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+       emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+       kernel-install_test "${KPV}" \
+               
"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" 
\
+               "${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+       mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+       # FIXME: requires proper mount-boot
+       if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+               mv "${BINPKG}"/image/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