Merge branch 'amber-phone-build' into 'master'

Make amber-phone images possible right now

See merge request Librem5/image-builder!134

conf/dists/amber-phone

@@ -3,5 +3,8 @@ 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

@@ -293,6 +293,17 @@ EOF
     fi
 }
 
+function workaround_pureos_transitions()
+{
+    # Remove the bootstrap workaround so users
+    # only get properly transitioned packages
+    if [ "${distro}" == "amber-phone" ]; then
+	echo "Using 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()
 {
@@ -328,6 +339,7 @@ setup_locale
 setup_gui
 setup_journal
 setup_sshd
+workaround_pureos_transitions
 
 setup_kernel
 case "${pureos_board}" in