[omd-commits] OMD Git: omd: thruk: phantomjs -> 2.1.1

git version control git at mathias-kettner.de
Mon Apr 18 13:55:18 CEST 2016


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

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Apr 18 11:24:45 2016 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Apr 18 11:36:41 2016 +0200

thruk: phantomjs -> 2.1.1

---

 Changelog                                             |    1 +
 packages/thruk/Makefile                               |   17 ++++++++++-------
 .../{phantomjs-armv7l => phantomjs-1.9.1-armv7l}      |  Bin 24521228 -> 24521228 bytes
 .../thruk/{phantomjs-i686 => phantomjs-1.9.1-i686}    |  Bin 38825052 -> 38825052 bytes
 .../{phantomjs-x86_64 => phantomjs-1.9.1-x86_64}      |  Bin 38526976 -> 38526976 bytes
 packages/thruk/phantomjs-2.1.1-i686                   |  Bin 0 -> 70678128 bytes
 packages/thruk/phantomjs-2.1.1-x86_64                 |  Bin 0 -> 67932064 bytes
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Changelog b/Changelog
index c9fd3fa..132b9ed 100644
--- a/Changelog
+++ b/Changelog
@@ -33,6 +33,7 @@ This file documents the revision history for the Open Monitoring Distribution
             - Update to version 1.9b3
           - Icinga: Update to 1.13.3
           - Thruk: Update to 2.06
+            - Phantomjs: Update to 2.1.1
           - Added build support for SLES 12 SP1
           - Added build support for Fedora 23
           - nsca: Update to 2.9.1
diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile
index 0990e83..371368c 100644
--- a/packages/thruk/Makefile
+++ b/packages/thruk/Makefile
@@ -31,13 +31,16 @@ install:
 	mv $(DESTDIR)$(OMD_ROOT)/share/thruk/script/thruk $(DESTDIR)$(OMD_ROOT)/bin/thruk
 	chmod 755 $(DESTDIR)$(OMD_ROOT)/bin/thruk
 	chmod 755 $(DESTDIR)$(OMD_ROOT)/bin/naglint
-	if [ `uname -m` = 'x86_64' ]; then \
-		cp -p phantomjs-x86_64 $(DESTDIR)$(OMD_ROOT)/bin/phantomjs; \
-	elif [ `uname -m` = 'armv7l' ]; then \
-		cp -p phantomjs-armv7l   $(DESTDIR)$(OMD_ROOT)/bin/phantomjs; \
-	else \
-		cp -p phantomjs-i686   $(DESTDIR)$(OMD_ROOT)/bin/phantomjs; \
-	fi
+	PHANTOM_VERSION='2.1.1'; ARCH='i686'; \
+		if [ `uname -m` = 'x86_64' ]; then \
+			ARCH='x86_64'; \
+		elif [ `uname -m` = 'armv7l' ]; then \
+			ARCH='armv7l'; \
+		fi; \
+		if [ $(DISTRO_NAME) = "SLES" ] && [ $(DISTRO_VERSION) = "11SP1" ]; then \
+			PHANTOM_VERSION='1.9.1'; \
+		fi; \
+		cp -p phantomjs-$$PHANTOM_VERSION-$$ARCH $(DESTDIR)$(OMD_ROOT)/bin/phantomjs;
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/omd/scripts/post-update
 	install -m 755 thruk.post-update $(DESTDIR)$(OMD_ROOT)/lib/omd/scripts/post-update/thruk
 
diff --git a/packages/thruk/phantomjs-armv7l b/packages/thruk/phantomjs-1.9.1-armv7l
similarity index 100%
rename from packages/thruk/phantomjs-armv7l
rename to packages/thruk/phantomjs-1.9.1-armv7l
diff --git a/packages/thruk/phantomjs-i686 b/packages/thruk/phantomjs-1.9.1-i686
similarity index 100%
rename from packages/thruk/phantomjs-i686
rename to packages/thruk/phantomjs-1.9.1-i686
diff --git a/packages/thruk/phantomjs-x86_64 b/packages/thruk/phantomjs-1.9.1-x86_64
similarity index 100%
rename from packages/thruk/phantomjs-x86_64
rename to packages/thruk/phantomjs-1.9.1-x86_64
diff --git a/packages/thruk/phantomjs-2.1.1-i686 b/packages/thruk/phantomjs-2.1.1-i686
new file mode 100755
index 0000000..2091c11
Binary files /dev/null and b/packages/thruk/phantomjs-2.1.1-i686 differ
diff --git a/packages/thruk/phantomjs-2.1.1-x86_64 b/packages/thruk/phantomjs-2.1.1-x86_64
new file mode 100755
index 0000000..d72e801
Binary files /dev/null and b/packages/thruk/phantomjs-2.1.1-x86_64 differ



More information about the omd-commits mailing list