[gentoo-commits] repo/proj/guru:dev commit in: sys-fs/bcachefs-kmod/

[Florian Albrechtskirchinger]

commit:     4d4962c2f479552046b2201cd674cc461a3cd8d0
Author:     Florian Albrechtskirchinger <falbrechtskirchinger <AT> gmail <DOT> 
com>
AuthorDate: Sun Mar  1 03:54:00 2026 +0000
Commit:     Florian Albrechtskirchinger <falbrechtskirchinger <AT> gmail <DOT> 
com>
CommitDate: Sun Mar  1 03:56:13 2026 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4d4962c2

sys-fs/bcachefs-kmod: sync live ebuild

Signed-off-by: Florian Albrechtskirchinger <falbrechtskirchinger <AT> gmail.com>

 sys-fs/bcachefs-kmod/bcachefs-kmod-9999.ebuild | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/sys-fs/bcachefs-kmod/bcachefs-kmod-9999.ebuild 
b/sys-fs/bcachefs-kmod/bcachefs-kmod-9999.ebuild
index a665ed359d..4e57ea69d8 100644
--- a/sys-fs/bcachefs-kmod/bcachefs-kmod-9999.ebuild
+++ b/sys-fs/bcachefs-kmod/bcachefs-kmod-9999.ebuild
@@ -3,15 +3,12 @@
 
 EAPI=8
 
-MODULES_KERNEL_MIN=6.16
 MODULES_INITRAMFS_IUSE=+initramfs
-MY_PN="bcachefs-tools"
-MY_PV_MAJOR_MINOR=${PV%.*}
-MODULE_S="module/src/${PN%-*}-${PV}"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
 
 inherit linux-mod-r1 unpacker verify-sig
 
+MY_PN="bcachefs-tools"
+
 DESCRIPTION="Linux bcachefs kernel module for sys-fs/bcachefs-tools"
 HOMEPAGE="https://bcachefs.org/";
 if [[ ${PV} == "9999" ]]; then
@@ -29,6 +26,10 @@ SLOT="0"
 
 IUSE="debug verify-sig"
 
+MODULES_KERNEL_MIN=6.16
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
+
 BDEPEND="
        >=sys-kernel/linux-headers-6.16
        verify-sig? ( >=sec-keys/openpgp-keys-kentoverstreet-20241012 )
@@ -86,12 +87,18 @@ src_unpack() {
 src_prepare() {
        default
 
-       sed -i s/^VERSION=.*$/VERSION=${PV}/ Makefile || die
+       # Live builds will overwrite .version with git-describe output
+       echo "${PV}" > .version || die
        emake DESTDIR="${WORKDIR}" PREFIX="/module" install_dkms
 }
 
 src_compile() {
-       local modlist=( 
"bcachefs=:../${MODULE_S}:../${MODULE_S}/src/fs/bcachefs" )
+       local dirs=( "${WORKDIR}/module/src/${PN%-*}-"* )
+       local module_src="${dirs[0]}"
+
+       [[ -d "${module_src}" ]] || die
+
+       local modlist=( "bcachefs=:${module_src}:${module_src}/src/fs/bcachefs" 
)
        local modargs=(
                KDIR=${KV_OUT_DIR}
        )