File 0002-Makefile-use-UDEVRULESDIR-instead-of-UDEVDIR.patch of Package nvme-cli.18908
From: Hannes Reinecke <hare@suse.de> Date: Thu, 16 Jan 2020 13:57:46 +0100 Subject: [PATCH] Makefile: use UDEVRULESDIR instead of UDEVDIR Git-commit: ab918e9f3825abed66ddeee4ca2e4528b227dd37 The SUSE rpm macros only have UDEVRULESDIR, not UDEVDIR. So introduce a UDEVRULESDIR variable which is preset to UDEVDIR/rules.d Signed-off-by: Hannes Reinecke <hare@suse.de> --- Makefile | 7 ++++--- nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 03d57d3..e63a9cb 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ SBINDIR = $(PREFIX)/sbin LIBDIR ?= $(PREFIX)/lib SYSTEMDDIR ?= $(LIBDIR)/systemd UDEVDIR ?= $(SYSCONFDIR)/udev +UDEVRULESDIR ?= $(UDEVDIR)/rules.d DRACUTDIR ?= $(LIBDIR)/dracut LIB_DEPENDS = @@ -125,8 +126,8 @@ install-systemd: $(INSTALL) -m 644 ./nvmf-autoconnect/systemd/* $(DESTDIR)$(SYSTEMDDIR)/system install-udev: - $(INSTALL) -d $(DESTDIR)$(UDEVDIR)/rules.d - $(INSTALL) -m 644 ./nvmf-autoconnect/udev-rules/* $(DESTDIR)$(UDEVDIR)/rules.d + $(INSTALL) -d $(DESTDIR)$(UDEVRULESDIR) + $(INSTALL) -m 644 ./nvmf-autoconnect/udev-rules/* $(DESTDIR)$(UDEVRULESDIR) install-dracut: 70-nvmf-autoconnect.conf $(INSTALL) -d $(DESTDIR)$(DRACUTDIR)/dracut.conf.d @@ -160,7 +161,7 @@ nvme.spec: nvme.spec.in NVME-VERSION-FILE mv $@+ $@ 70-nvmf-autoconnect.conf: nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in - sed -e 's#@@UDEVDIR@@#$(UDEVDIR)#g' < $< > $@+ + sed -e 's#@@UDEVRULESDIR@@#$(UDEVRULESDIR)#g' < $< > $@+ mv $@+ $@ dist: nvme.spec diff --git a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in index d1f02fe..41ea83c 100644 --- a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in +++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in @@ -1 +1 @@ -install_items+="@@UDEVDIR@@/rules.d/70-nvmf-autoconnect.rules" +install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules" -- 2.13.7
