From 4aa64af7c31997b841c918e855519658e487cc5e Mon Sep 17 00:00:00 2001 From: Alexander Miroshnichenko Date: Mon, 13 Oct 2025 17:28:57 +0300 Subject: [PATCH] sys-fs/bcachefs-kmod: refactor ebuild Signed-off-by: Alexander Miroshnichenko --- sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.7.ebuild | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.7.ebuild b/sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.7.ebuild index 1cfdfc7..3a67123 100644 --- a/sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.7.ebuild +++ b/sys-fs/bcachefs-kmod/bcachefs-kmod-1.31.7.ebuild @@ -6,6 +6,7 @@ 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 @@ -32,7 +33,7 @@ SLOT="0" IUSE="debug verify-sig" -DEPEND="~sys-fs/bcachefs-tools-${PV}" +DEPEND="~sys-fs/bcachefs-tools-${MY_PV_MAJOR_MINOR}" RDEPEND="${DEPEND} " @@ -76,7 +77,7 @@ pkg_setup() { FRAME_POINTER !DEBUG_INFO_REDUCED " - linux-mod-r1_pkg_setup + #linux-mod-r1_pkg_setup } src_unpack() { @@ -110,11 +111,11 @@ src_prepare() { emake DESTDIR="${WORKDIR}" PREFIX="/module" install_dkms sed -i "s|^#define TRACE_INCLUDE_PATH .*|#define TRACE_INCLUDE_PATH ${WORKDIR}/${MODULE_S}/src/fs/bcachefs|" \ ../${MODULE_S}/src/fs/bcachefs/trace.h || die - sed -i '/mean_and_variance_test.o/Id' ../${MODULE_S}/src/fs/bcachefs/Makefile|| die + #sed -i '/mean_and_variance_test.o/Id' ../${MODULE_S}/src/fs/bcachefs/Makefile|| die } src_compile() { - local modlist=( "bcachefs=kernel/fs/bcachefs:../${MODULE_S}:../${MODULE_S}/src/fs/bcachefs" ) + local modlist=( "bcachefs=:../${MODULE_S}:../${MODULE_S}/src/fs/bcachefs" ) local modargs=( KDIR=${KV_OUT_DIR} )