Commit da846b9d authored by Sebastian Krzyszkowiak's avatar Sebastian Krzyszkowiak
Browse files

Merge branch 'recommends' into 'master'

Only disable Recomends in amber-phone

Closes #56

See merge request Librem5/image-builder!180
parents 36df3ba0 ee616b73
......@@ -203,10 +203,6 @@ done
# Setup build environment if we are running in a Laniakea Spark builder nspawn container
[ -z "${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}"
mainimg="${pureos_board}.img"
# remember command line setting
......@@ -223,7 +219,7 @@ _uboot_url="${uboot_url}"
build_auth
[ -n "${debootstrap_dist}" ] || debootstrap_dist="${distro}"
echo "Building ${mainimg} (board_type: ${board_type}, arch: ${arch}, build_type: ${build_type}, ci_pkgs: ${ci_pkgs}, ${debootstrap_dist})"
echo "Building ${mainimg} (board_type: ${board_type}, arch: ${arch}, build_type: ${build_type}, ${debootstrap_dist})"
echo "Installing extra packages ${packages}"
[ -z "${board_packages}" ] || echo "Installing extra board specific packages ${board_packages}"
......@@ -276,7 +272,6 @@ sudo pureos_board="${pureos_board}" \
fdt_file="${fdt_file}" \
build_tarball="${build_tarball}" \
apt_sources="${escaped_apt_sources}" \
ci_pkgs="${ci_pkgs}" \
kernel_deb="${kernel_deb}" \
FK_MACHINE="${fk_machine}" \
use_luks="${use_luks}" \
......
......@@ -14,7 +14,6 @@
# Optional
: "${build_tarball:-}"
: "${ci_pkgs:-}"
: "${fdt_file:-}"
: "${kernel_deb:-}"
: "${patched:-}"
......@@ -27,8 +26,6 @@ basedir="$1"
image_name="$2"
target_qemu="${basedir}/${qemu}"
stamp="${basedir}/var/log/gitrev.log"
ci_repo="${distro}ci"
ci_component=main
luks_pkgs=(osk-sdl cryptsetup-initramfs)
for env_var in distro pureos_board packages; do
......@@ -331,23 +328,14 @@ function setup_apt()
echo "Set sources list to:"
cat "${basedir}/etc/apt/sources.list"
cat << EOF > "${basedir}/etc/apt/apt.conf.d/71-no-recommends"
if [ "$distro" == "amber-phone" ]; then
echo "WARNING: Disabling recommends for amber-phone lagacy distribution"
cat << EOF > "${basedir}/etc/apt/apt.conf.d/71-no-recommends"
APT::Install-Recommends "0";
APT::Install-Suggests "0";
EOF
chroot "${basedir}" apt-get install -y gnupg
if [ "${ci_pkgs}" -gt 0 ]; then
# Backwards compat for buster
if [ "${distro}" == "buster" ]; then
ci_repo=scratch
ci_component=librem5
fi
cat << EOF > "${basedir}/etc/apt/sources.list.d/ci.list"
deb http://ci.puri.sm/ ${ci_repo} ${ci_component}
EOF
chroot "${basedir}" apt-key add - < data/ci-repo.key
fi
chroot "${basedir}" apt-get install -y gnupg
}
......
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