Update bcachefs sources to bca25b802d fixup! bcachefs: Fix bch2_check_discard_freespa...

[bcachefs-tools-debian] / Makefile

diff --git a/Makefile b/Makefile
index 443322801fbf679aafc82c769b3c4203d7bf8ec0..c77c0c51c2a0c1be872b5011ffedaca274455aff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,14 +34,6 @@ CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC                   \
        $(EXTRA_CFLAGS)
 LDFLAGS+=$(CFLAGS) $(EXTRA_LDFLAGS)
 
-## Configure Tools
-PYTEST_ARGS?=
-PYTEST_CMD?=$(shell \
-       command -v pytest-3 \
-       || which pytest-3 2>/dev/null \
-)
-PYTEST:=$(PYTEST_CMD) $(PYTEST_ARGS)
-
 CARGO_ARGS=
 CARGO=cargo $(CARGO_ARGS)
 CARGO_PROFILE=release
@@ -82,10 +74,10 @@ 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
 
@@ -99,14 +91,6 @@ debug: bcachefs
 .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
-
 .PHONY: TAGS tags
 TAGS:
        ctags -e -R .
@@ -114,7 +98,7 @@ TAGS:
 tags:
        ctags -R .
 
-SRCS=$(shell find . -type f ! -path '*/.*/*' -iname '*.c')
+SRCS=$(sort $(shell find . -type f ! -path '*/.*/*' -iname '*.c'))
 DEPS=$(SRCS:.c=.d)
 -include $(DEPS)
 
@@ -124,7 +108,15 @@ OBJS=$(SRCS:.c=.o)
        @echo "    [CC]     $@"
        $(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
-bcachefs: libbcachefs.a rust-src/target/release/libbcachefs_rust.a
+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 $@
 
@@ -132,8 +124,8 @@ libbcachefs.a: $(filter-out ./tests/%.o, $(OBJS))
        @echo "    [AR]     $@"
        $(Q)ar -rc $@ $+
 
-RUST_SRCS=$(shell find rust-src/ -type f -iname '*.rs')
-rust-src/target/release/libbcachefs_rust.a: libbcachefs.a $(RUST_SRCS)
+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))
@@ -176,6 +168,10 @@ clean:
 deb: all
        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
@@ -188,8 +184,6 @@ update-bcachefs-sources:
        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/closure.h include/linux/
        git add include/linux/closure.h
        cp $(LINUX_DIR)/lib/closure.c linux/
@@ -214,6 +208,10 @@ update-bcachefs-sources:
        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