Merge pull request #419 from ElvishJerricco/push-ounmmyvyxzpx

dkms: Use relative path for TRACE_INCLUDE_PATH
This commit is contained in:
koverstreet 2025-09-24 02:23:25 -04:00 committed by GitHub
commit 9108a3727a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions

View File

@ -194,7 +194,7 @@ install_dkms: dkms/dkms.conf
$(INSTALL) -m0644 -D libbcachefs/Makefile -t $(DESTDIR)$(DKMSDIR)/src/fs/bcachefs
$(INSTALL) -m0644 -D libbcachefs/*.[ch] -t $(DESTDIR)$(DKMSDIR)/src/fs/bcachefs
$(INSTALL) -m0644 -D libbcachefs/vendor/*.[ch] -t $(DESTDIR)$(DKMSDIR)/src/fs/bcachefs/vendor
sed -i "s|^#define TRACE_INCLUDE_PATH \\.\\./\\.\\./fs/bcachefs$$|#define TRACE_INCLUDE_PATH $(DKMSDIR)/src/fs/bcachefs|" \
sed -i "s|^#define TRACE_INCLUDE_PATH \\.\\./\\.\\./fs/bcachefs$$|#define TRACE_INCLUDE_PATH .|" \
$(DESTDIR)$(DKMSDIR)/src/fs/bcachefs/trace.h
.PHONY: clean

View File

@ -5,8 +5,8 @@ else
KDIR ?= /lib/modules/`uname -r`/build
default:
$(MAKE) -C $(KDIR) M=$$PWD modules
$(MAKE) -C $(KDIR) M=$$PWD BCACHEFS_DKMS=1 modules
clean:
$(MAKE) -C $(KDIR) M=$$PWD clean
$(MAKE) -C $(KDIR) M=$$PWD BCACHEFS_DKMS=1 clean
endif

View File

@ -108,3 +108,7 @@ endif
# Silence "note: xyz changed in GCC X.X" messages
subdir-ccflags-y += $(call cc-disable-warning, psabi)
ifdef BCACHEFS_DKMS
subdir-ccflags-y += -I$(src)
endif