Update bcachefs sources to da7fefde29 bcachefs: shim for userspace raid library

[bcachefs-tools-debian] / Makefile

diff --git a/Makefile b/Makefile
index 682bf8e7fa2a5b73dd09adc30faafef86c73b12c..06a826c1f73f39a62777b70d5ada4ad67c46b174 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,100 +1,104 @@
 
-PREFIX=/usr
+PREFIX=/usr/local
 INSTALL=install
-CFLAGS+=-std=gnu99 -O2 -g -MMD -Wall                           \
-       -Wno-unused-but-set-variable                            \
+CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall                           \
        -Wno-pointer-sign                                       \
        -fno-strict-aliasing                                    \
-       -I. -Iinclude -Ilibbcache                               \
+       -I. -Iinclude -Iraid                                    \
        -D_FILE_OFFSET_BITS=64                                  \
        -D_GNU_SOURCE                                           \
        -D_LGPL_SOURCE                                          \
        -DRCU_MEMBARRIER                                        \
-       -DNO_BCACHE_ACCOUNTING                                  \
-       -DNO_BCACHE_BLOCKDEV                                    \
-       -DNO_BCACHE_CHARDEV                                     \
-       -DNO_BCACHE_FS                                          \
-       -DNO_BCACHE_NOTIFY                                      \
-       -DNO_BCACHE_WRITEBACK                                   \
+       -DZSTD_STATIC_LINKING_ONLY                              \
+       -DNO_BCACHEFS_CHARDEV                                   \
+       -DNO_BCACHEFS_FS                                        \
+       -DNO_BCACHEFS_SYSFS                                     \
+       -DVERSION_STRING='"$(VERSION)"'                         \
        $(EXTRA_CFLAGS)
-LDFLAGS+=-O2 -g
+LDFLAGS+=$(CFLAGS)
+
+VERSION?=$(shell git describe --dirty 2>/dev/null || echo 0.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
+
+ifneq (,$(findstring clang,$(CC_VERSION)))
+       CFLAGS+=-Wno-missing-braces
+endif
 
 ifdef D
        CFLAGS+=-Werror
-else
-       CFLAGS+=-flto
-       LDFLAGS+=-flto
+       CFLAGS+=-DCONFIG_BCACHEFS_DEBUG=y
 endif
 
-PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib"
+PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd"
+
 CFLAGS+=`pkg-config --cflags   ${PKGCONFIG_LIBS}`
-LDLIBS+=`pkg-config --libs     ${PKGCONFIG_LIBS}`              \
-       -lm -lpthread -lrt -lscrypt -lkeyutils
+LDLIBS+=`pkg-config --libs     ${PKGCONFIG_LIBS}`
+
+LDLIBS+=-lm -lpthread -lrt -lscrypt -lkeyutils -laio
 
 ifeq ($(PREFIX),/usr)
        ROOT_SBINDIR=/sbin
+       INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools
 else
        ROOT_SBINDIR=$(PREFIX)/sbin
+       INITRAMFS_DIR=/etc/initramfs-tools
 endif
 
 .PHONY: all
-all: bcache
-
-CCANSRCS=$(wildcard ccan/*/*.c)
-CCANOBJS=$(patsubst %.c,%.o,$(CCANSRCS))
-
-# Linux kernel shim:
-LINUX_SRCS=$(wildcard linux/*.c linux/*/*.c)
-LINUX_OBJS=$(LINUX_SRCS:.c=.o)
-
-OBJS=bcache.o                  \
-     bcache-userspace-shim.o   \
-     cmd_assemble.o            \
-     cmd_debug.o               \
-     cmd_device.o              \
-     cmd_fs.o                  \
-     cmd_fsck.o                        \
-     cmd_format.o              \
-     cmd_key.o                 \
-     cmd_migrate.o             \
-     cmd_run.o                 \
-     crypto.o                  \
-     libbcache.o               \
-     qcow2.o                   \
-     tools-util.o              \
-     $(LINUX_OBJS)             \
-     $(CCANOBJS)
-
-DEPS=$(OBJS:.o=.d)
+all: bcachefs
+
+SRCS=$(shell find . -type f -iname '*.c')
+DEPS=$(SRCS:.c=.d)
 -include $(DEPS)
 
-bcache: $(OBJS)
+OBJS=$(SRCS:.c=.o)
+bcachefs: $(OBJS)
+
+# 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)' > $@
+
+# Rebuild the 'version' command any time the version string changes
+cmd_version.o : .version
 
 .PHONY: install
-install: bcache
+install: bcachefs
        mkdir -p $(DESTDIR)$(ROOT_SBINDIR)
        mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8/
-       $(INSTALL) -m0755 bcache        $(DESTDIR)$(ROOT_SBINDIR)
-       $(INSTALL) -m0755 mkfs.bcache   $(DESTDIR)$(ROOT_SBINDIR)
-       $(INSTALL) -m0644 bcache.8      $(DESTDIR)$(PREFIX)/share/man/man8/
+       $(INSTALL) -m0755 bcachefs      $(DESTDIR)$(ROOT_SBINDIR)
+       $(INSTALL) -m0755 fsck.bcachefs $(DESTDIR)$(ROOT_SBINDIR)
+       $(INSTALL) -m0755 mkfs.bcachefs $(DESTDIR)$(ROOT_SBINDIR)
+       $(INSTALL) -m0755 -D initramfs/hook $(DESTDIR)$(INITRAMFS_DIR)/hooks/bcachefs
+       echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_DIR)/hooks/bcachefs
+       $(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_DIR)/scripts/local-premount/bcachefs
+       $(INSTALL) -m0644 bcachefs.8    $(DESTDIR)$(PREFIX)/share/man/man8/
 
 .PHONY: clean
 clean:
-       $(RM) bcache $(OBJS) $(DEPS)
+       $(RM) bcachefs $(OBJS) $(DEPS)
 
 .PHONY: deb
 deb: all
-       debuild --unsigned-source       \
-               --unsigned-changes      \
-               --no-pre-clean          \
-               --build=binary          \
-               --diff-ignore           \
-               --tar-ignore
-
-.PHONE: update-bcache-sources
-update-bcache-sources:
-       echo BCACHE_REVISION=`cd $(LINUX_DIR); git rev-parse HEAD` > .bcache_revision
-       cp $(LINUX_DIR)/drivers/md/bcache/*.[ch] libbcache/
-       cp $(LINUX_DIR)/include/trace/events/bcache.h include/trace/events/
-       cp $(LINUX_DIR)/include/uapi/linux/bcache.h include/linux/
-       cp $(LINUX_DIR)/include/uapi/linux/bcache-ioctl.h include/linux/
+# --unsigned-source --unsigned-changes --no-pre-clean --build=binary
+# --diff-ignore --tar-ignore
+       debuild -us -uc -nc -b -i -I
+
+.PHONE: update-bcachefs-sources
+update-bcachefs-sources:
+       git rm -rf --ignore-unmatch libbcachefs
+       cp $(LINUX_DIR)/fs/bcachefs/*.[ch] libbcachefs/
+       cp $(LINUX_DIR)/include/trace/events/bcachefs.h include/trace/events/
+       echo `cd $(LINUX_DIR); git rev-parse HEAD` > .bcachefs_revision
+       git add libbcachefs/*.[ch] include/trace/events/bcachefs.h .bcachefs_revision
+
+.PHONE: update-commit-bcachefs-sources
+update-commit-bcachefs-sources: update-bcachefs-sources
+       git commit -m "Update bcachefs sources to `cd $(LINUX_DIR); git show --oneline --no-patch`"