v1.3.6

[bcachefs-tools-debian] / Makefile

diff --git a/Makefile b/Makefile
index fa9f2ff2cf68b08a9cb571b91b9a79a405265361..8b9bcdeeac4ad83049ec79bc3d0d45f2de37a8eb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
-VERSION=1.3.3
+VERSION=1.3.6
 
 PREFIX?=/usr/local
 PKG_CONFIG?=pkg-config
 INSTALL=install
 LN=ln
+.DEFAULT_GOAL=all
 
 ifeq ("$(origin V)", "command line")
   BUILD_VERBOSE = $(V)
@@ -58,6 +59,7 @@ 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)
+CFLAGS+=$(call cc-disable-warning, gnu-variable-sized-type-not-at-end)
 
 PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev libkeyutils udev"
 ifdef BCACHEFS_FUSE
@@ -95,26 +97,37 @@ LIBDIR=$(PREFIX)/lib
 
 PKGCONFIG_SERVICEDIR:=$(shell $(PKG_CONFIG) --variable=systemdsystemunitdir systemd)
 ifeq (,$(PKGCONFIG_SERVICEDIR))
-       $(warning skipping systemd integration)
+  $(warning skipping systemd integration)
 else
 BCACHEFSCK_ARGS=-f -n
 systemd_libfiles=\
-       fsck/bcachefsck_fail
+       fsck/bcachefsck_fail \
+       fsck/bcachefsck_all
 
 systemd_services=\
        fsck/bcachefsck_fail@.service \
        fsck/bcachefsck@.service \
-       fsck/system-bcachefsck.slice
+       fsck/system-bcachefsck.slice \
+       fsck/bcachefsck_all_fail.service \
+       fsck/bcachefsck_all.service \
+       fsck/bcachefsck_all.timer
 
 built_scripts+=\
        fsck/bcachefsck_fail@.service \
-       fsck/bcachefsck@.service
+       fsck/bcachefsck@.service \
+       fsck/bcachefsck_all_fail.service \
+       fsck/bcachefsck_all \
+       fsck/bcachefsck_all.service
 
 %.service: %.service.in
        @echo "    [SED]    $@"
        $(Q)sed -e "s|@libdir@|$(LIBDIR)|g" \
                -e "s|@bcachefsck_args@|$(BCACHEFSCK_ARGS)|g" < $< > $@
 
+fsck/bcachefsck_all: fsck/bcachefsck_all.in
+       @echo "    [SED]    $@"
+       $(Q)sed -e "s|@bcachefsck_args@|$(BCACHEFSCK_ARGS)|g" < $< > $@
+
 optional_build+=$(systemd_libfiles) $(systemd_services)
 optional_install+=install_systemd
 endif  # PKGCONFIG_SERVICEDIR
@@ -257,7 +270,7 @@ update-bcachefs-sources:
        git add include/linux/kmemleak.h
        cp $(LINUX_DIR)/lib/math/int_sqrt.c linux/
        git add linux/int_sqrt.c
-       rm libbcachefs/mean_and_variance_test.c
+       git rm -f libbcachefs/mean_and_variance_test.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/