commit:     4996ea821e14efd955b7f5f6a0206bd255b61955
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  3 16:45:14 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 16:46:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4996ea82

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index ab37d09387fb..2bd451289ea9 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-6.1-15.base.tar.xz 803732 BLAKE2B 
5f43fb07787e9e861b54b4977acff4
 DIST genpatches-6.1-15.extras.tar.xz 3808 BLAKE2B 
8d7a78f6a1e8e6bbacace9cc067b1edd674611f7ba32ced894557cc48018ce708411828dcbbd71f8678f22ebf64c8913fe8c641d29bd46d7146198ebd1240f11
 SHA512 
0d53e3c9740cfe65b6168c624bcc99cbd16d3e196b50190be8aeeb8bf78d205dbed964e01b151a2ad03c2ad10bb4b74f84deeb4d42db4392fe52c337540e0dc6
 DIST genpatches-6.1-16.base.tar.xz 820936 BLAKE2B 
91554b3c532c7ba9549291a2a6c3ae531922819d896e4a9e69ef36d09ec8a444d2ba0725af6ff213ea554e6fcc9a20ccf5adce1d8e17a3c4fa9c3174a0a228ca
 SHA512 
7bee9944db4397cdbef1cde6083970c5290d9936a9ec17bd0d6b21ba7186eeaa0bb43703ec0974f5121e6cd424817727e6be3aa5980438dee4b27d9a9ff99456
 DIST genpatches-6.1-16.extras.tar.xz 3804 BLAKE2B 
72e1824ad6d561359eb287c8f67d94b961c6054a4bbc66af9571caced021d6d3cf64d5d06be4977c22b4c1061b37b5f174db4713040faac069dd9e7b29fa2a6f
 SHA512 
ac2c48ed858be0a2c844646d343de6994f1f8179b0369a6be554f1587369679b651304f967346aa1bf2f462ae62b1c8c0fcb5bca32ec12e2f6100a694aafc6b2
+DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B 
f1b86487c82d4354347171df635192a6276a4d0a9561a415270a85caa46401e4b9089f847346cbf441f8c6a4d4012234d83b31fca5797cc6296010f225392990
 SHA512 
155207127c1c58b2497788d5b7541ba1872fefea3d2c7804356e5bb6d28dae2f0400dbab44cf39b847f89e7a058710b8528059d75f0e92b63d3d37fd0a515ca8
+DIST genpatches-6.1-18.extras.tar.xz 3804 BLAKE2B 
f31c07ec6318b91e6e7eabeb62bc28af362fc097297b31521d464e298effbdf52cdb94b43a1811fc10ea3dc9387fa47501c4987d6709d73603ed15ac7949dd92
 SHA512 
8611f8cd72f54b7c4360d314eabcccfaa99722f568da32710a39f47ffd1770b14502130be5ce3d3a14a0bd93fc9fbb73f65a9c9636a8d0e9051892d1e5221ef7
 DIST genpatches-6.2-2.base.tar.xz 9540 BLAKE2B 
dce2bb1156f0e9a7ca19b618d13729908001939d6ec6361ca6619808a120e61900b5f4de97b2bef0e63aef81a83c7e2a0d736f3c344d9a610eb5c6a21baeb111
 SHA512 
50aabf4c24dbf13595556314b2ba8f1d0219355bc79c0fddf05ef7a6d244fe3c54f95c733e02fbc032a582495c59688f415af5b62b3401b436cbb5f0ef3aa9ac
 DIST genpatches-6.2-2.extras.tar.xz 3804 BLAKE2B 
cdbf51c28ff1c3b974665f558ec774eb70874a3941b97f966ee90642f3a1c8732333348e891156a40455c8b80c2a2002fdf1515403eca7b8d075c28b09a2ed78
 SHA512 
cba0fe9b3d13f3b1f6ee413a44698694ef6b009918dfda76e4d8402e66f1e857bf889fd4eb7ae093e864f7015eb3fe14aa704a5a3b68b0b92ca494bfc4b43a71
 DIST genpatches-6.2-4.base.tar.xz 15256 BLAKE2B 
4a6bc8f4b75be2afe87d3d29ebdd45cc6a6266717b793a611edcefad3b39c3f70f14533b538eb175f0c16e901006d52e09994072cf9375dc0606db0478472d18
 SHA512 
0351b19b50bff5922d916b215c8b5b04a31994973dbde9553b2f197009447c9d5dc992f0b9ee25bacdd1569477a0beed4e0359dec390ca4914ceeed3e73592f5
@@ -80,6 +82,10 @@ DIST gentoo-kernel-6.1.14-1.amd64.gpkg.tar 76615680 BLAKE2B 
636323e5fe1cb44f9775
 DIST gentoo-kernel-6.1.14-1.arm64.gpkg.tar 69324800 BLAKE2B 
556c448c4b026c7e8c0c6b57a46e4937a2e3e1574c8ecba9f763853a66039c5b81f6096afef16eff94bb88d9f46039816e83eb287199bf346d5b6be7599db23f
 SHA512 
c1f9906007f920b7dd37a522e9c5a41d25686f87c3843939ef48294d6e273ddd3a07ffe1f5b342a4bea607d6c4f9f31ccd6680581481be377a264d38353e35dc
 DIST gentoo-kernel-6.1.14-1.ppc64le.gpkg.tar 62668800 BLAKE2B 
c9f8ce41380d2bc9e450ef9a985b8e22e112e49d3143adb6f00a582ab29cdeabe781a36cd8fe923d92b871ab6cd6c671be1c2a0d4166e8c332d8db27a3e767e1
 SHA512 
72e4a880cd36d758c94bbab4ae0233142888ef93cf3ddbb6f2be66e4919f9fc2745004eeb3d555ecb86b209f7c8d8ad35260d4405922f9a16c026b2ffa755d2b
 DIST gentoo-kernel-6.1.14-1.x86.gpkg.tar 65822720 BLAKE2B 
6b2e753f01d660430c0db5eaac7031579c0a648ed61de3e8b153888b0822d28f201cd57cee09e5870c15731e346d3dd6f3e5655fd5a1b5ca2147e5913774a886
 SHA512 
77896e2d3d0e14f54cc100ceba53d0355418550f04261a4a15cc5c0a4ae4b41c451b177cc56b4f047536f3c05ed428cd76b128016a88d92741437cfb03b6dde9
+DIST gentoo-kernel-6.1.15-1.amd64.gpkg.tar 76595200 BLAKE2B 
5c41755d5494327de67885461d1dd6682388d639d62760c04def896d14e81f1243ef44a46611325c80653f2eb10e1ebca9ad172a48eeea1145084eb29f219ea0
 SHA512 
b79756b58c3a414722509fc1c2588135a48d67eb6a607ae9adde5031d02f49c98c2e6fe10084cd9e97dec6b1ecfd0fa28b1c1c112ab5a5a639cb35454c309921
+DIST gentoo-kernel-6.1.15-1.arm64.gpkg.tar 69314560 BLAKE2B 
9dafb2799aff6bc7363d79795dcf31498c658fcdcb68082a6c60a7dcdf72491a34b8040365fc70076d1ff68369365661f7e0a1ae915bff69f6638fb671d646c5
 SHA512 
a6b48ae321e4a79bfb334c8310a8dc638c564fd05e00e7bc9a4c324e7a5bb026f30908183660078bcaa6c945d848cc1f67a5590bbe0c55bd12dbfe9a478ced12
+DIST gentoo-kernel-6.1.15-1.ppc64le.gpkg.tar 62679040 BLAKE2B 
3eac67cfdab5aeccc3b6cf7362f202c7651b3869bdc765d9acd377439076d275407bc9cc15b449a13d74f0c256c6919d88d6c006012fcd74ce753249892619df
 SHA512 
2e9d0879ed7c311dd5fa88a344047c7e2b2b1fd9b81f04d31d5ef049fdfde7243bd57d5f0fd73f1effb9d58632a6b4e41307085f195ad41e47a612d2a79cd174
+DIST gentoo-kernel-6.1.15-1.x86.gpkg.tar 65832960 BLAKE2B 
c4dbcb24073061c38b29ed709b3873042627bb34c9efb05a268d07934d02df41e52b987f935172dadb50f87ee97e353efb1706f37ddb54ea8663d0c4a69cfb9a
 SHA512 
b18b3eebb97ef4a82ef8147ed41da663c6d19a0191548d74aa272b7650404cfed972df2146c251acd93965436232d55b72658b0992292054338629aa82e5bca1
 DIST gentoo-kernel-6.2.1-1.amd64.gpkg.tar 83271680 BLAKE2B 
84f16715dd8119c529e56ec433f21e5b8500e56ea6adbe249c2a00aa4293df284b4b4d349adfcd22399fa72b11316ea1fbe63dceb5ec7d47d55e2b34c3006b97
 SHA512 
5cb1816ac483496aa814700758ddb132f9c6de2de1c1772367afab9bb50abe0a2575f788a2f904688eaf7fdf81119a79b546a5b3b8520834a9abce1e9a630b57
 DIST gentoo-kernel-6.2.1-1.arm64.gpkg.tar 71649280 BLAKE2B 
d7acf954906471cf63a581604fc522c109ee884ec7b4d8cde182c7589810bce536b72f22d5306196d066b1996e937b400c2d88cb8ed586c112e4126918d8d3df
 SHA512 
02033ccf80ddc88c174ad299b2ec42e370fb9736f26f71e5131aa4ab582824a01385613258fee5d1453189c7bcc32511e38b5b8c766f1fffb1a760dbe6d7ba94
 DIST gentoo-kernel-6.2.1-1.ppc64le.gpkg.tar 63713280 BLAKE2B 
b0d8a048fb3a8bc8dc8cda7174e2906ca73d462b395fd601b2dea3476f6491fe19b95af7477328c1f3a065b06f0a9e9bcda369a4752cdfb3d036fbdaa219febf
 SHA512 
793f5b5459176323d43995955c722973afaf96e7457c53cef61eb79f52373ea646cc3e7143c296b1904e062fcd871ded092d376d4a4b2c61bd5ff2a42297ccbf

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