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

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