Initramfs script improvements

[bcachefs-tools-debian] / Makefile

diff --git a/Makefile b/Makefile
index a305b4bc0ee011efb93acd8fbd403ee397c11e4b..af7a206c37283409ecbe4481414237da011da741 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,25 @@
 
-PREFIX=/usr
+PREFIX=/usr/local
 INSTALL=install
-CFLAGS+=-std=gnu99 -O2 -g -MMD -Wall                           \
+CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall                           \
        -Wno-pointer-sign                                       \
        -fno-strict-aliasing                                    \
-       -I. -Iinclude -Ilibbcachefs                             \
+       -I. -Iinclude                                           \
        -D_FILE_OFFSET_BITS=64                                  \
        -D_GNU_SOURCE                                           \
        -D_LGPL_SOURCE                                          \
        -DRCU_MEMBARRIER                                        \
-       -DNO_BCACHE_CHARDEV                                     \
-       -DNO_BCACHE_FS                                          \
-       -DNO_BCACHE_SYSFS                                       \
+       -DZSTD_STATIC_LINKING_ONLY                              \
+       -DNO_BCACHEFS_CHARDEV                                   \
+       -DNO_BCACHEFS_FS                                        \
+       -DNO_BCACHEFS_SYSFS                                     \
        $(EXTRA_CFLAGS)
-LDFLAGS+=-O2 -g
+LDFLAGS+=$(CFLAGS)
 
 CC_VERSION=$(shell $(CC) -v 2>&1|grep -E '(gcc|clang) version')
 
 ifneq (,$(findstring gcc,$(CC_VERSION)))
        CFLAGS+=-Wno-unused-but-set-variable
-ifndef D
-       CFLAGS+=-flto
-       LDFLAGS+=-flto
-endif
 endif
 
 ifneq (,$(findstring clang,$(CC_VERSION)))
@@ -31,73 +28,32 @@ endif
 
 ifdef D
        CFLAGS+=-Werror
+       CFLAGS+=-DCONFIG_BCACHEFS_DEBUG=y
 endif
 
 PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib"
+PKGCONFIG_LIBS_STATIC="libzstd"
+
 CFLAGS+=`pkg-config --cflags   ${PKGCONFIG_LIBS}`
-LDLIBS+=`pkg-config --libs     ${PKGCONFIG_LIBS}`              \
-       -lm -lpthread -lrt -lscrypt -lkeyutils -laio
+LDLIBS+=`pkg-config --libs     ${PKGCONFIG_LIBS}`
+
+CFLAGS+=`pkg-config --static --cflags  ${PKGCONFIG_LIBS_STATIC}`
+LDLIBS+=`pkg-config --static --libs    ${PKGCONFIG_LIBS_STATIC}`
+
+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: bcachefs
 
-SRCS=bcachefs.c                                \
-     cmd_assemble.c                    \
-     cmd_debug.c                       \
-     cmd_device.c                      \
-     cmd_fs.c                          \
-     cmd_fsck.c                                \
-     cmd_format.c                      \
-     cmd_key.c                         \
-     cmd_migrate.c                     \
-     cmd_run.c                         \
-     crypto.c                          \
-     libbcachefs.c                     \
-     qcow2.c                           \
-     tools-util.c                      \
-     libbcachefs/alloc.c               \
-     libbcachefs/bkey.c                        \
-     libbcachefs/bkey_methods.c                \
-     libbcachefs/bset.c                        \
-     libbcachefs/btree_cache.c         \
-     libbcachefs/btree_gc.c            \
-     libbcachefs/btree_io.c            \
-     libbcachefs/btree_iter.c          \
-     libbcachefs/btree_update.c                \
-     libbcachefs/buckets.c             \
-     libbcachefs/checksum.c            \
-     libbcachefs/clock.c               \
-     libbcachefs/compress.c            \
-     libbcachefs/debug.c               \
-     libbcachefs/dirent.c              \
-     libbcachefs/error.c               \
-     libbcachefs/extents.c             \
-     libbcachefs/fsck.c                        \
-     libbcachefs/inode.c               \
-     libbcachefs/io.c                  \
-     libbcachefs/journal.c             \
-     libbcachefs/keylist.c             \
-     libbcachefs/migrate.c             \
-     libbcachefs/move.c                        \
-     libbcachefs/movinggc.c            \
-     libbcachefs/opts.c                        \
-     libbcachefs/siphash.c             \
-     libbcachefs/six.c                 \
-     libbcachefs/super.c               \
-     libbcachefs/super-io.c            \
-     libbcachefs/tier.c                        \
-     libbcachefs/trace.c               \
-     libbcachefs/util.c                        \
-     libbcachefs/xattr.c               \
-     $(wildcard linux/*.c linux/*/*.c) \
-     $(wildcard ccan/*/*.c)
-
+SRCS=$(shell find . -type f -iname '*.c')
 DEPS=$(SRCS:.c=.d)
 -include $(DEPS)
 
@@ -111,6 +67,9 @@ install: bcachefs
        $(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
@@ -119,20 +78,18 @@ clean:
 
 .PHONY: deb
 deb: all
-       debuild --unsigned-source       \
-               --unsigned-changes      \
-               --no-pre-clean          \
-               --build=binary          \
-               --diff-ignore           \
-               --tar-ignore
+# --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:
-       echo `cd $(LINUX_DIR); git rev-parse HEAD` > .bcachefs_revision
+       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`"\
-               .bcachefs_revision libbcachefs/
+       git commit -m "Update bcachefs sources to `cd $(LINUX_DIR); git show --oneline --no-patch`"