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