Merge branch 'master' into 'master'

Install unzip in environments where it may be missing

See merge request Librem5/image-builder!108

build-image

@@ -124,6 +124,20 @@ boot-image:
 EOF
 }
 
+setup_laniakea_spark_build() {
+  build_type=plain
+
+  case "$distro" in
+      amber)
+        distro=amber-phone
+      ;;
+      *) echo "Unknown dist"
+      ;;
+  esac
+  apt-get update
+  apt-get -uyq install unzip sudo
+}
+
 cwd=$(pwd)
 
 distro=${DIST:-buster+ci}
@@ -180,6 +194,9 @@ while getopts ":hb:d:T:B" opt; do
   esac
 done
 
+# Setup build environment if we are running in a Laniakea Spark builder nspawn container
+[ -n "${SPARK_ID:-}" ] || setup_laniakea_spark_build
+
 # If distro ends in CI use ci packages and cleanup distro name
 [[ "${distro}" =~ \+ci ]] && ci_pkgs=1 || ci_pkgs=0
 distro="${distro/+ci}"