Blame SOURCES/0001-contrib-disable-upstart-kpatch.conf-install.patch

82b65c
From f056d60fb309896a52882fd3fc10fb5305f5a47e Mon Sep 17 00:00:00 2001
82b65c
From: Joe Lawrence <joe.lawrence@redhat.com>
82b65c
Date: Thu, 21 Jun 2018 15:40:20 -0400
82b65c
Subject: [PATCH] contrib: disable upstart kpatch.conf install
82b65c
82b65c
Do not install the upstart configuration file to avoid this rhpkg
82b65c
build complaint:
82b65c
82b65c
  Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/kpatch-0.6.1-1.el7.noarch
82b65c
  error: Installed (but unpackaged) file(s) found:
82b65c
     /etc/init/kpatch.conf
82b65c
      Installed (but unpackaged) file(s) found:
82b65c
     /etc/init/kpatch.conf
82b65c
82b65c
We'll need to think of a better way to do this upstream, but for now,
82b65c
just skip the unneeded file on RHEL.
82b65c
82b65c
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
82b65c
---
82b65c
 contrib/Makefile | 8 ++++----
82b65c
 1 file changed, 4 insertions(+), 4 deletions(-)
82b65c
82b65c
diff --git a/contrib/Makefile b/contrib/Makefile
82b65c
index 0b0eeeb23a56..e873f27d6eae 100644
82b65c
--- a/contrib/Makefile
82b65c
+++ b/contrib/Makefile
82b65c
@@ -6,12 +6,12 @@ install: all
82b65c
 	$(INSTALL) -d $(SYSTEMDDIR)
82b65c
 	$(INSTALL) -m 0644 kpatch.service $(SYSTEMDDIR)
82b65c
 	sed -i 's~PREFIX~$(PREFIX)~' $(SYSTEMDDIR)/kpatch.service
82b65c
-	$(INSTALL) -d $(UPSTARTDIR)
82b65c
-	$(INSTALL) -m 0644 kpatch.conf $(UPSTARTDIR)
82b65c
-	sed -i 's~PREFIX~$(PREFIX)~' $(UPSTARTDIR)/kpatch.conf
82b65c
+#	$(INSTALL) -d $(UPSTARTDIR)
82b65c
+#	$(INSTALL) -m 0644 kpatch.conf $(UPSTARTDIR)
82b65c
+#	sed -i 's~PREFIX~$(PREFIX)~' $(UPSTARTDIR)/kpatch.conf
82b65c
 
82b65c
 uninstall:
82b65c
 	$(RM) $(SYSTEMDDIR)/kpatch.service
82b65c
-	$(RM) $(UPSTARTDIR)/kpatch.conf
82b65c
+#	$(RM) $(UPSTARTDIR)/kpatch.conf
82b65c
 
82b65c
 clean:
82b65c
-- 
82b65c
1.8.3.1
82b65c