summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-06-15 15:08:59 +0200
committerHolger Levsen <holger@layer-acht.org>2016-06-15 15:08:59 +0200
commitb1cbf59e756d93908d6567162fb6655cbf16ff91 (patch)
tree120a6cb3b2f8efd2ff27d05e370dd826b859d5ae
parentd2b3bd554a26a495edb7954bcb992d8845c1d227 (diff)
downloadjenkins.debian.net-b1cbf59e756d93908d6567162fb6655cbf16ff91.tar.xz
chroot-installation: only install qt3d-opensource-src qtquick1-opensource-src for qt5 jobs on jessie
-rwxr-xr-xbin/chroot-installation.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index 721405ee..ce7a2479 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-opensource-src qtserialport-opensource-src qtsvg-opensource-src qtmultimedia-opensource-src qtenginio-opensource-src qtwebsockets-opensource-src qttranslations-opensource-src qtcreator
+ 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-opensource-src qtmultimedia-opensource-src qtenginio-opensource-src qtwebsockets-opensource-src qttranslations-opensource-src qtcreator $QT_EXTRA
;;
full_desktop) install_packages full_desktop $FULL_DESKTOP
;;