[Qa-jenkins-scm] [jenkins.debian.net] 01/01: chroot-installation: only install qt3d-opensource-src qtquick1-opensource-src for qt5 jobs on jessie

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit b1cbf59e756d93908d6567162fb6655cbf16ff91
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Jun 15 15:08:59 2016 +0200

    chroot-installation: only install qt3d-opensource-src qtquick1-opensource-src for qt5 jobs on jessie
---
 bin/chroot-installation.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index 721405e..ce7a247 100755
--- a/bin/chroot-installation.sh
+++ b/bin/chroot-installation.sh
@@ -240,7 +240,14 @@ if [ "$2" != "" ] ; then
 				;;
 		qt4)		install_binary_packages qt4 qt4-x11 qtwebkit
 				;;
-		qt5)		install_binary_packages qt5 qtbase-opensource-src qtchooser qtimageformats-opensource-src qtx11extras-opensource-src qtscript-opensource-src qtxmlpatterns-opensource-src qtdeclarative-opensource-src qtconnectivity-opensource-src qtsensors-opensource-src qt3d-opensource-src qtlocation-opensource-src qtwebkit-opensource-src qtquick1-opensource-src qtwebkit-examples-opensource-src qttools-opensource-src qtdoc-opensource-src qtgraphicaleffects-opensource-src qtquickcontrols-opensourc [...]
+		qt5)		# qt5 is >=jessie…
+				if [ "$DISTRO" = "jessie" ] ; then
+					# only in jessie, removed for stretch
+					QT_EXTRA="qt3d-opensource-src qtquick1-opensource-src"
+				else
+					QT_EXTRA=""
+				fi
+				install_binary_packages qt5 qtbase-opensource-src qtchooser qtimageformats-opensource-src qtx11extras-opensource-src qtscript-opensource-src qtxmlpatterns-opensource-src qtdeclarative-opensource-src qtconnectivity-opensource-src qtsensors-opensource-src qtlocation-opensource-src qtwebkit-opensource-src qtwebkit-examples-opensource-src qttools-opensource-src qtdoc-opensource-src qtgraphicaleffects-opensource-src qtquickcontrols-opensource-src qtserialport-opensource-src qtsvg-opensour [...]
 				;;
 		full_desktop)	install_packages full_desktop $FULL_DESKTOP
 				;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git