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