Replaced mkdir -p with install -D in make install

Also added a comment about the bcachefs utility to the initramfs hook

diff --git a/Makefile b/Makefile
index d64553eab6b1c6d77d6c56c431c5249190b45fd6..d9220b981060106a87921df690087616e22fdc35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,16 +74,17 @@ endif
 cmd_version.o : .version
 
 .PHONY: install
+install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs
+install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs
 install: bcachefs
-       mkdir -p $(DESTDIR)$(ROOT_SBINDIR)
-       mkdir -p $(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/
+       $(INSTALL) -m0755 -D bcachefs      -t $(DESTDIR)$(ROOT_SBINDIR)
+       $(INSTALL) -m0755    fsck.bcachefs    $(DESTDIR)$(ROOT_SBINDIR)
+       $(INSTALL) -m0755    mkfs.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)
+       sed -i '/^# Note: make install replaces/,$$d' $(DESTDIR)$(INITRAMFS_HOOK)
+       echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
 
 .PHONY: clean
 clean:

diff --git a/initramfs/hook b/initramfs/hook
index 404a249911b8ec70d92ed02e0a2f45b739ca8589..c172dbdbbd32bc2dd466bb09436827c852818bda 100755 (executable)
--- a/initramfs/hook
+++ b/initramfs/hook
@@ -22,3 +22,6 @@ manual_add_modules 'bcachefs'
 add_loaded_modules 'chacha20[-_]*'
 add_loaded_modules 'poly1305[-_]*'
 
+# Add the bcachefs utility to the initramfs
+# Note: make install replaces this with the install path, so it must be last
+#copy_exec /usr/local/sbin/bcachefs /sbin/bcachefs