Merge branch 'drop-fastlane-workaround' into 'master'

Revert "Make amber-phone images possible right now"

See merge request Librem5/image-builder!147

conf/dists/amber-phone

@@ -3,8 +3,5 @@ apt_sources="deb https://repo.pureos.net/pureos amber main
 deb https://repo.pureos.net/pureos amber-updates main
 deb https://repo.pureos.net/pureos amber-security main
 deb https://repo.pureos.net/pureos amber-phone main
-
-deb https://repo.pureos.net/pureos amber-phone-staging main
-deb https://repo.pureos.net/pureos amber-proposed-updates main
 "
 debootstrap_dist=amber

root.sh

@@ -305,17 +305,6 @@ EOF
     fi
 }
 
-function workaround_pureos_transitions()
-{
-    # Remove the bootstrap workaround so users
-    # only get properly transitioned packages
-    if [ "${distro}" == "amber-phone" ]; then
-	echo "Remove amber-phone boostrap hack"
-	grep -v -E 'amber-phone-staging|amber-proposed-updates' "${basedir}/etc/apt/sources.list" > "${basedir}/etc/apt/sources.list.tmp"
-	mv -f "${basedir}/etc/apt/sources.list.tmp" "${basedir}/etc/apt/sources.list"
-	cat "${basedir}/etc/apt/sources.list"
-    fi
-}
 
 function create_report()
 {
@@ -352,7 +341,6 @@ setup_gui
 setup_journal
 setup_sshd
 setup_logins
-workaround_pureos_transitions
 
 setup_kernel
 case "${pureos_board}" in