From cba28a8eb7bc2c6d060af79734012147dd2d8b8d Mon Sep 17 00:00:00 2001 From: Ruledo Date: Tue, 7 Jan 2025 22:27:04 -0800 Subject: [PATCH] Image Builder Fix and Chroot Changes Fix for Image Update not including env changes. Added python-is-python3 python3.10-venv to aid in python development. Added software-properties-common so we can take advantage of the new Meshtastic PPA. --- environment-setup/femtofox.chroot | 4 ++-- environment-setup/foxbuntu-builder.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/environment-setup/femtofox.chroot b/environment-setup/femtofox.chroot index b231965..6dfd6d3 100644 --- a/environment-setup/femtofox.chroot +++ b/environment-setup/femtofox.chroot @@ -27,7 +27,7 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime echo "Installing packages..." apt update -DEBIAN_FRONTEND=noninteractive apt install -y --option Dpkg::Options::="--force-confold" linux-firmware wireless-tools git python3.10-venv libgpiod-dev libyaml-cpp-dev libbluetooth-dev openssl libssl-dev libulfius-dev liborcania-dev evtest screen avahi-daemon protobuf-compiler telnet fonts-noto-color-emoji ninja-build chrony qrencode +DEBIAN_FRONTEND=noninteractive apt install -y --option Dpkg::Options::="--force-confold" linux-firmware wireless-tools git python3.10-venv libgpiod-dev libyaml-cpp-dev libbluetooth-dev openssl libssl-dev libulfius-dev liborcania-dev evtest screen avahi-daemon protobuf-compiler telnet fonts-noto-color-emoji ninja-build chrony qrencode software-properties-common python-is-python3 python3.10-venv if [[ $? -eq 2 ]]; then echo "Error, step failed..."; fi DEBIAN_FRONTEND=noninteractive apt upgrade -y --option Dpkg::Options::="--force-confold" @@ -93,4 +93,4 @@ usermod -a -G dialout femto echo "Cleaning up chroot..." apt clean && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/* && rm -rf /var/tmp/* && find /var/log -type f -exec truncate -s 0 {} + && : > /root/.bash_history && history -c -exit \ No newline at end of file +exit diff --git a/environment-setup/foxbuntu-builder.sh b/environment-setup/foxbuntu-builder.sh index fe00573..5f9d0dd 100644 --- a/environment-setup/foxbuntu-builder.sh +++ b/environment-setup/foxbuntu-builder.sh @@ -227,10 +227,11 @@ inject_chroot() { build_rootfs build_firmware create_image + } - update_image() { + build_env echo "Updating repo..." cd /home/${sudoer}/femtofox git pull