commit:     0480108e576d66f707f8a755c5fe406f221b5179
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 18:30:08 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 18:31:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0480108e

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 0619a1ddc649..fe36cb931216 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-44.base.tar.xz 2683644 BLAKE2B 
d0264b6d6456fb2e6a67c1240cd3f
 DIST genpatches-6.1-44.extras.tar.xz 3812 BLAKE2B 
bd5605700d0b55036d186eca82031f1d38883fbb3e2e98f0b44269c914f5a2912c026bebfdfd3fdcd563b97d3167fb9908bd0e29422b02e9314392b3ad2281c5
 SHA512 
e274c0e50fc476bc071fc4d77623b75cdfdda51951f541f56bc4f8ab53da17e67f615c37d35c93290d20b51d3ab2eb923a8e147daec4c59d3d1c87d3e803beb0
 DIST genpatches-6.1-45.base.tar.xz 2851860 BLAKE2B 
cd512077ba76f23b7109f30f9a981adbaafeafc3a2b69685620b0d67bf21b3d716cfd9c6328ed7c1d6cbeaef287876b7b63b112644546d2cdb63bdb85e4b082d
 SHA512 
1c1fd3a35c6544a030856161d902895b90fb75ad315247204361cc151190828fbe99abc87979a9df24b3e8e02aae944a130cadee5fb059e2ef174b6bc9d1b037
 DIST genpatches-6.1-45.extras.tar.xz 3812 BLAKE2B 
a3355cc91c618303f9490eb306639325e1b46a7ff9f6fc1f546ac1532d110d981ed316b9bc44abc624f70cb8e63ff512af2708b4cbc379a69df438c6792050db
 SHA512 
e2413fc03401dd1dcaee49bdb2cf8cb7008451cf2fbc8635854da2148464ffe1bb49127d73e534c054e5e56514bf31f5ccca507f52845334133fe26846e244a9
+DIST genpatches-6.1-46.base.tar.xz 2913208 BLAKE2B 
e462034f1d9d9e97411f6c6558b5df19bf92edbf214549f8d1749df795160e8c1e731effacf00595681a0576c867cdcb06e139cd1de29ac913dd37ea6404fad5
 SHA512 
d88711190f42a524229c4d1eb4659cf74d4c0c6f970ecc7b29fe56396eb8b05f2c01808f59c9133bef9a8cbb5618cd2cccea17192248fef133a2e90689b9a844
+DIST genpatches-6.1-46.extras.tar.xz 3808 BLAKE2B 
63c0ab6a14c96fdbb9a5500e6aedf31122068e8dea30269ac538e111a340d99c8e471c414ceebe29e2c392a9e726c945e289747ac89c7110a984f68ac5bc2794
 SHA512 
1368893d5f52c36082e5e59cb5bb878213b1745f5067930fc5a32653e69e0dcf2661604e55249023356df8d34028c15c7640af54bab8e9a060c712ab7748d3ce
 DIST genpatches-6.4-5.base.tar.xz 29696 BLAKE2B 
0e882d51de63cce7a7edc96c29fe46c27f607abddd0a70d2977054838d51ad623ec5ff3f4eac8e18b016f6c310ba79d326967947c17cf662391638d7fd2ecbd5
 SHA512 
3205df0e92db622aa397953de85605e58b4e977262a8dbb9e59174c7a55ad2c784ba417069f948dcdeddda8318389be45d54a516d9b2f45cd2948938942d7e5d
 DIST genpatches-6.4-5.extras.tar.xz 3700 BLAKE2B 
701f2bbb493087bcd8de7c7293c802bada8965901838b2eae998ec14749da6c46814611092b4120c25dc9ebef2313e36bcdc3593110d06c510e9db1dcf575f53
 SHA512 
0be95fcd6ce4ca750ea97c17bd897bd8083de63b8573080a2f3cd41d07c951293083afb739153a3cb29ea55e93b7d2063089119080b26f932c6a74e9425a1920
 DIST genpatches-6.4-6.base.tar.xz 314708 BLAKE2B 
815c36a6185cd1006596a4829462900041bb2ab5c89f28c9c26c5a10e8bf4d4907ce4f244044e7cd95c0f790112bdadeba8cd363b276aeb37ec20270e2a9162d
 SHA512 
d0d97bae5fd34e41d2236fbc9952c90b2535b62ac9a5a5dc259cffb7f927bda16a04175be0a940670d0a0021f6fd3cf45ecfddf0e22d7a9253c13236a9b29124
@@ -34,6 +36,10 @@ DIST gentoo-kernel-6.1.39-1.amd64.gpkg.tar 76646400 BLAKE2B 
807dfa9c621bbd70dc4d
 DIST gentoo-kernel-6.1.39-1.arm64.gpkg.tar 69335040 BLAKE2B 
a39774724f3980fa9033ac55ec53cd5b0e468260a323beeee6422d164fdc4ca85405f0e77231acb942ba00cc803666c3b4628d7f5cb8453f997e8db6ea163d4c
 SHA512 
04da4f262a2cc0feec3310ac0db3ee26f19e15839a4ac12eb4e849599dc9e7e2b32748b1f30f21334674e2708032fe5e9640fa26cc40bed0d613c68863904ee5
 DIST gentoo-kernel-6.1.39-1.ppc64le.gpkg.tar 62740480 BLAKE2B 
2ab2a4dfbcffa0a078ab8a8b26d54b88f5fdbae256632f595ffbe39908ac9b5092fb8625769b2864ca54254c5c9af17164d048fc0c5885b0b5d7663832b24ef2
 SHA512 
0ccb15a5200a45522a831a0f28141f0fc790e4189aeafa7f09a331f5ec8587251dde7beb0fd6a151d23c42369ea352775535cec05d8311435bfa76c51f429a02
 DIST gentoo-kernel-6.1.39-1.x86.gpkg.tar 66099200 BLAKE2B 
9bc929e5ec84f3cc46a3f3da5ff9b2cf3c0bf612b6632af5a6f50ff1a13f72eef816acf18f9012a57595c27b174797795b30c74a3abbbfe65bb9639d5f9965c2
 SHA512 
e57445c73ee932cd9a013695f6f01cc5c646b9f155e6b441799dd4d12df5722fa88ffdf8283e4f7be3e8b1654b23ae90b2a2e02f209a09a4b57ac0b6cfb7ce42
+DIST gentoo-kernel-6.1.40-1.amd64.gpkg.tar 76656640 BLAKE2B 
da75275758989cc42f2bb4244dfe98f09ff224990c3559faf8f76869ad46a1c67ea590365721121c1cf7ba540f0e9c5a3263c23ad79db73e4d38c65e2fc14c69
 SHA512 
6d9fd8e50b22c22ccea38b2fd70f7e6bd5e4589404d23d5bfbb3dd4873ef134d66fee5ef6bc14de767b7ea0cdbc1817a5ec13dd72967ff54f3521b97d02b5c74
+DIST gentoo-kernel-6.1.40-1.arm64.gpkg.tar 69335040 BLAKE2B 
ba0cd515a44973d5508313abd9b8a812294b54ed43aa1eb9498e9c56b058aaffac75efcd9d33c2a670fa1c3b481472e47d576931dffe58e049dbe5517c056117
 SHA512 
0902a39d5e600123b630833f2487599cc0b0fddcb24c6f431676b30675c2ee5d9e7ce5434ae18dd0665efd3d7dfb0b8e26165ba6a37f06a8edfe5c30ede59e93
+DIST gentoo-kernel-6.1.40-1.ppc64le.gpkg.tar 62740480 BLAKE2B 
d340a8e0553c1b7cd792fbc667df01bffadb23937ef8730f4eb9854339098c2941107b3e9fdc83739b4f7baa69413c8819890cd39ad95017b04131df138f0cd7
 SHA512 
54511fbea3145a554b7e9e5a56bb28e8b552c323cdaf97e7bc30079b1abae158e585ac29ea197e2ea7749925e172dd4ca37a28a8491ca3c0516a19d5b05196b7
+DIST gentoo-kernel-6.1.40-1.x86.gpkg.tar 66099200 BLAKE2B 
d9717d3836166b7124c150b979e161d576c7e4ba1e1f566e46782299b6b6db090b16bf1bebe16f99d3749421db7990719848b8ce9796aae172ead5789957519f
 SHA512 
9eefe7b84a9f16c25362451878b95bed2332ee4597e2c8b2c22d942ee313a69a4e1860aa337993cbd146e8a2e34051998b5651ad36e6bf35e779dbb8adb2bbd6
 DIST gentoo-kernel-6.4.3-1.amd64.gpkg.tar 84008960 BLAKE2B 
10fd671edec759a7ea7b0a8cb801b41936bc20fe9521608bc75d06adfa50484ea79eda2e3a9edd6d52dc39f797e5a23cd0c0af3bfecc09365e3d85560a4b8a75
 SHA512 
27a4853e687c3791cb05ad7841716104fb8f1c765f83a071d921357349f1e1b96076df33e9a11696f1f6a9bcb8f4c3cc3c32c3b3ea6152b47602b087bbe2add8
 DIST gentoo-kernel-6.4.3-1.arm64.gpkg.tar 72919040 BLAKE2B 
62029a052a591b967b6cc0c8e23c32b0395e7d85c1d2d698a2eebb9399e0c3b2c3133e3e084864b74edd87e99c869b9d64764e6964d50047710ef4e79cce1366
 SHA512 
925dcfc831612870fa80a7951fa0b63326bf8e67593dbff21a45149f77ace1e3327ea32b764e278923c550cc09e206f20387143005e99ff9e24d52a6f0b296e8
 DIST gentoo-kernel-6.4.3-1.ppc64le.gpkg.tar 64614400 BLAKE2B 
eeb487f9d02313f8b4ec5d031a862e5211801fffab22fd85dfc2c71be09096151187bd16c6b423d6cf541e4825a9afcb2fb8b3853f1ff2fd6a03d0b66a73ecfb
 SHA512 
c3d29660fbf26a10fdfadd64c6b4865cb0597aa5a6ea89ae5e63e8e96dfb605da56ea7ae6fdb6fb1da54f77a8d476c1edccd015691eb77797b13b5801178b2c4

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.40.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.40.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.40.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##*.} + 6 ))
+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