X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=6e5d0e56aa7fbc52bac355cfd794cbeba3741907;hb=HEAD;hp=c29d973f85bd12907f3c493fd75ab5bfca8ab40e;hpb=b33fc8298f7e13226b9895abc57c9bfce5e3fa2d;p=bcachefs-tools-debian

diff --git a/Makefile b/Makefile
index c29d973..6e5d0e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,72 +1,316 @@
+VERSION=1.6.3
 
-PREFIX=/usr
+PREFIX?=/usr/local
+LIBEXECDIR?=$(PREFIX)/libexec
+PKG_CONFIG?=pkg-config
 INSTALL=install
-CFLAGS+=-std=gnu99 -O2 -g -flto -MMD -Wall			\
-	-Wno-unused-but-set-variable				\
+LN=ln
+.DEFAULT_GOAL=all
+
+ifeq ("$(origin V)", "command line")
+  BUILD_VERBOSE = $(V)
+endif
+ifndef BUILD_VERBOSE
+  BUILD_VERBOSE = 0
+endif
+
+ifeq ($(BUILD_VERBOSE),1)
+  Q =
+  CARGO_CLEAN_ARGS = --verbose
+else
+  Q = @
+  CARGO_CLEAN_ARGS = --quiet
+endif
+
+# Prevent recursive expansions of $(CFLAGS) to avoid repeatedly performing
+# compile tests
+CFLAGS:=$(CFLAGS)
+
+CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC			\
 	-Wno-pointer-sign					\
+	-Wno-deprecated-declarations				\
 	-fno-strict-aliasing					\
-	-I. -Iinclude -Ilibbcache				\
+	-fno-delete-null-pointer-checks				\
+	-I. -Ic_src -Iinclude -Iraid				\
 	-D_FILE_OFFSET_BITS=64					\
 	-D_GNU_SOURCE						\
 	-D_LGPL_SOURCE						\
 	-DRCU_MEMBARRIER					\
+	-DZSTD_STATIC_LINKING_ONLY				\
+	-DFUSE_USE_VERSION=35					\
+	-DNO_BCACHEFS_CHARDEV					\
+	-DNO_BCACHEFS_FS					\
+	-DNO_BCACHEFS_SYSFS					\
+	-DVERSION_STRING='"$(VERSION)"'				\
 	$(EXTRA_CFLAGS)
-LDFLAGS+=-O2 -g -flto
 
-PKGCONFIG_LIBS="blkid uuid liburcu"
-CFLAGS+=`pkg-config --cflags	${PKGCONFIG_LIBS}`
-LDLIBS+=`pkg-config --libs	${PKGCONFIG_LIBS}` -lm -lpthread -lrt
+# Intenionally not doing the above to $(LDFLAGS) because we rely on
+# recursive expansion here (CFLAGS is not yet completely built by this line)
+LDFLAGS+=$(CFLAGS) $(EXTRA_LDFLAGS)
+
+ifdef CARGO_TOOLCHAIN_VERSION
+  CARGO_TOOLCHAIN = +$(CARGO_TOOLCHAIN_VERSION)
+endif
+
+CARGO_ARGS=${CARGO_TOOLCHAIN}
+CARGO=cargo $(CARGO_ARGS)
+CARGO_PROFILE=release
+# CARGO_PROFILE=debug
+
+CARGO_BUILD_ARGS=--$(CARGO_PROFILE)
+CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS)
+
+CARGO_CLEAN=$(CARGO) clean $(CARGO_CLEAN_ARGS)
+
+include Makefile.compiler
+
+CFLAGS+=$(call cc-disable-warning, unused-but-set-variable)
+CFLAGS+=$(call cc-disable-warning, stringop-overflow)
+CFLAGS+=$(call cc-disable-warning, zero-length-bounds)
+CFLAGS+=$(call cc-disable-warning, missing-braces)
+CFLAGS+=$(call cc-disable-warning, zero-length-array)
+CFLAGS+=$(call cc-disable-warning, shift-overflow)
+CFLAGS+=$(call cc-disable-warning, enum-conversion)
+CFLAGS+=$(call cc-disable-warning, gnu-variable-sized-type-not-at-end)
+
+PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev libkeyutils udev"
+ifdef BCACHEFS_FUSE
+	PKGCONFIG_LIBS+="fuse3 >= 3.7"
+	CFLAGS+=-DBCACHEFS_FUSE
+	export RUSTFLAGS=--cfg fuse
+endif
+
+PKGCONFIG_CFLAGS:=$(shell $(PKG_CONFIG) --cflags $(PKGCONFIG_LIBS))
+ifeq (,$(PKGCONFIG_CFLAGS))
+    $(error pkg-config error, command: $(PKG_CONFIG) --cflags $(PKGCONFIG_LIBS))
+endif
+PKGCONFIG_LDLIBS:=$(shell $(PKG_CONFIG) --libs   $(PKGCONFIG_LIBS))
+ifeq (,$(PKGCONFIG_LDLIBS))
+    $(error pkg-config error, command: $(PKG_CONFIG) --libs $(PKGCONFIG_LIBS))
+endif
+PKGCONFIG_UDEVDIR:=$(shell $(PKG_CONFIG) --variable=udevdir udev)
+ifeq (,$(PKGCONFIG_UDEVDIR))
+    $(error pkg-config error, command: $(PKG_CONFIG) --variable=udevdir udev)
+endif
+PKGCONFIG_UDEVRULESDIR:=$(PKGCONFIG_UDEVDIR)/rules.d
+
+CFLAGS+=$(PKGCONFIG_CFLAGS)
+LDLIBS+=$(PKGCONFIG_LDLIBS)
+LDLIBS+=-lm -lpthread -lrt -lkeyutils -laio -ldl
+LDLIBS+=$(EXTRA_LDLIBS)
 
 ifeq ($(PREFIX),/usr)
-	ROOT_SBINDIR=/sbin
+	ROOT_SBINDIR?=/sbin
+	INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools
 else
-	ROOT_SBINDIR=$(PREFIX)/sbin
+	ROOT_SBINDIR?=$(PREFIX)/sbin
+	INITRAMFS_DIR=/etc/initramfs-tools
 endif
 
+PKGCONFIG_SERVICEDIR:=$(shell $(PKG_CONFIG) --variable=systemdsystemunitdir systemd)
+ifeq (,$(PKGCONFIG_SERVICEDIR))
+  $(warning skipping systemd integration)
+else
+BCACHEFSCK_ARGS=-f -n
+systemd_libexecfiles=\
+	fsck/bcachefsck_fail \
+	fsck/bcachefsck_all
+
+systemd_services=\
+	fsck/bcachefsck_fail@.service \
+	fsck/bcachefsck@.service \
+	fsck/system-bcachefsck.slice \
+	fsck/bcachefsck_all_fail.service \
+	fsck/bcachefsck_all.service \
+	fsck/bcachefsck_all.timer
+
+built_scripts+=\
+	fsck/bcachefsck_fail@.service \
+	fsck/bcachefsck@.service \
+	fsck/bcachefsck_all_fail.service \
+	fsck/bcachefsck_all \
+	fsck/bcachefsck_all.service
+
+%.service: %.service.in
+	@echo "    [SED]    $@"
+	$(Q)sed -e "s|@libexecdir@|$(LIBEXECDIR)|g" \
+	        -e "s|@bcachefsck_args@|$(BCACHEFSCK_ARGS)|g" < $< > $@
+
+fsck/bcachefsck_all: fsck/bcachefsck_all.in
+	@echo "    [SED]    $@"
+	$(Q)sed -e "s|@bcachefsck_args@|$(BCACHEFSCK_ARGS)|g" < $< > $@
+
+optional_build+=$(systemd_libexecfiles) $(systemd_services)
+optional_install+=install_systemd
+endif	# PKGCONFIG_SERVICEDIR
+
 .PHONY: all
-all: bcache
+all: bcachefs $(optional_build)
+
+.PHONY: debug
+debug: CFLAGS+=-Werror -DCONFIG_BCACHEFS_DEBUG=y -DCONFIG_VALGRIND=y
+debug: bcachefs
 
-CCANSRCS=$(wildcard ccan/*/*.c)
-CCANOBJS=$(patsubst %.c,%.o,$(CCANSRCS))
+.PHONY: tests
+tests: tests/test_helper
 
-# Linux kernel shim:
-LINUX_SRCS=$(wildcard linux/*.c linux/*/*.c)
-LINUX_OBJS=$(LINUX_SRCS:.c=.o)
+.PHONY: TAGS tags
+TAGS:
+	ctags -e -R .
 
-OBJS=bcache.o bcache-assemble.o bcache-device.o bcache-format.o	\
-	bcache-fs.o bcache-run.o bcache-userspace-shim.o	\
-	libbcache.o tools-util.o $(LINUX_OBJS) $(CCANOBJS)
+tags:
+	ctags -R .
 
-DEPS=$(OBJS:.o=.d)
+SRCS:=$(sort $(shell find . -type f ! -path '*/.*/*' -iname '*.c'))
+DEPS:=$(SRCS:.c=.d)
 -include $(DEPS)
 
-bcache: $(OBJS)
+OBJS:=$(SRCS:.c=.o)
+
+%.o: %.c
+	@echo "    [CC]     $@"
+	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+BCACHEFS_DEPS=libbcachefs.a
+RUST_SRCS:=$(shell find src bch_bindgen/src -type f -iname '*.rs')
+
+bcachefs: $(BCACHEFS_DEPS) $(RUST_SRCS)
+	$(Q)$(CARGO_BUILD)
+
+libbcachefs.a: $(filter-out ./tests/%.o, $(OBJS))
+	@echo "    [AR]     $@"
+	$(Q)ar -rc $@ $+
+
+tests/test_helper: $(filter ./tests/%.o, $(OBJS))
+	@echo "    [LD]     $@"
+	$(Q)$(CC) $(LDFLAGS) $+ $(LOADLIBES) $(LDLIBS) -o $@
+
+# If the version string differs from the last build, update the last version
+ifneq ($(VERSION),$(shell cat .version 2>/dev/null))
+.PHONY: .version
+endif
+.version:
+	@echo "  [VERS]    $@"
+	$(Q)echo '$(VERSION)' > $@
+
+# Rebuild the 'version' command any time the version string changes
+cmd_version.o : .version
 
 .PHONY: install
-install: bcache
-	mkdir -p $(DESTDIR)$(ROOT_SBINDIR)
-	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8/
-	$(INSTALL) -m0755 bcache	$(DESTDIR)$(ROOT_SBINDIR)
-	$(INSTALL) -m0755 mkfs.bcache	$(DESTDIR)$(ROOT_SBINDIR)
-	$(INSTALL) -m0644 bcache.8	$(DESTDIR)$(PREFIX)/share/man/man8/
+install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs
+install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs
+install: bcachefs $(optional_install)
+	$(INSTALL) -m0755 -D target/release/bcachefs -t $(DESTDIR)$(ROOT_SBINDIR)
+	$(INSTALL) -m0644 -D bcachefs.8    -t $(DESTDIR)$(PREFIX)/share/man/man8/
+	$(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_SCRIPT)
+	$(INSTALL) -m0755 -D initramfs/hook   $(DESTDIR)$(INITRAMFS_HOOK)
+	$(INSTALL) -m0644 -D udev/64-bcachefs.rules -t $(DESTDIR)$(PKGCONFIG_UDEVRULESDIR)/
+	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mkfs.bcachefs
+	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/fsck.bcachefs
+	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mount.bcachefs
+	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mkfs.fuse.bcachefs
+	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/fsck.fuse.bcachefs
+	$(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mount.fuse.bcachefs
+
+	sed -i '/^# Note: make install replaces/,$$d' $(DESTDIR)$(INITRAMFS_HOOK)
+	echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
+	echo "copy_exec $(ROOT_SBINDIR)/mount.bcachefs /sbin/mount.bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
+
+.PHONY: install_systemd
+install_systemd: $(systemd_services) $(systemd_libexecfiles)
+	$(INSTALL) -m0755 -D $(systemd_libexecfiles) -t $(DESTDIR)$(LIBEXECDIR)
+	$(INSTALL) -m0644 -D $(systemd_services) -t $(DESTDIR)$(PKGCONFIG_SERVICEDIR)
 
 .PHONY: clean
 clean:
-	$(RM) bcache $(OBJS) $(DEPS)
+	@echo "Cleaning all"
+	$(Q)$(RM) libbcachefs.a c_src/libbcachefs.a tests/test_helper .version *.tar.xz $(OBJS) $(DEPS) $(DOCGENERATED)
+	$(Q)$(CARGO_CLEAN)
+	$(Q)$(RM) -f $(built_scripts)
 
 .PHONY: deb
 deb: all
-	debuild --unsigned-source	\
-		--unsigned-changes	\
-		--no-pre-clean		\
-		--build=binary		\
-		--diff-ignore		\
-		--tar-ignore
-
-.PHONE: update-bcache-sources
-update-bcache-sources:
-	echo BCACHE_REVISION=`cd $(LINUX_DIR); git rev-parse HEAD` > .bcache_revision
-	cp $(LINUX_DIR)/drivers/md/bcache/*.[ch] libbcache/
-	cp $(LINUX_DIR)/include/trace/events/bcache.h include/trace/events/
-	cp $(LINUX_DIR)/include/uapi/linux/bcache.h include/linux/
-	cp $(LINUX_DIR)/include/uapi/linux/bcache-ioctl.h include/linux/
+	debuild -us -uc -nc -b -i -I
+
+.PHONY: rpm
+rpm: clean
+	rpmbuild --build-in-place -bb --define "_version $(subst -,_,$(VERSION))" packaging/bcachefs-tools.spec
+
+bcachefs-principles-of-operation.pdf: doc/bcachefs-principles-of-operation.tex
+	pdflatex doc/bcachefs-principles-of-operation.tex
+	pdflatex doc/bcachefs-principles-of-operation.tex
+
+doc: bcachefs-principles-of-operation.pdf
+
+.PHONY: cargo-update-msrv
+cargo-update-msrv:
+	cargo +nightly generate-lockfile -Zmsrv-policy
+	cargo +nightly generate-lockfile --manifest-path bch_bindgen/Cargo.toml -Zmsrv-policy
+
+.PHONY: update-bcachefs-sources
+update-bcachefs-sources:
+	git rm -rf --ignore-unmatch libbcachefs
+	test -d libbcachefs || mkdir libbcachefs
+	cp $(LINUX_DIR)/fs/bcachefs/*.[ch] libbcachefs/
+	git add libbcachefs/*.[ch]
+	cp $(LINUX_DIR)/include/linux/closure.h include/linux/
+	git add include/linux/closure.h
+	cp $(LINUX_DIR)/lib/closure.c linux/
+	git add linux/closure.c
+	cp $(LINUX_DIR)/include/linux/xxhash.h include/linux/
+	git add include/linux/xxhash.h
+	cp $(LINUX_DIR)/lib/xxhash.c linux/
+	git add linux/xxhash.c
+	cp $(LINUX_DIR)/include/linux/list_nulls.h include/linux/
+	git add include/linux/list_nulls.h
+	cp $(LINUX_DIR)/include/linux/poison.h include/linux/
+	git add include/linux/poison.h
+	cp $(LINUX_DIR)/include/linux/generic-radix-tree.h include/linux/
+	git add include/linux/generic-radix-tree.h
+	cp $(LINUX_DIR)/lib/generic-radix-tree.c linux/
+	git add linux/generic-radix-tree.c
+	cp $(LINUX_DIR)/include/linux/kmemleak.h include/linux/
+	git add include/linux/kmemleak.h
+	cp $(LINUX_DIR)/lib/math/int_sqrt.c linux/
+	git add linux/int_sqrt.c
+	cp $(LINUX_DIR)/lib/math/mean_and_variance.c linux/
+	git add linux/mean_and_variance.c
+	cp $(LINUX_DIR)/include/linux/mean_and_variance.h include/linux/
+	git add include/linux/mean_and_variance.h
+	cp $(LINUX_DIR)/lib/time_stats.c linux/
+	git add linux/time_stats.c
+	cp $(LINUX_DIR)/include/linux/time_stats.h include/linux/
+	git add include/linux/time_stats.h
+	cp $(LINUX_DIR)/include/linux/darray.h include/linux/
+	git add include/linux/darray.h
+	cp $(LINUX_DIR)/include/linux/darray_types.h include/linux/
+	git add include/linux/darray_types.h
+	cp $(LINUX_DIR)/include/linux/eytzinger.h include/linux/
+	git add include/linux/eytzinger.h
+	cp $(LINUX_DIR)/scripts/Makefile.compiler ./
+	git add Makefile.compiler
+	$(RM) libbcachefs/*.mod.c
+	git -C $(LINUX_DIR) rev-parse HEAD | tee .bcachefs_revision
+	git add .bcachefs_revision
+
+
+.PHONY: update-commit-bcachefs-sources
+update-commit-bcachefs-sources: update-bcachefs-sources
+	git commit -m "Update bcachefs sources to $(shell git -C $(LINUX_DIR) show --oneline --no-patch)"
+
+SRCTARXZ = bcachefs-tools-$(VERSION).tar.xz
+SRCDIR=bcachefs-tools-$(VERSION)
+
+.PHONY: tarball
+tarball: $(SRCTARXZ)
+
+$(SRCTARXZ) : .gitcensus
+	$(Q)tar --transform "s,^,$(SRCDIR)/," -Jcf $(SRCDIR).tar.xz  \
+	    `cat .gitcensus` 
+	@echo Wrote: $@
+
+.PHONY: .gitcensus
+.gitcensus:
+	$(Q)if test -d .git; then \
+	  git ls-files > .gitcensus; \
+	fi