From 370bd6714386ab7b8f55efb9e212c6956e354374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@guh.io>
Date: Mon, 31 Aug 2020 17:15:54 +0200
Subject: [PATCH] Remove deprecated vivid overlays

---
 crossbuilder | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/crossbuilder b/crossbuilder
index 813f6a0..36a8776 100755
--- a/crossbuilder
+++ b/crossbuilder
@@ -367,14 +367,6 @@ shell_container () {
     lxc exec $LXD_CONTAINER -- su --login $USERNAME
 }
 
-enable_overlay_source () {
-    OVERLAY_APT="/etc/apt/sources.list.d/ci-train-ppa-service-ubuntu-stable-phone-overlay-vivid.list"
-    if exec_container_root "grep '#.*deb-src' $OVERLAY_APT" ; then
-        exec_container_root "sed -i 's/#.*deb-src/deb-src/' $OVERLAY_APT"
-        exec_container_root "DEBIAN_FRONTEND=noninteractive apt-get update --allow-unauthenticated"
-    fi
-}
-
 get_source_package () {
     echo "${POSITIVE_COLOR}Downloading source package $PACKAGE for Ubuntu $TARGET_UBUNTU.${NC}"
 
@@ -383,8 +375,6 @@ get_source_package () {
     exec_container_root add-apt-repository --remove --enable-source \"deb file://$SOURCE_REPOSITORY/ /\"
     exec_container_root "sudo rm -f /etc/apt/preferences.d/localrepo.pref"
 
-    enable_overlay_source
-
     if ! lxc exec $LXD_CONTAINER -- su -l -c "cd $MOUNT_POINT; apt-get source --only-source $PACKAGE" $USERNAME ; then
         echo "${ERROR_COLOR}No source package exists with the name $PACKAGE.${NC}"
         echo "${ERROR_COLOR}Deleting container $LXD_CONTAINER.${NC}"
@@ -415,7 +405,6 @@ restore_changelog () {
 ensure_upstream_tarball () {
     if grep quilt debian/source/format > /dev/null 2>&1 ; then
         echo "${POSITIVE_COLOR}Downloading upstream tarball of $PACKAGE in container.${NC}"
-        enable_overlay_source
         # FIXME: try using dget instead so that we can specify a precise version
         exec_container "cd $USERDIR && apt-get source --download-only --allow-unauthenticated $PACKAGE"
     fi