File 0001-Makefile-generate-Dracut-config-according-to-UDEVDIR.patch of Package nvme-cli.18908
From: Haochen Tong <i@hexchain.org> Date: Thu, 9 Jan 2020 20:16:23 +0100 Subject: [PATCH] Makefile: generate Dracut config according to UDEVDIR Git-commit: 797ec651a057935a93319f2a3e082874076b5dfb Signed-off-by: Haochen Tong <i@hexchain.org> --- Makefile | 10 +++++++--- nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf | 1 - nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf create mode 100644 nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in diff --git a/Makefile b/Makefile index 441da6d..03d57d3 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ test: all: doc clean: - $(RM) $(NVME) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) *~ a.out NVME-VERSION-FILE *.tar* nvme.spec version control nvme-*.deb + $(RM) $(NVME) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) *~ a.out NVME-VERSION-FILE *.tar* nvme.spec version control nvme-*.deb 70-nvmf-autoconnect.conf $(MAKE) -C Documentation clean $(RM) tests/*.pyc $(RM) verify-no-dep @@ -128,9 +128,9 @@ install-udev: $(INSTALL) -d $(DESTDIR)$(UDEVDIR)/rules.d $(INSTALL) -m 644 ./nvmf-autoconnect/udev-rules/* $(DESTDIR)$(UDEVDIR)/rules.d -install-dracut: +install-dracut: 70-nvmf-autoconnect.conf $(INSTALL) -d $(DESTDIR)$(DRACUTDIR)/dracut.conf.d - $(INSTALL) -m 644 ./nvmf-autoconnect/dracut-conf/* $(DESTDIR)$(DRACUTDIR)/dracut.conf.d + $(INSTALL) -m 644 $< $(DESTDIR)$(DRACUTDIR)/dracut.conf.d install-zsh-completion: $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/zsh/site-functions @@ -159,6 +159,10 @@ nvme.spec: nvme.spec.in NVME-VERSION-FILE sed -e 's/@@VERSION@@/$(NVME_VERSION)/g' < $< > $@+ mv $@+ $@ +70-nvmf-autoconnect.conf: nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in + sed -e 's#@@UDEVDIR@@#$(UDEVDIR)#g' < $< > $@+ + mv $@+ $@ + dist: nvme.spec git archive --format=tar --prefix=nvme-$(NVME_VERSION)/ HEAD > nvme-$(NVME_VERSION).tar @echo $(NVME_VERSION) > version diff --git a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf deleted file mode 100644 index 844f3d9..0000000 --- a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf +++ /dev/null @@ -1 +0,0 @@ -install_items+="/usr/lib/udev/rules.d/70-nvmf-autoconnect.rules" diff --git a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in new file mode 100644 index 0000000..d1f02fe --- /dev/null +++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in @@ -0,0 +1 @@ +install_items+="@@UDEVDIR@@/rules.d/70-nvmf-autoconnect.rules" -- 2.13.7
