X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=61a624558e5876c9ab624699403d67474600037a;hb=119d26bb1088debff3b595d83e1d34916822c616;hp=728bce6da9cf756fd88f072caaeddce9dd50f897;hpb=21ade396535e51503511f42ea06d58e25c0646c5;p=bcachefs-tools-debian diff --git a/Makefile b/Makefile index 728bce6..61a6245 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,26 @@ +VERSION=1.3.3 PREFIX?=/usr/local PKG_CONFIG?=pkg-config INSTALL=install -PYTEST=pytest-3 -CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall \ +LN=ln + +ifeq ("$(origin V)", "command line") + BUILD_VERBOSE = $(V) +endif +ifndef BUILD_VERBOSE + BUILD_VERBOSE = 0 +endif + +ifeq ($(BUILD_VERBOSE),1) + Q = +else + Q = @ +endif + +CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC \ -Wno-pointer-sign \ + -Wno-deprecated-declarations \ -fno-strict-aliasing \ -fno-delete-null-pointer-checks \ -I. -Iinclude -Iraid \ @@ -21,25 +37,29 @@ CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall \ $(EXTRA_CFLAGS) LDFLAGS+=$(CFLAGS) $(EXTRA_LDFLAGS) -VERSION?=$(shell git describe --dirty=+ 2>/dev/null || echo v0.1-nogit) +ifdef CARGO_TOOLCHAIN_VERSION + CARGO_TOOLCHAIN = +$(CARGO_TOOLCHAIN_VERSION) +endif -CC_VERSION=$(shell $(CC) -v 2>&1|grep -E '(gcc|clang) version') +CARGO_ARGS=${CARGO_TOOLCHAIN} +CARGO=cargo $(CARGO_ARGS) +CARGO_PROFILE=release +# CARGO_PROFILE=debug -ifneq (,$(findstring gcc,$(CC_VERSION))) - CFLAGS+=-Wno-unused-but-set-variable -endif +CARGO_BUILD_ARGS=--$(CARGO_PROFILE) +CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS) -ifneq (,$(findstring clang,$(CC_VERSION))) - CFLAGS+=-Wno-missing-braces -endif +include Makefile.compiler -ifdef D - CFLAGS+=-Werror - CFLAGS+=-DCONFIG_BCACHEFS_DEBUG=y - CFLAGS+=-DCONFIG_VALGRIND=y -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) -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 @@ -56,28 +76,27 @@ 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) - 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 .PHONY: all all: bcachefs +.PHONY: debug +debug: CFLAGS+=-Werror -DCONFIG_BCACHEFS_DEBUG=y -DCONFIG_VALGRIND=y +debug: bcachefs + .PHONY: tests tests: tests/test_helper -.PHONY: check -check: tests bcachefs - cd tests; $(PYTEST) - .PHONY: TAGS tags TAGS: ctags -e -R . @@ -85,78 +104,148 @@ TAGS: tags: ctags -R . -SRCS=$(shell find . -type f -iname '*.c') +SRCS=$(sort $(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 $@ +%.o: %.c + @echo " [CC] $@" + $(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< -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) +BCACHEFS_DEPS=libbcachefs.a + +ifndef NO_RUST + BCACHEFS_DEPS+=rust-src/target/release/libbcachefs_rust.a +else + CFLAGS+=-DBCACHEFS_NO_RUST +endif + +bcachefs: $(BCACHEFS_DEPS) + @echo " [LD] $@" + $(Q)$(CC) $(LDFLAGS) -Wl,--whole-archive $+ $(LOADLIBES) -Wl,--no-whole-archive $(LDLIBS) -o $@ + +libbcachefs.a: $(filter-out ./tests/%.o, $(OBJS)) + @echo " [AR] $@" + $(Q)ar -rc $@ $+ + +RUST_SRCS=$(shell find rust-src/src rust-src/bch_bindgen/src -type f -iname '*.rs') +rust-src/target/release/libbcachefs_rust.a: $(RUST_SRCS) + $(CARGO_BUILD) --manifest-path rust-src/Cargo.toml 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 '$(VERSION)' > $@ + @echo " [VERS] $@" + $(Q)echo '$(VERSION)' > $@ # 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) -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) + $(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) .PHONY: clean clean: - $(RM) bcachefs mount.bcachefs libbcachefs_mount.a tests/test_helper .version $(OBJS) $(DEPS) - $(RM) -rf mount/target + @echo "Cleaning all" + $(Q)$(RM) bcachefs libbcachefs.a tests/test_helper .version *.tar.xz $(OBJS) $(DEPS) $(DOCGENERATED) + $(Q)$(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: 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 --manifest-path rust-src/Cargo.toml -Zmsrv-policy + cargo +nightly generate-lockfile --manifest-path rust-src/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/trace/events/bcachefs.h include/trace/events/ - git add include/trace/events/bcachefs.h - 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/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)/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)" + +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