Correct debootstrap debs, correct install package usage of package_lists

This commit is contained in:
Hal Emmerich 2020-06-18 22:50:20 -05:00
parent 350f80361a
commit c81c4ba430
2 changed files with 4 additions and 3 deletions

View File

@ -39,10 +39,10 @@ dpkg-reconfigure tzdata
#Install shared packages #Install shared packages
DEBIAN_FRONTEND=noninteractive apt install -y ${base_debs_download[@]} DEBIAN_FRONTEND=noninteractive apt install -y ${base_debs_download[@]}
DEBIAN_FRONTEND=noninteractive apt install -y ${mesa_debs_download[@]} DEBIAN_FRONTEND=noninteractive apt install -y ${mesa_debs_download[@]}
DEBIAN_FRONTEND=noninteractive apt install -y ${prawnos_debs_prebuilt[@]} DEBIAN_FRONTEND=noninteractive apt install -y ${prawnos_base_debs_prebuilt_download[@]}
[ "$DE" = "gnome" ] && apt install -y ${gnome_debs_download[@]} [ "$DE" = "gnome" ] && apt install -y ${gnome_debs_download[@]}
[ "$DE" = "xfce" ] && apt install -y ${xfce_debs_download[@]} [ "$DE" = "xfce" ] && apt install -y ${xfce_debs_download[@]} ${prawnos_base_debs_prebuilt_install[@]}
[ "$DE" = "lxqt" ] && apt install -y ${lxqt_debs_download[@]} [ "$DE" = "lxqt" ] && apt install -y ${lxqt_debs_download[@]}
#install the keymap by patching xkb, then bindings work for any desktop environment #install the keymap by patching xkb, then bindings work for any desktop environment

View File

@ -123,8 +123,9 @@ fi
# install Debian on it # install Debian on it
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
# need ca-certs, gnupg, openssl to handle https apt links and key adding for deb.prawnos.com # need ca-certs, gnupg, openssl to handle https apt links and key adding for deb.prawnos.com
printf -v debootstrap_debs_install_joined '%s,' "${debootstrap_debs_install[@]}"
qemu-debootstrap --arch armhf $DEBIAN_SUITE \ qemu-debootstrap --arch armhf $DEBIAN_SUITE \
--include ${base_debs_download[@]} \ --include ${debootstrap_debs_install_joined%,} \
--keyring=$build_resources/debian-archive-keyring.gpg \ --keyring=$build_resources/debian-archive-keyring.gpg \
$outmnt \ $outmnt \
$PRAWNOS_DEBOOTSTRAP_MIRROR \ $PRAWNOS_DEBOOTSTRAP_MIRROR \