Commit 27684d05 authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'master' into 'master'

Install unzip in environments where it may be missing

See merge request Librem5/image-builder!108
parents 0311e5e0 2db8dc7e
......@@ -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}"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment