]> www.infradead.org Git - users/hch/nvme-cli.git/commitdiff
Makefile: generate Dracut config according to UDEVDIR
authorHaochen Tong <i@hexchain.org>
Thu, 9 Jan 2020 19:16:23 +0000 (20:16 +0100)
committerKeith Busch <kbusch@kernel.org>
Thu, 9 Jan 2020 20:02:08 +0000 (13:02 -0700)
Signed-off-by: Haochen Tong <i@hexchain.org>
Makefile
nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf [deleted file]
nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in [new file with mode: 0644]

index 441da6df8b4f18e4c8e1aac307348aa34e9e97e5..03d57d3396e678d845a84db25261db05b5dfa624 100644 (file)
--- 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 (file)
index 844f3d9..0000000
+++ /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 (file)
index 0000000..d1f02fe
--- /dev/null
@@ -0,0 +1 @@
+install_items+="@@UDEVDIR@@/rules.d/70-nvmf-autoconnect.rules"