diff --git a/lib/chroot-buildpackages.sh b/lib/chroot-buildpackages.sh index 3c881904be..570d99d787 100644 --- a/lib/chroot-buildpackages.sh +++ b/lib/chroot-buildpackages.sh @@ -26,13 +26,11 @@ create_chroot() declare -A qemu_binary apt_mirror components qemu_binary['armhf']='qemu-arm-static' qemu_binary['arm64']='qemu-aarch64-static' - apt_mirror['jessie']="$DEBIAN_MIRROR" apt_mirror['stretch']="$DEBIAN_MIRROR" apt_mirror['buster']="$DEBIAN_MIRROR" apt_mirror['xenial']="$UBUNTU_MIRROR" apt_mirror['bionic']="$UBUNTU_MIRROR" apt_mirror['disco']="$UBUNTU_MIRROR" - components['jessie']='main,contrib' components['stretch']='main,contrib' components['buster']='main,contrib' components['xenial']='main,universe,multiverse' @@ -89,7 +87,6 @@ chroot_prepare_distccd() local arch=$2 local dest=/tmp/distcc/${release}-${arch} declare -A gcc_version gcc_type - gcc_version['jessie']='4.9' gcc_version['stretch']='6.3' gcc_version['buster']='8.3' gcc_version['xenial']='5.4' diff --git a/lib/configuration.sh b/lib/configuration.sh index acd80d7138..21f7aad2c1 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -102,7 +102,7 @@ if [[ -f $USERPATCHES_PATH/sources/$LINUXFAMILY.conf ]]; then fi # dropbear needs to be configured differently -[[ $CRYPTROOT_ENABLE == yes && ($RELEASE == jessie || $RELEASE == xenial) ]] && exit_with_error "Encrypted rootfs is not supported in Jessie or Xenial" +[[ $CRYPTROOT_ENABLE == yes && $RELEASE == xenial ]] && exit_with_error "Encrypted rootfs is not supported in Xenial" [[ $RELEASE == stretch && $CAN_BUILD_STRETCH != yes ]] && exit_with_error "Building Debian Stretch images with selected kernel is not supported" [[ $RELEASE == bionic && $CAN_BUILD_STRETCH != yes ]] && exit_with_error "Building Ubuntu Bionic images with selected kernel is not supported" @@ -201,14 +201,6 @@ PACKAGE_LIST_DESKTOP_FULL="libreoffice libreoffice-style-tango meld remmina thun # Release specific packages case $RELEASE in - jessie) - DEBOOTSTRAP_COMPONENTS="main" - [[ -z $BUILD_MINIMAL || $BUILD_MINIMAL == no ]] && PACKAGE_LIST_RELEASE=" kbd gnupg2 dirmngr sysbench" - PACKAGE_LIST_DESKTOP+=" paman libgcr-3-common gcj-jre-headless policykit-1-gnome eject numix-icon-theme \ - libgnome2-perl pulseaudio-module-gconf" - PACKAGE_LIST_DESKTOP_SUGGESTS+=" iceweasel pluma system-config-printer leafpad" - ;; - xenial) DEBOOTSTRAP_COMPONENTS="main" [[ -z $BUILD_MINIMAL || $BUILD_MINIMAL == no ]] && PACKAGE_LIST_RELEASE="man-db sysbench" diff --git a/lib/general.sh b/lib/general.sh index d76fcd9ae0..5d9d5a5524 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -122,7 +122,7 @@ get_package_list_hash() # create_sources_list # -# : jessie|stretch|xenial +# : stretch|buster|xenial|bionic|disco # : path to root directory # create_sources_list() @@ -132,7 +132,7 @@ create_sources_list() [[ -z $basedir ]] && exit_with_error "No basedir passed to create_sources_list" case $release in - jessie|stretch|buster) + stretch|buster) cat <<-EOF > $basedir/etc/apt/sources.list deb http://${DEBIAN_MIRROR} $release main contrib non-free #deb-src http://${DEBIAN_MIRROR} $release main contrib non-free diff --git a/lib/main.sh b/lib/main.sh index ed2004b95c..9c6ef92280 100644 --- a/lib/main.sh +++ b/lib/main.sh @@ -273,7 +273,6 @@ fi if [[ $KERNEL_ONLY != yes && -z $RELEASE ]]; then options=() - [[ $EXPERT = yes ]] && options+=("jessie" "Debian 8 Jessie / unsupported") options+=("stretch" "Debian 9 Stretch") options+=("buster" "Debian 10 Buster") options+=("xenial" "Ubuntu Xenial 16.04 LTS") diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh index 0ef1741cd6..22d1c55765 100644 --- a/lib/makeboarddeb.sh +++ b/lib/makeboarddeb.sh @@ -315,11 +315,6 @@ create_board_package() fi case $RELEASE in - jessie) - mkdir -p "${destination}"/etc/NetworkManager/dispatcher.d/ - install -m 755 "${SRC}"/packages/bsp/99disable-power-management "${destination}"/etc/NetworkManager/dispatcher.d/ - ;; - xenial) mkdir -p "${destination}"/usr/lib/NetworkManager/conf.d/ cp "${SRC}"/packages/bsp/zz-override-wifi-powersave-off.conf "${destination}"/usr/lib/NetworkManager/conf.d/