X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=e94419fb021cfc3c654e5d71645f2f89149f6c7f;hb=179ac9ba56d492487b3cebbb9b1f68b7ed270e51;hp=5bd696a2e842b28d336f2aa23ff3b5c5e5f67e70;hpb=f712a866a474d70bfbe3a43aad2b04ceec13ddd3;p=bcachefs-tools-debian diff --git a/Makefile b/Makefile index 5bd696a..e94419f 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +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 \ @@ -21,27 +20,45 @@ 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) + +RST2MAN_ARGS?= +RST2MAN_CMD?=$(shell \ + command -v rst2man \ + || which rst2man \ + || command -v rst2man.py \ + || which rst2man.py \ +) +RST2MAN:=$(RST2MAN_CMD) $(RST2MAN_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 -endif +include Makefile.compiler -ifneq (,$(findstring clang,$(CC_VERSION))) - CFLAGS+=-Wno-missing-braces -endif +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) -ifdef D - CFLAGS+=-Werror - CFLAGS+=-DCONFIG_BCACHEFS_DEBUG=y - CFLAGS+=-DCONFIG_VALGRIND=y -endif - -PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd" +PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev" ifdef BCACHEFS_FUSE - PKGCONFIG_LIBS+="fuse3" + PKGCONFIG_LIBS+="fuse3 >= 3.7" CFLAGS+=-DBCACHEFS_FUSE endif @@ -56,8 +73,7 @@ endif CFLAGS+=$(PKGCONFIG_CFLAGS) LDLIBS+=$(PKGCONFIG_LDLIBS) - -LDLIBS+=-lm -lpthread -lrt -lscrypt -lkeyutils -laio +LDLIBS+=-lm -lpthread -lrt -lkeyutils -laio -ldl LDLIBS+=$(EXTRA_LDLIBS) ifeq ($(PREFIX),/usr) @@ -69,11 +85,21 @@ else endif .PHONY: all -all: bcachefs +all: bcachefs bcachefs.5 lib + +.PHONY: lib +lib: libbcachefs.so + +.PHONY: tests +tests: tests/test_helper .PHONY: check -check: tests/test_helper bcachefs - cd tests; $(PYTEST) +check: tests bcachefs +ifneq (,$(PYTEST_CMD)) + $(PYTEST) +else + @echo "WARNING: pytest not found or specified, tests could not be run." +endif .PHONY: TAGS tags TAGS: @@ -82,6 +108,18 @@ TAGS: tags: ctags -R . +DOCSRC := opts_macro.h bcachefs.5.rst.tmpl +DOCGENERATED := bcachefs.5 doc/bcachefs.5.rst +DOCDEPS := $(addprefix ./doc/,$(DOCSRC)) +bcachefs.5: $(DOCDEPS) libbcachefs/opts.h +ifneq (,$(RST2MAN_CMD)) + $(CC) doc/opts_macro.h -I libbcachefs -I include -E 2>/dev/null \ + | doc/macro2rst.py + $(RST2MAN) doc/bcachefs.5.rst bcachefs.5 +else + @echo "WARNING: no rst2man found! Man page not generated." +endif + SRCS=$(shell find . -type f -iname '*.c') DEPS=$(SRCS:.c=.d) -include $(DEPS) @@ -89,6 +127,26 @@ DEPS=$(SRCS:.c=.d) 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 @@ -104,36 +162,55 @@ cmd_version.o : .version .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) $(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) bcachefs tests/test_helper .version $(OBJS) $(DEPS) + $(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 +.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 libbcachefs/*.[ch] include/trace/events/bcachefs.h .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)"