commit:     7853a35b83b946f93188589922af4c02cec27127
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 18:12:45 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 18:14:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7853a35b

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.1.105.ebuild               | 138 +++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 8ee12bea154d..b59202af5b30 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.1-113.base.tar.xz 5796104 BLAKE2B 
0b6ca23a1a97810646b3424764e7
 DIST genpatches-6.1-113.extras.tar.xz 4056 BLAKE2B 
eb8f6f49888245bc0f9b174f326a19658871dd3d2c34fef83514469b14d8a7ea84c0efc17f988143324779b571251881732d906975902ae77210eb7a20aec938
 SHA512 
09b36640d1c31ec865031810254ff2613e0945634b8afb54dfa9c4c22924b1e37f53559e9a7bca9307c2d0c15b0cccfbc588fb795b7eeb38d0f33e050ab53de6
 DIST genpatches-6.1-114.base.tar.xz 5814096 BLAKE2B 
676bdc7fe3d68811434a210499f256d02ae7550ce9924175c540cb918e001f3360f1be25d88424d54fe4e1fb8918b07cc17862ae12bd714c38a165607842ac95
 SHA512 
5076776da85531ca7294150059d87df890da88e05da9eb308938131eaa86c1ad3a542f5afc9259ada433caf001ea8c13620ffabef11d1ada08af83c0699405a0
 DIST genpatches-6.1-114.extras.tar.xz 4060 BLAKE2B 
649cafba566d627d5a302874710ff22c6d102e5a93aa4516815ae07fcc0e7b965c0b4b4c8850e22ccdd4ac0f7e447d2a5a59edeedb0f89ac4eb5e68df94a4f3e
 SHA512 
07126cc655b3690ed7ff7399e385ce4dfada1e0e1a16f2e80fe5f0f0bef3ce4bec48f9527b928646a600353537e362b23242fb40a3a8bc5ad69ad99daffdab56
+DIST genpatches-6.1-115.base.tar.xz 5849032 BLAKE2B 
f506bede128cceac85af1219dd60f46753f80c2d2e7e23c1940c5e7114ab4ec489f94e839c24fa5fd8ff0f2ff72c60b313d66fe95a480026851cfd30b05ad6d6
 SHA512 
b91b4cdb568e4eee159ac1cf36e18afeb384cd96402dbeac53d6af2d03f1cf496a23a73400487d32f0808cf1dd01929e5e031cf5c97a8f027d4bf6e93860b726
+DIST genpatches-6.1-115.extras.tar.xz 4060 BLAKE2B 
a7c40e52a42d0a1d7438bdeb658a427251fc3df9d9e5e7be3f6ecde3242a286d686adc356234b5e0fe0a7c7403d5f4b422661570d001fac0f590247bbe519f6a
 SHA512 
97706920ff2f3e965f499917fea7a9013c191083114635147c759f1277c63006cdbb59c60bab40064d43a5d8cded27c17ee1f56536f766ca839fb045c428e810
 DIST genpatches-6.10-4.base.tar.xz 15672 BLAKE2B 
3dfb069409ca8c1cc8022daaeda3f45443c4e11ab1b086d8178ae4bd7e9a77fdbd8016484324248370bfa4b92e1a10cfa67d40592fafcd8540cc917c60b52ea1
 SHA512 
ea2f80b065c59b485446c8acc174b93a688b9e6d5de8cd9bf307a43811f6087368b528647a2371636b22dc082735b57e470e9c5d1092972c3890a9c628db723c
 DIST genpatches-6.10-4.extras.tar.xz 4056 BLAKE2B 
b1cc5a0d37760aac34837b9f7b26240d92afa816b5456a334deaaff8e911cba25f15c5e168bcba86b80d9fbe006a4b07cf4aa963e68a92e5152033cbcb080be0
 SHA512 
765b58ae1ce61678dce39b27e9212844cfd991e222384c7650355a374a236918f622549d49d5d483bfbc6dfaa74120b66976e85bbfdb6b54b0e871f1d5d5ec60
 DIST genpatches-6.10-6.base.tar.xz 257104 BLAKE2B 
13309e86f5b16ff79797736ac91214698afb07ebc167eb22bbc354432f64e26dc3c19e0e4bccaf4fac7f0c858b7739317db3ffec9eef596eda5c2a45e785bac3
 SHA512 
55c009415c1b03c02a5e0251c8a12adf9eeba0fa7010cde100735880332127bda25bbbc59f9105c091fbc5bd67d7bbcc4fe02fbf4de7bee645bc679649ca3a67
@@ -64,6 +66,10 @@ DIST gentoo-kernel-6.1.104-1.amd64.gpkg.tar 72581120 BLAKE2B 
3f442b717a6935fae26
 DIST gentoo-kernel-6.1.104-1.arm64.gpkg.tar 65546240 BLAKE2B 
d764ee6f31a941e5151a07658269c6587d4c90759512feee2ce0007e4f8394d8b5d7b273e00ff059bfe86911924b3c42ac5d137f52285b0e154a5f9613d1cf6b
 SHA512 
68acdf8a5d3233e313cd2bf271e2313443a7a9ef4272b56a258b08602b2debf3aadea880a42bebc6df7c312cf0830c0439938cc8e7f50f2caddba7ca9162587a
 DIST gentoo-kernel-6.1.104-1.ppc64le.gpkg.tar 59811840 BLAKE2B 
4153742fe57b062314e4a90a6b175a6fc4104f5498f7eef1f00fb151f2f47cd64f5d634bad6270279602624f280d9685f82f052569b73980ccaed0ff5b58d70e
 SHA512 
87778b19710d486237ff2ca94a783d419ef5978c95625cf026b736a8472adb1f54ca634218635708e7d5133dcccff96a1b53dbace0016d05ebd9ea54601a36d8
 DIST gentoo-kernel-6.1.104-1.x86.gpkg.tar 62126080 BLAKE2B 
7099606a714bf171bf5a5eaf70bc439f0d716ad4eac9cc433d0b600b992093dfcf702d2b7eadc61792cd2897c9de1613369510601bf31c47f4c4fa31241c524d
 SHA512 
b5df8a31649d984dc2b69cbda84231b40ee250905bef64b15656f078732e0a55e44a75c986a566ce2c4ae410453016eac565d37a589c1ece5a9c94571161ffc6
+DIST gentoo-kernel-6.1.105-1.amd64.gpkg.tar 72591360 BLAKE2B 
6ee7b3c05c7be33459eb2ef8100d53cad14f567f041a99aec4909a53d16928b088675362d3438d85fbea181d620062de144b2c2e52679aa7eac45b09fd347685
 SHA512 
cdae43e6ef5f8d6124b79de51223999568a75c6448ccb6e25677213ffb115f729e8ccaf1aae0376c6a4e7a1773b3d335a31a10bb4f0e4a46a4313877a70386ca
+DIST gentoo-kernel-6.1.105-1.arm64.gpkg.tar 65556480 BLAKE2B 
4c0a4c217e4e3418368bb1708cbecf68646f9b34c22a60fd4478c6073a4edbaafae12da1e2f5a3c24eabb89f7a52717ec27c5a81a71534f16d596513fc3d4a22
 SHA512 
befdd3953e4129ad5f52fac21187307067ad8a11378d6ce68ff0760869a3cf7eff6c5b4533d6e6cefe316dae6d893e8b3c9e7d0c1b539bc318f2d6ce63a38d60
+DIST gentoo-kernel-6.1.105-1.ppc64le.gpkg.tar 59811840 BLAKE2B 
ced093a4d9acb16619d1bd646c4e434a4a1139014f99a674d1f312fc68dbaa46b999b2273196c38eb8fd51d7e545bd7e445ef773f9edcbd46786af40cd5dd50a
 SHA512 
63607afc5bf1903963db2529cf94018906e59764476eb35eb07c4afc2fc59c15054bb08eab88d535b8d204f62711702032ede08a4a0f72998ea3b9f292b388de
+DIST gentoo-kernel-6.1.105-1.x86.gpkg.tar 62136320 BLAKE2B 
823edf8c9c9f8b990fe7db8bb24ccaa2cb3d89543a297d0d552fb380596c221a757f2e59f95ac000a9542cf3b32dc78dd4b8687eb4b9adba50905b5156f9d14f
 SHA512 
9d67dc07730b480ae3cafa1e966803b92c2c2c2e0f417add5014d488b3ca4ec0ef01141f4f5743fa172d8870ebb62f2d89475d1c6ddd1cc0d07d38fd4313bebd
 DIST gentoo-kernel-6.10.2-1.amd64.gpkg.tar 160737280 BLAKE2B 
d697e43a5cc520e2895c65cf86401357919ea8be6f0d54d5319aac4ee0450c7e0f5f1148ad5ba83de9ec6a9395370a3f9ca69b1f4261bcdd3c6c84faeb14c4e9
 SHA512 
150743684d808ebbef34e65d16aefc243fff231b0777a4d2f060f7e3ab53c6fea22c718bb5a5d60857a058fbb2a5e33bd86b5467911f19370b5e1cf105ab8856
 DIST gentoo-kernel-6.10.2-1.arm64.gpkg.tar 131891200 BLAKE2B 
3b46113a10ff8b7a57e4f436aaa2cfeb4d95e9293fc158a70e52bd577ec5de573e17be05e5015a444a9da2ca5b768b6ebefd4a69e6dcb29dad31b82aad96ec56
 SHA512 
c8f3ed9fdbe4f761308a9109354c52d2ca1f65ca6289ac1d033ea28930a8cd94c313f5493a2e74f2b132bbc730de3b95acbed4330152bafdc1fb18f9a40cc574
 DIST gentoo-kernel-6.10.2-1.ppc64le.gpkg.tar 71987200 BLAKE2B 
4609342bf865984397f6b166b786c4ab3520f298a92027679584c789f2545f7c728c4710fe817155b33be1c637c1fd26c46aa979258aba552755acb892d5bdb8
 SHA512 
9faccceeb88e902f8d43edde4d890af3274f849bff7fe7cfc176e1061778fd9856e701d04adb04b99f6cb8ad993d3bb31a65ab80d79c50b046a2eeb519b00e2b

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.105.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.105.ebuild
new file mode 100644
index 000000000000..53b01d5e35e1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.105.ebuild
@@ -0,0 +1,138 @@
+# Copyright 2020-2024 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##*.} + 10 ))
+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="
+       app-alternatives/bc
+       app-alternatives/lex
+       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 HOSTLD="$(tc-getBUILD_LD)"
+       if type -P "${HOSTLD}.bfd" &>/dev/null; then
+               HOSTLD+=.bfd
+       fi
+       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)"
+               HOSTLD="${HOSTLD}"
+               HOSTAR="$(tc-getBUILD_AR)"
+               HOSTCFLAGS="${BUILD_CFLAGS}"
+               HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+               CROSS_COMPILE=${CHOST}-
+               AS="$(tc-getAS)"
+               CC="$(tc-getCC)"
+               LD="${LD}"
+               AR="$(tc-getAR)"
+               NM="$(tc-getNM)"
+               STRIP="$(tc-getSTRIP)"
+               OBJCOPY="$(tc-getOBJCOPY)"
+               OBJDUMP="$(tc-getOBJDUMP)"
+               READELF="$(tc-getREADELF)"
+
+               # 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() {
+       local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+
+       # Overwrite the identifier in the prebuilt package
+       echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+       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