diff options
| author | Erich Eckner <git@eckner.net> | 2024-10-12 15:37:09 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2024-10-12 15:37:09 +0200 |
| commit | d5d35a5fcf0292ac6ea17bd80928c273a425e6ed (patch) | |
| tree | 13c959074b2eeb9ca501185bd5dddf36db8761a7 /mandos/Makefile.patch | |
| parent | 22b2b16a3c9c265bf0aa2fd6bec251d2fb0f4574 (diff) | |
| download | archlinuxewe-d5d35a5fcf0292ac6ea17bd80928c273a425e6ed.tar.xz | |
mandos: fix bin dir
Diffstat (limited to 'mandos/Makefile.patch')
| -rw-r--r-- | mandos/Makefile.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/mandos/Makefile.patch b/mandos/Makefile.patch new file mode 100644 index 000000000..0933bf670 --- /dev/null +++ b/mandos/Makefile.patch @@ -0,0 +1,69 @@ +--- a/Makefile 2024-09-12 19:13:49.019811600 +0200 ++++ b/Makefile 2024-10-12 15:30:35.826411432 +0200 +@@ -69,6 +69,7 @@ + + ## These settings are for a package-type install + PREFIX:=$(DESTDIR)/usr ++BINDIR:=$(PREFIX)/sbin + CONFDIR:=$(DESTDIR)/etc/mandos + KEYDIR:=$(DESTDIR)/etc/keys/mandos + MANDIR:=$(PREFIX)/share/man +@@ -417,12 +418,12 @@ + install -D --mode=u=rw,go=r sysusers.d-mandos.conf \ + $(SYSUSERS)/mandos.conf; \ + fi +- install --directory $(PREFIX)/sbin +- install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \ ++ install --directory $(BINDIR) ++ install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \ + mandos +- install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \ ++ install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \ + mandos-ctl +- install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \ ++ install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \ + mandos-monitor + install --directory $(CONFDIR) + install --mode=u=rw,go=r --target-directory=$(CONFDIR) \ +@@ -477,8 +478,8 @@ + install --mode=u=rwx,go=rx \ + --target-directory=$(LIBDIR)/mandos \ + mandos-to-cryptroot-unlock +- install --directory $(PREFIX)/sbin +- install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \ ++ install --directory $(BINDIR) ++ install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \ + mandos-keygen + install --mode=u=rwx,go=rx \ + --target-directory=$(LIBDIR)/mandos/plugins.d \ +@@ -544,7 +545,7 @@ + .PHONY: install-client + install-client: install-client-nokey + # Post-installation stuff +- -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)" ++ -$(BINDIR)/mandos-keygen --dir "$(KEYDIR)" + if command -v update-initramfs >/dev/null; then \ + update-initramfs -k all -u; \ + elif command -v dracut >/dev/null; then \ +@@ -562,9 +563,9 @@ + + .PHONY: uninstall-server + uninstall-server: +- -rm --force $(PREFIX)/sbin/mandos \ +- $(PREFIX)/sbin/mandos-ctl \ +- $(PREFIX)/sbin/mandos-monitor \ ++ -rm --force $(BINDIR)/mandos \ ++ $(BINDIR)/mandos-ctl \ ++ $(BINDIR)/mandos-monitor \ + $(MANDIR)/man8/mandos.8.gz \ + $(MANDIR)/man8/mandos-monitor.8.gz \ + $(MANDIR)/man8/mandos-ctl.8.gz \ +@@ -579,7 +580,7 @@ + # to use it. + ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \ + $(DESTDIR)/etc/crypttab +- -rm --force $(PREFIX)/sbin/mandos-keygen \ ++ -rm --force $(BINDIR)/mandos-keygen \ + $(LIBDIR)/mandos/plugin-runner \ + $(LIBDIR)/mandos/plugins.d/password-prompt \ + $(LIBDIR)/mandos/plugins.d/mandos-client \ |