alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-11 00:00:12 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

debian: fix dkms

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2025-09-17 00:05:50 -04:00
parent 525d7f816f
commit 7d37ce6485
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,6 +10,7 @@ TAGS
cscope* cscope*
bcachefs-tools bcachefs-tools
compile_commands.json compile_commands.json
dkms/dkms.conf
# dot-files that we don't want to ignore # dot-files that we don't want to ignore
!.gitignore !.gitignore

8
Makefile
View File

@ -200,6 +200,9 @@ endif
# Rebuild the 'version' command any time the version string changes # Rebuild the 'version' command any time the version string changes
cmd_version.o : .version cmd_version.o : .version
dkms/dkms.conf:
sed "s|@PACKAGE_VERSION@|$(VERSION)|g" dkms/dkms.conf.in > dkms/dkms.conf
.PHONY: install .PHONY: install
install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs
install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs
@ -226,19 +229,18 @@ install_systemd: $(systemd_services) $(systemd_libexecfiles)
$(INSTALL) -m0644 -D $(systemd_services) -t $(DESTDIR)$(PKGCONFIG_SERVICEDIR) $(INSTALL) -m0644 -D $(systemd_services) -t $(DESTDIR)$(PKGCONFIG_SERVICEDIR)
.PHONY: install_dkms .PHONY: install_dkms
install_dkms: install_dkms: dkms/dkms.conf
$(INSTALL) -m0644 -D dkms/Makefile -t $(DESTDIR)$(DKMSDIR) $(INSTALL) -m0644 -D dkms/Makefile -t $(DESTDIR)$(DKMSDIR)
$(INSTALL) -m0644 -D dkms/dkms.conf -t $(DESTDIR)$(DKMSDIR) $(INSTALL) -m0644 -D dkms/dkms.conf -t $(DESTDIR)$(DKMSDIR)
$(INSTALL) -m0644 -D libbcachefs/Makefile -t $(DESTDIR)$(DKMSDIR)/src/fs/bcachefs $(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/*.[ch] -t $(DESTDIR)$(DKMSDIR)/src/fs/bcachefs
sed -i "s|@PACKAGE_VERSION@|$(VERSION)|g" $(DESTDIR)$(DKMSDIR)/dkms.conf
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 $(DKMSDIR)/src/fs/bcachefs|" \
$(DESTDIR)$(DKMSDIR)/src/fs/bcachefs/trace.h $(DESTDIR)$(DKMSDIR)/src/fs/bcachefs/trace.h
.PHONY: clean .PHONY: clean
clean: clean:
@echo "Cleaning all" @echo "Cleaning all"
$(Q)$(RM) libbcachefs.a c_src/libbcachefs.a .version *.tar.xz $(OBJS) $(DEPS) $(DOCGENERATED) $(Q)$(RM) libbcachefs.a c_src/libbcachefs.a .version dkms/dkms.conf *.tar.xz $(OBJS) $(DEPS) $(DOCGENERATED)
$(Q)$(CARGO_CLEAN) $(Q)$(CARGO_CLEAN)
$(Q)$(RM) -f $(built_scripts) $(Q)$(RM) -f $(built_scripts)

2
debian/control vendored
View File

@ -5,6 +5,7 @@ Priority: optional
Standards-Version: 4.7.0 Standards-Version: 4.7.0
Rules-Requires-Root: no Rules-Requires-Root: no
Build-Depends: debhelper-compat (= 13), Build-Depends: debhelper-compat (= 13),
dh-dkms,
cargo, cargo,
jq, jq,
libaio-dev, libaio-dev,
@ -24,7 +25,6 @@ Build-Depends: debhelper-compat (= 13),
systemd-dev, systemd-dev,
uuid-dev, uuid-dev,
zlib1g-dev, zlib1g-dev,
Depends: dkms
Homepage: https://bcachefs.org/ Homepage: https://bcachefs.org/
Vcs-Git: https://salsa.debian.org/debian/bcachefs-tools.git Vcs-Git: https://salsa.debian.org/debian/bcachefs-tools.git
Vcs-Browser: https://salsa.debian.org/debian/bcachefs-tools Vcs-Browser: https://salsa.debian.org/debian/bcachefs-tools

2
debian/rules vendored
View File

@ -32,7 +32,7 @@ endif
export CARGO_ARGS = "--frozen" export CARGO_ARGS = "--frozen"
%: %:
dh $@ --parallel dh $@ --parallel --with dkms
override_dh_clean: override_dh_clean:
# HACK: breaks cargo checksumming by deleting some vendored files. # HACK: breaks cargo checksumming by deleting some vendored files.

2
dkms/dkms.conf → dkms/dkms.conf.in
View File

@ -1,5 +1,7 @@
PACKAGE_NAME="bcachefs" PACKAGE_NAME="bcachefs"
PACKAGE_VERSION="@PACKAGE_VERSION@" PACKAGE_VERSION="@PACKAGE_VERSION@"
AUTOINSTALL=yes
BUILT_MODULE_NAME[0]="bcachefs" BUILT_MODULE_NAME[0]="bcachefs"
BUILT_MODULE_LOCATION[0]="src/fs/bcachefs" BUILT_MODULE_LOCATION[0]="src/fs/bcachefs"
DEST_MODULE_LOCATION[0]="/kernel/fs/bcachefs" DEST_MODULE_LOCATION[0]="/kernel/fs/bcachefs"