[omd-commits] OMD Git: omd: centos needs php during build already

git version control git at mathias-kettner.de
Fri Sep 6 16:32:19 CEST 2013


Module:   omd
Branch:   master
Commit:   c7d9d6190ad3f79ac5286f73487ab72ec5a772f0
URL:      http://omdistro.org/projects/omd/repository/revisions/c7d9d6190ad3f79ac5286f73487ab72ec5a772f0

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Fri Sep  6 15:40:37 2013 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Fri Sep  6 16:32:07 2013 +0200

centos needs php during build already

---

 distros/Makefile.CENTOS_6.0  |    1 +
 distros/Makefile.CENTOS_6.1  |    1 +
 distros/Makefile.CENTOS_6.2  |    1 +
 distros/Makefile.CENTOS_6.3  |    1 +
 distros/Makefile.CENTOS_6.4  |    1 +
 packages/apache-omd/Makefile |    2 +-
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/distros/Makefile.CENTOS_6.0 b/distros/Makefile.CENTOS_6.0
index 0041e21..59c3eda 100644
--- a/distros/Makefile.CENTOS_6.0
+++ b/distros/Makefile.CENTOS_6.0
@@ -21,6 +21,7 @@ BUILD_PACKAGES   += net-snmp-utils
 BUILD_PACKAGES   += openssl-devel
 BUILD_PACKAGES   += pango-devel
 BUILD_PACKAGES   += patch
+BUILD_PACKAGES   += php
 BUILD_PACKAGES   += python-devel
 BUILD_PACKAGES   += readline-devel
 BUILD_PACKAGES   += compat-readline5
diff --git a/distros/Makefile.CENTOS_6.1 b/distros/Makefile.CENTOS_6.1
index 0c7b0ee..05567b8 100644
--- a/distros/Makefile.CENTOS_6.1
+++ b/distros/Makefile.CENTOS_6.1
@@ -24,6 +24,7 @@ BUILD_PACKAGES   += net-snmp-utils
 BUILD_PACKAGES   += openssl-devel
 BUILD_PACKAGES   += pango-devel
 BUILD_PACKAGES   += patch
+BUILD_PACKAGES   += php
 BUILD_PACKAGES   += python-devel
 BUILD_PACKAGES   += readline-devel
 BUILD_PACKAGES   += compat-readline5
diff --git a/distros/Makefile.CENTOS_6.2 b/distros/Makefile.CENTOS_6.2
index 8963bfe..3238c61 100644
--- a/distros/Makefile.CENTOS_6.2
+++ b/distros/Makefile.CENTOS_6.2
@@ -24,6 +24,7 @@ BUILD_PACKAGES   += net-snmp-utils
 BUILD_PACKAGES   += openssl-devel
 BUILD_PACKAGES   += pango-devel
 BUILD_PACKAGES   += patch
+BUILD_PACKAGES   += php
 BUILD_PACKAGES   += python-devel
 BUILD_PACKAGES   += readline-devel
 BUILD_PACKAGES   += compat-readline5
diff --git a/distros/Makefile.CENTOS_6.3 b/distros/Makefile.CENTOS_6.3
index 2d4d9c4..d12f077 100644
--- a/distros/Makefile.CENTOS_6.3
+++ b/distros/Makefile.CENTOS_6.3
@@ -24,6 +24,7 @@ BUILD_PACKAGES   += net-snmp-utils
 BUILD_PACKAGES   += openssl-devel
 BUILD_PACKAGES   += pango-devel
 BUILD_PACKAGES   += patch
+BUILD_PACKAGES   += php
 BUILD_PACKAGES   += python-devel
 BUILD_PACKAGES   += readline-devel
 BUILD_PACKAGES   += compat-readline5
diff --git a/distros/Makefile.CENTOS_6.4 b/distros/Makefile.CENTOS_6.4
index 32a9f54..cf7c841 100644
--- a/distros/Makefile.CENTOS_6.4
+++ b/distros/Makefile.CENTOS_6.4
@@ -24,6 +24,7 @@ BUILD_PACKAGES   += net-snmp-utils
 BUILD_PACKAGES   += openssl-devel
 BUILD_PACKAGES   += pango-devel
 BUILD_PACKAGES   += patch
+BUILD_PACKAGES   += php
 BUILD_PACKAGES   += python-devel
 BUILD_PACKAGES   += readline-devel
 BUILD_PACKAGES   += compat-readline5
diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile
index 7bad66b..69e99e5 100644
--- a/packages/apache-omd/Makefile
+++ b/packages/apache-omd/Makefile
@@ -42,7 +42,7 @@ install: $(APACHE_MODULES_INSTALL)
 
 skel:
 	if [ $(CENTOS_WORKAROUND) -eq 1 ]; then \
-		cp /etc/php.ini $(SKEL)/etc/apache/php.ini; \
+		cp /etc/php.ini $(SKEL)/etc/apache/php.ini || exit 1; \
 		echo -e "\n\n; OMD OMD OMD OMD OMD OMD\n\nmemory_limit=64M\n\n[Session]\nsession.save_path=###ROOT###/tmp/php/session\nupload_tmp_dir=###ROOT###/tmp/php/upload\nsoap.wsdl_cache_dir=###ROOT###/tmp/php/wsdl-cache\n" >> $(SKEL)/etc/apache/php.ini; \
 	fi
 



More information about the omd-commits mailing list