diff --git a/scripts/bootstrap-to-docker.sh b/scripts/bootstrap-to-docker.sh index 1d06d34..cc700b8 100755 --- a/scripts/bootstrap-to-docker.sh +++ b/scripts/bootstrap-to-docker.sh @@ -36,14 +36,14 @@ if test -z "$archs"; then fi done fi -excludes="precise-armhf" +excludes="precise-armhf stretch-armhf" no_universe="jessie sid wheezy" -ubuntu_qt5="zesty yakkety xenial wily vivid trusty" +ubuntu_qt5="yakkety xenial wily vivid trusty" ubuntu_qt4="precise" -debian_qt5="jessie sid" +debian_qt5="stretch jessie sid" debian_qt4="wheezy" -# not yet successfully installable: debian stretch and buster +# not yet successfully installable: ubuntu zesty, debian buster ubuntu=("${ubuntu_qt5}" "${ubuntu_qt4}") debian=("${debian_qt5}" "${debian_qt4}") @@ -52,7 +52,9 @@ distros=(${distros:-"${ubuntu[@]}" "${debian[@]}"}) packages_qt5="libpoppler-qt5-dev libpodofo-dev libqt5designer5 libqt5svg5-dev libqt5webkit5-dev qt5-default qt5-qmake qtbase5-dev qtbase5-dev-tools qttools5-dev qttools5-dev-tools" packages_qt4="libqt4-core libqt4-designer libqt4-dev libqt4-webkit qt4-dev-tools qt4-qmake" # |libqtcore4 |libqtwebkit-dev |libp11-kit-dev|libgnutls-dev -packages_base="apt-transport-https automake autotools-dev binutils-dev debhelper default-jdk-headless doxygen dpkg-dev g++ git graphviz libboost-thread-dev libcppunit-dev liblog4cxx-dev libpcsclite-dev libpkcs11-helper1-dev libproxy-dev libssl-dev libtool libz-dev lsb-release mscgen nodejs pandoc pkg-config software-properties-common subversion subversion-tools texinfo xvfb" +packages_base="apt-transport-https automake autotools-dev binutils-dev debhelper default-jdk-headless doxygen dpkg-dev g++ git graphviz libboost-thread-dev libcppunit-dev liblog4cxx-dev libpcsclite-dev libpkcs11-helper1-dev libproxy-dev libssl-dev libtool libz-dev lsb-release mscgen nodejs pandoc pkg-config software-properties-common subversion subversion-tools xvfb texinfo" +package_not_in_stretch="libssl-dev" +package_not_in_zesty="texinfo" #package_not_in_yakkety="default-jdk-headless" package_not_in_wily="default-jdk-headless" package_not_in_vivid="default-jdk-headless liblog4cxx-dev"