Commit 2db8dc7e authored by Matthias Klumpp's avatar Matthias Klumpp
Browse files

Move Laniakea support to a dedicated setup function

parent e635cfe9
......@@ -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,21 +194,8 @@ while getopts ":hb:d:T:B" opt; do
esac
done
if [ -n "${SPARK_ID:-}" ]; then
# We are running on a Laniakea Spark builder, so
# install a few missing components.
build_type=plain
case "$distro" in
amber)
distro=amber-phone
;;
*) echo "Unknown dist"
;;
esac
apt update
apt -uyq install unzip sudo
fi
# 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
......
Markdown is supported
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