Update bcachefs sources to d82da7126f fixup! bcachefs: for_each_btree_key2()

[bcachefs-tools-debian] / Makefile

diff --git a/Makefile b/Makefile
index d7886276b663e5b1effdca3d10c74b2d2cb52418..bed43bdab229ce15a94b53c0dbc4b0f1235bad16 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PREFIX?=/usr/local
 PKG_CONFIG?=pkg-config
 INSTALL=install
-PYTEST=pytest-3
+
 CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall -fPIC                             \
        -Wno-pointer-sign                                       \
        -fno-strict-aliasing                                    \
@@ -19,6 +19,15 @@ CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall -fPIC                           \
        -DVERSION_STRING='"$(VERSION)"'                         \
        $(EXTRA_CFLAGS)
 LDFLAGS+=$(CFLAGS) $(EXTRA_LDFLAGS)
+
+## Configure Tools
+PYTEST_ARGS?=
+PYTEST_CMD?=$(shell \
+       command -v pytest-3 \
+       || which pytest-3 \
+)
+PYTEST:=$(PYTEST_CMD) $(PYTEST_ARGS)
+
 CARGO_ARGS=
 CARGO=cargo $(CARGO_ARGS)
 CARGO_PROFILE=release
@@ -38,7 +47,7 @@ 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
@@ -55,7 +64,7 @@ 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)
@@ -66,16 +75,8 @@ else
        INITRAMFS_DIR=/etc/initramfs-tools
 endif
 
-RST2MAN:=$(shell command -v rst2man)
-ifeq ($(RST2MAN),)
-       RST2MAN:=$(shell command -v rst2man.py)
-       ifeq ($(RST2MAN),)
-               @echo "WARNING: no rst2man found! Man page not generated."
-       endif
-endif
-
 .PHONY: all
-all: bcachefs bcachefs.5 lib
+all: bcachefs lib
 
 .PHONY: lib
 lib: libbcachefs.so
@@ -85,7 +86,11 @@ 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:
@@ -94,19 +99,7 @@ TAGS:
 tags:
        ctags -R .
 
-DOCSRC := opts_macro.h bcachefs.5.rst.tmpl
-DOCGENERATED := bcachefs.5 doc/bcachefs.5.rst
-DOCDEPS := $(addprefix ./doc/,$(DOCSRC))
-bcachefs.5: $(DOCDEPS)  libbcachefs/opts.h
-ifneq (,$(RST2MAN))
-       $(CC) doc/opts_macro.h -I libbcachefs -I include -E 2>/dev/null \
-               | doc/macro2rst.py
-       $(RST2MAN) doc/bcachefs.5.rst bcachefs.5
-else
-       @echo "WARNING: no rst2man found! Man page not generated."
-endif
-
-SRCS=$(shell find . -type f -iname '*.c')
+SRCS=$(shell find . -type f ! -path '*/.*/*' -iname '*.c')
 DEPS=$(SRCS:.c=.d)
 -include $(DEPS)
 
@@ -156,8 +149,8 @@ install: bcachefs lib
        $(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_SCRIPT)
        $(INSTALL) -m0755 -D initramfs/hook   $(DESTDIR)$(INITRAMFS_HOOK)
        $(INSTALL) -m0755 -D mount.bcachefs.sh $(DESTDIR)$(ROOT_SBINDIR)
-       $(INSTALL) -m0755 -D libbcachefs.so -t $(PREFIX)/lib/
-  
+       $(INSTALL) -m0755 -D libbcachefs.so -t $(DESTDIR)$(PREFIX)/lib/
+
        sed -i '/^# Note: make install replaces/,$$d' $(DESTDIR)$(INITRAMFS_HOOK)
        echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
 
@@ -170,6 +163,12 @@ clean:
 deb: all
        debuild -us -uc -nc -b -i -I
 
+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: update-bcachefs-sources
 update-bcachefs-sources:
        git rm -rf --ignore-unmatch libbcachefs
@@ -190,12 +189,19 @@ update-bcachefs-sources:
        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)/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
 
+
 .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)"