+VERSION=1.3.3
+
PREFIX?=/usr/local
PKG_CONFIG?=pkg-config
INSTALL=install
+LN=ln
ifeq ("$(origin V)", "command line")
BUILD_VERBOSE = $(V)
Q = @
endif
-CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC \
+CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC \
-Wno-pointer-sign \
-Wno-deprecated-declarations \
-fno-strict-aliasing \
$(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)
+ifdef CARGO_TOOLCHAIN_VERSION
+ CARGO_TOOLCHAIN = +$(CARGO_TOOLCHAIN_VERSION)
+endif
-CARGO_ARGS=
+CARGO_ARGS=${CARGO_TOOLCHAIN}
CARGO=cargo $(CARGO_ARGS)
CARGO_PROFILE=release
# CARGO_PROFILE=debug
CARGO_BUILD_ARGS=--$(CARGO_PROFILE)
CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS)
-VERSION?=$(shell git describe --dirty=+ 2>/dev/null || echo v0.1-nogit)
include Makefile.compiler
.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 .
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)
@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 $@
@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))
install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs
install: bcachefs
$(INSTALL) -m0755 -D bcachefs -t $(DESTDIR)$(ROOT_SBINDIR)
- $(INSTALL) -m0755 fsck.bcachefs $(DESTDIR)$(ROOT_SBINDIR)
- $(INSTALL) -m0755 mkfs.bcachefs $(DESTDIR)$(ROOT_SBINDIR)
- $(INSTALL) -m0755 mount.bcachefs $(DESTDIR)$(ROOT_SBINDIR)
$(INSTALL) -m0644 -D bcachefs.8 -t $(DESTDIR)$(PREFIX)/share/man/man8/
$(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_SCRIPT)
$(INSTALL) -m0755 -D initramfs/hook $(DESTDIR)$(INITRAMFS_HOOK)
+ $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mkfs.bcachefs
+ $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/fsck.bcachefs
+ $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mount.bcachefs
+ $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mkfs.fuse.bcachefs
+ $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/fsck.fuse.bcachefs
+ $(LN) -sfr $(DESTDIR)$(ROOT_SBINDIR)/bcachefs $(DESTDIR)$(ROOT_SBINDIR)/mount.fuse.bcachefs
sed -i '/^# Note: make install replaces/,$$d' $(DESTDIR)$(INITRAMFS_HOOK)
echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
doc: bcachefs-principles-of-operation.pdf
+.PHONY: cargo-update-msrv
+cargo-update-msrv:
+ cargo +nightly generate-lockfile --manifest-path rust-src/Cargo.toml -Zmsrv-policy
+ cargo +nightly generate-lockfile --manifest-path rust-src/bch_bindgen/Cargo.toml -Zmsrv-policy
+
.PHONY: update-bcachefs-sources
update-bcachefs-sources:
git rm -rf --ignore-unmatch libbcachefs
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/
git add include/linux/xxhash.h
cp $(LINUX_DIR)/lib/xxhash.c linux/
git add linux/xxhash.c
- cp $(LINUX_DIR)/kernel/locking/six.c linux/
- git add linux/six.c
- cp $(LINUX_DIR)/include/linux/six.h include/linux/
- git add include/linux/six.h
cp $(LINUX_DIR)/include/linux/list_nulls.h include/linux/
git add include/linux/list_nulls.h
cp $(LINUX_DIR)/include/linux/poison.h include/linux/
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
+# 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