X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=67c40e5a146e97edde673934c36ecd70f7547f56;hb=d06f5690fab526c4a4a8a4d55f9c4e675d883be9;hp=9b3bdcc2c3f55582b83e054c123a7051835831e3;hpb=f3a8d548376295279d2d27fda5764adbe377c55b;p=bcachefs-tools-debian

diff --git a/Makefile b/Makefile
index 9b3bdcc..67c40e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,200 @@
-
-PREFIX=/usr
+PREFIX?=/usr/local
+PKG_CONFIG?=pkg-config
 INSTALL=install
-CFLAGS+=-std=gnu99 -O2 -Wall -g -D_FILE_OFFSET_BITS=64 -I.
-LDFLAGS+=-static
 
-PKGCONFIG_LIBS="blkid uuid libnih"
-CFLAGS+=`pkg-config --cflags	${PKGCONFIG_LIBS}`
-LDLIBS+=`pkg-config --libs	${PKGCONFIG_LIBS}` -lscrypt -lsodium -lkeyutils -lm
+CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall -fPIC				\
+	-Wno-pointer-sign					\
+	-fno-strict-aliasing					\
+	-fno-delete-null-pointer-checks				\
+	-I. -Iinclude -Iraid					\
+	-D_FILE_OFFSET_BITS=64					\
+	-D_GNU_SOURCE						\
+	-D_LGPL_SOURCE						\
+	-DRCU_MEMBARRIER					\
+	-DZSTD_STATIC_LINKING_ONLY				\
+	-DFUSE_USE_VERSION=32					\
+	-DNO_BCACHEFS_CHARDEV					\
+	-DNO_BCACHEFS_FS					\
+	-DNO_BCACHEFS_SYSFS					\
+	-DVERSION_STRING='"$(VERSION)"'				\
+	$(EXTRA_CFLAGS)
+LDFLAGS+=$(CFLAGS) $(EXTRA_LDFLAGS)
+
+## Configure Tools
+PYTEST_ARGS?=
+PYTEST_CMD?=$(shell \
+	command -v pytest-3 \
+	|| which pytest-3 \
+)
+PYTEST:=$(PYTEST_CMD) $(PYTEST_ARGS)
+
+CARGO_ARGS=
+CARGO=cargo $(CARGO_ARGS)
+CARGO_PROFILE=release
+# CARGO_PROFILE=debug
+
+CARGO_BUILD_ARGS=--$(CARGO_PROFILE)
+CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS)
+VERSION?=$(shell git describe --dirty=+ 2>/dev/null || echo v0.1-nogit)
+
+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)
+
+PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev"
+ifdef BCACHEFS_FUSE
+	PKGCONFIG_LIBS+="fuse3 >= 3.7"
+	CFLAGS+=-DBCACHEFS_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
+
+CFLAGS+=$(PKGCONFIG_CFLAGS)
+LDLIBS+=$(PKGCONFIG_LDLIBS)
+LDLIBS+=-lm -lpthread -lrt -lkeyutils -laio -ldl
+LDLIBS+=$(EXTRA_LDLIBS)
 
 ifeq ($(PREFIX),/usr)
 	ROOT_SBINDIR=/sbin
+	INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools
 else
 	ROOT_SBINDIR=$(PREFIX)/sbin
+	INITRAMFS_DIR=/etc/initramfs-tools
 endif
 
 .PHONY: all
-all: bcache
+all: bcachefs bcachefs.5 lib
 
-CCANSRCS=$(wildcard ccan/*/*.c)
-CCANOBJS=$(patsubst %.c,%.o,$(CCANSRCS))
+.PHONY: lib
+lib: libbcachefs.so
+
+.PHONY: tests
+tests: tests/test_helper
+
+.PHONY: check
+check: tests bcachefs
+ifneq (,$(PYTEST_CMD))
+	$(PYTEST)
+else
+	@echo "WARNING: pytest not found or specified, tests could not be run."
+endif
 
-libccan.a: $(CCANOBJS)
-	$(AR) r $@ $(CCANOBJS)
+.PHONY: TAGS tags
+TAGS:
+	ctags -e -R .
 
-bcache-objs = bcache.o bcache-assemble.o bcache-device.o bcache-format.o\
-	bcache-fs.o bcache-run.o bcache-key.o libbcache.o crypto.o util.o
+tags:
+	ctags -R .
 
-bcache: $(bcache-objs) libccan.a
+SRCS=$(shell find . -type f -iname '*.c')
+DEPS=$(SRCS:.c=.d)
+-include $(DEPS)
+
+OBJS=$(SRCS:.c=.o)
+bcachefs: $(filter-out ./tests/%.o, $(OBJS))
+
+RUST_SRCS=$(shell find rust-src/ -type f -iname '*.rs')
+MOUNT_SRCS=$(filter %mount, $(RUST_SRCS))
+
+debug: CFLAGS+=-Werror -DCONFIG_BCACHEFS_DEBUG=y -DCONFIG_VALGRIND=y
+debug: bcachefs
+
+MOUNT_OBJ=$(filter-out ./bcachefs.o ./tests/%.o ./cmd_%.o , $(OBJS))
+libbcachefs.so: LDFLAGS+=-shared
+libbcachefs.so: $(MOUNT_OBJ)
+	$(CC) $(LDFLAGS) $+ -o $@ $(LDLIBS)
+
+MOUNT_TOML=rust-src/mount/Cargo.toml
+mount.bcachefs: lib $(MOUNT_SRCS)
+	LIBBCACHEFS_LIB=$(CURDIR) \
+	LIBBCACHEFS_INCLUDE=$(CURDIR) \
+	$(CARGO_BUILD) --manifest-path $(MOUNT_TOML)
+
+	ln -f rust-src/mount/target/$(CARGO_PROFILE)/bcachefs-mount $@
+
+
+tests/test_helper: $(filter ./tests/%.o, $(OBJS))
+
+# 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 '$(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 lib
+	$(INSTALL) -m0755 -D bcachefs      -t $(DESTDIR)$(ROOT_SBINDIR)
+	$(INSTALL) -m0755    fsck.bcachefs    $(DESTDIR)$(ROOT_SBINDIR)
+	$(INSTALL) -m0755    mkfs.bcachefs    $(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) -m0755 -D mount.bcachefs.sh $(DESTDIR)$(ROOT_SBINDIR)
+	$(INSTALL) -m0755 -D libbcachefs.so -t $(DESTDIR)$(PREFIX)/lib/
+  
+	sed -i '/^# Note: make install replaces/,$$d' $(DESTDIR)$(INITRAMFS_HOOK)
+	echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
 
 .PHONY: clean
 clean:
-	$(RM) bcache *.o *.a
+	$(RM) bcachefs mount.bcachefs libbcachefs_mount.a tests/test_helper .version $(OBJS) $(DEPS) $(DOCGENERATED)
+	$(RM) -rf rust-src/*/target
 
 .PHONY: deb
 deb: all
-	debuild -nc -us -uc -i -I
+	debuild -us -uc -nc -b -i -I
+
+bcachefs-principles-of-operation.pdf: bcachefs-principles-of-operation.tex
+	pdflatex bcachefs-principles-of-operation.tex && pdflatex bcachefs-principles-of-operation.tex
+
+doc: bcachefs-principles-of-operation.pdf
+
+.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/trace/events/bcachefs.h include/trace/events/
+	git add include/trace/events/bcachefs.h
+	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)/kernel/locking/six.c linux/
+	git add linux/six.c
+	cp $(LINUX_DIR)/include/linux/six.h include/linux/
+	git add include/linux/six.h
+	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)/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)"