diff options
| author | Tim Schlueter <schlueter.tim@linux.com> | 2019-01-13 18:47:41 -0800 |
|---|---|---|
| committer | Tim Schlueter <schlueter.tim@linux.com> | 2019-01-13 19:31:04 -0800 |
| commit | bdeffdf3c71eedd99ec275b9cf7b117f8585e37e (patch) | |
| tree | e434b9783a96480fbbf59dbb669a3210623bb290 | |
| parent | 079e6ab647649d03f9eb6feda33802b3d2fa8317 (diff) | |
Replaced mkdir -p with install -D in make install
Also added a comment about the bcachefs utility to the initramfs hook
| -rw-r--r-- | Makefile | 19 | ||||
| -rwxr-xr-x | initramfs/hook | 3 |
2 files changed, 13 insertions, 9 deletions
@@ -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 404a2499..c172dbdb 100755 --- 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 |