20 Nov
2018
20 Nov
'18
1:20 a.m.
Module: check_mk
Branch: master
Commit: 8b4135bb45515cdda97136bf673123da53e342b5
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b4135bb45515c…
Author: Alex Zurhake <az(a)mathias-kettner.de>
Date: Tue Nov 20 07:09:58 2018 +0100
add missing skel: to all <packages>.make
Change-Id: I3fd4d0a0e422fce3deb822da7036e6ee644607f5
---
omd/packages/Python/Python.make | 9 +++------
omd/packages/icinga/icinga.make | 2 ++
omd/packages/nagios/nagios.make | 2 ++
omd/packages/nagvis/nagvis.make | 2 ++
omd/packages/pnp4nagios/pnp4nagios.make | 2 ++
omd/packages/re2/re2.make | 4 +++-
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/omd/packages/Python/Python.make b/omd/packages/Python/Python.make
index 0797bcf..9a1d177 100644
--- a/omd/packages/Python/Python.make
+++ b/omd/packages/Python/Python.make
@@ -11,12 +11,7 @@ PYTHON_INSTALL = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-install
PYTHON_PATCHING = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-patching
-.PHONY: python python-install python-clean upstream
-
-python-debug:
- echo $(PYTHON_BUILD)
- echo $(PYTHON)
- echo $(PYTHON_VERS)
+.PHONY: python python-install python-skel python-clean upstream
python: $(PYTHON_BUILD)
@@ -116,6 +111,8 @@ bin/g++:
install -m 644 $(PACKAGE_DIR)/$(PYTHON)/sitecustomize.py
$(PACKAGE_DIR)/$(PYTHON)/sitecustomize.pyc $(DESTDIR)$(OMD_ROOT)/lib/python2.7/
$(TOUCH) $(PYTHON_INSTALL)
+pyhton-skel:
+
python-clean:
$(RM) -r $(DIR) $(BUILD_HELPER_DIR)/$(MSITOOLS)* bin build $(PACKAGE_PYTHON_DESTDIR)
diff --git a/omd/packages/icinga/icinga.make b/omd/packages/icinga/icinga.make
index 5b17c85..6a94945 100644
--- a/omd/packages/icinga/icinga.make
+++ b/omd/packages/icinga/icinga.make
@@ -64,5 +64,7 @@ $(ICINGA_INSTALL): $(ICINGA_BUILD)
$(RM) -r $(DESTDIR)/usr
$(TOUCH) $@
+icinga-skel:
+
icinga-clean:
$(RM) -r $(ICINGA_DIR)
diff --git a/omd/packages/nagios/nagios.make b/omd/packages/nagios/nagios.make
index 0a6222d..e83a3a6 100644
--- a/omd/packages/nagios/nagios.make
+++ b/omd/packages/nagios/nagios.make
@@ -74,6 +74,8 @@ $(NAGIOS_INSTALL):
install -m 644 $(PACKAGE_DIR)/$(NAGIOS)/diskspace
$(DESTDIR)$(OMD_ROOT)/share/diskspace/nagios
$(TOUCH) $@
+$(NAGIOS)-skel:
+
$(NAGIOS)-clean:
rm -rf $(NAGIOS_DIR) $(BUILD_HELPER_DIR)/$(NAGIOS)*
diff --git a/omd/packages/nagvis/nagvis.make b/omd/packages/nagvis/nagvis.make
index 1ddedb9..8854dfa 100644
--- a/omd/packages/nagvis/nagvis.make
+++ b/omd/packages/nagvis/nagvis.make
@@ -53,5 +53,7 @@ $(NAGVIS_INSTALL): $(NAGVIS_BUILD)
$(RM) -rf $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc
$(TOUCH) $@
+$(NAGVIS)-skel:
+
$(NAGVIS)-clean:
$(RM) -r $(NAGVIS)-*.*.[0-9] $(NAGVIS)-*.*-nightly $(BUILD_HELPER_DIR)/$(NAGVIS)*
diff --git a/omd/packages/pnp4nagios/pnp4nagios.make
b/omd/packages/pnp4nagios/pnp4nagios.make
index 6648054..2cb40c4 100644
--- a/omd/packages/pnp4nagios/pnp4nagios.make
+++ b/omd/packages/pnp4nagios/pnp4nagios.make
@@ -70,5 +70,7 @@ $(PNP4NAGIOS_INSTALL): $(PNP4NAGIOS_BUILD)
install -m 644 $(PACKAGE_DIR)/$(PNP4NAGIOS)/ui-facelift/images/*
$(DESTDIR)$(OMD_ROOT)/share/pnp4nagios/htdocs/media/css/ui-facelift/images
$(TOUCH) $@
+$(PNP4NAGIOS)-skel:
+
$(PNP4NAGIOS)-clean:
rm -rf $(PNP4NAGIOS_DIR) $(BUILD_HELPER_DIR)/$(PNP4NAGIOS_DIR)*
diff --git a/omd/packages/re2/re2.make b/omd/packages/re2/re2.make
index 460e210..077683a 100644
--- a/omd/packages/re2/re2.make
+++ b/omd/packages/re2/re2.make
@@ -8,7 +8,7 @@ RE2_DIR := $(RE2)-$(RE2_VERS)
RE2_BUILD := $(BUILD_HELPER_DIR)/$(RE2_DIR)-build
RE2_UNPACK := $(BUILD_HELPER_DIR)/$(RE2_DIR)-unpack
-.PHONY: $(RE2) $(RE2)-install $(RE2)-clean
+.PHONY: $(RE2) $(RE2)-install $(RE2)-skel $(RE2)-clean
$(RE2): $(RE2_BUILD)
@@ -40,5 +40,7 @@ $(RE2_BUILD): $(RE2_UNPACK)
$(RM) $(PACKAGE_RE2_DESTDIR)/lib/*.so*
$(TOUCH) $@
+$(RE2)-skel:
+
$(RE2)-clean:
$(RM) -r $(RE2_DIR) $(PACKAGE_RE2_DESTDIR) $(BUILD_HELPER_DIR)/$(RE2)*