X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=266f98a1ac1cbfe3c2741faf717037d6e182b787;hb=74c00c643edd1adab6fec3467be38d9f4227558b;hp=23cb6c0712095e97367f2280949c7db0ef75c40f;hpb=07ec713e056a73337bc0f53f5910f5179537b2c2;p=bcachefs-tools-debian diff --git a/Makefile b/Makefile index 23cb6c0..266f98a 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ PREFIX?=/usr/local PKG_CONFIG?=pkg-config INSTALL=install -PYTEST=pytest-3 -CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall \ + +CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall -fPIC \ -Wno-pointer-sign \ -fno-strict-aliasing \ -fno-delete-null-pointer-checks \ @@ -20,30 +20,34 @@ CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall \ $(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) -CC_VERSION=$(shell $(CC) -v 2>&1|grep -E '(gcc|clang) version') - -ifneq (,$(findstring gcc,$(CC_VERSION))) - CFLAGS+=-Wno-unused-but-set-variable \ - -Wno-zero-length-bounds \ - -Wno-stringop-overflow -endif - -ifneq (,$(findstring clang,$(CC_VERSION))) - CFLAGS+=-Wno-missing-braces \ - -Wno-zero-length-array \ - -Wno-shift-overflow \ - -Wno-enum-conversion -endif +include Makefile.compiler -ifdef BCACHEFS_DEBUG - CFLAGS+=-Werror - CFLAGS+=-DCONFIG_BCACHEFS_DEBUG=y -endif - CFLAGS+=-DCONFIG_VALGRIND=y +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" +PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev libkeyutils" ifdef BCACHEFS_FUSE PKGCONFIG_LIBS+="fuse3 >= 3.7" CFLAGS+=-DBCACHEFS_FUSE @@ -60,8 +64,7 @@ endif CFLAGS+=$(PKGCONFIG_CFLAGS) LDLIBS+=$(PKGCONFIG_LDLIBS) - -LDLIBS+=-lm -lpthread -lrt -lscrypt -lkeyutils -laio -ldl +LDLIBS+=-lm -lpthread -lrt -lkeyutils -laio -ldl LDLIBS+=$(EXTRA_LDLIBS) ifeq ($(PREFIX),/usr) @@ -73,14 +76,21 @@ else endif .PHONY: all -all: bcachefs +all: bcachefs lib + +.PHONY: lib +lib: libbcachefs.so .PHONY: tests tests: tests/test_helper .PHONY: check check: tests bcachefs - cd tests; $(PYTEST) +ifneq (,$(PYTEST_CMD)) + $(PYTEST) +else + @echo "WARNING: pytest not found or specified, tests could not be run." +endif .PHONY: TAGS tags TAGS: @@ -89,22 +99,32 @@ TAGS: tags: ctags -R . -SRCS=$(shell find . -type f -iname '*.c') +SRCS=$(shell find . -type f ! -path '*/.*/*' -iname '*.c') DEPS=$(SRCS:.c=.d) -include $(DEPS) OBJS=$(SRCS:.c=.o) bcachefs: $(filter-out ./tests/%.o, $(OBJS)) -MOUNT_SRCS=$(shell find mount/src -type f -iname '*.rs') \ - mount/Cargo.toml mount/Cargo.lock mount/build.rs -libbcachefs_mount.a: $(MOUNT_SRCS) - LIBBCACHEFS_INCLUDE=$(CURDIR) cargo build --manifest-path mount/Cargo.toml --release - cp mount/target/release/libbcachefs_mount.a $@ +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)) -mount.bcachefs: libbcachefs_mount.a $(MOUNT_OBJ) - $(CC) -Wl,--gc-sections libbcachefs_mount.a $(MOUNT_OBJ) -o $@ $(LDLIBS) +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)) @@ -118,13 +138,10 @@ endif # Rebuild the 'version' command any time the version string changes cmd_version.o : .version -doc/bcachefs.5: doc/bcachefs.5.txt - a2x -f manpage doc/bcachefs.5.txt - .PHONY: install install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs -install: 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) @@ -132,21 +149,27 @@ install: bcachefs $(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) bcachefs mount.bcachefs libbcachefs_mount.a tests/test_helper .version $(OBJS) $(DEPS) - $(RM) -rf mount/target + $(RM) bcachefs mount.bcachefs libbcachefs_mount.a tests/test_helper .version $(OBJS) $(DEPS) $(DOCGENERATED) + $(RM) -rf rust-src/*/target .PHONY: deb deb: all -# --unsigned-source --unsigned-changes --no-pre-clean --build=binary -# --diff-ignore --tar-ignore debuild -us -uc -nc -b -i -I -.PHONE: update-bcachefs-sources +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: update-bcachefs-sources update-bcachefs-sources: git rm -rf --ignore-unmatch libbcachefs test -d libbcachefs || mkdir libbcachefs @@ -154,6 +177,10 @@ update-bcachefs-sources: 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/ @@ -162,10 +189,13 @@ update-bcachefs-sources: 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 -.PHONE: update-commit-bcachefs-sources + +.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)"