Minor cleanup in the naming, remove double package installs

intelligent-agent · Dec 29, 2023 · 9c256ec · 9c256ec
1 parent 46d74a5
commit 9c256ec
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 262 deletions.
diff --git a/armbian/customize-image-barebone.sh b/armbian/customize-image-barebone.sh
@@ -16,11 +16,10 @@ RELEASE=$1
 LINUXFAMILY=$2
 BOARD=$3
 BUILD_DESKTOP=$4
-
+PREP_PACKAGE_LIST=""
 ADD_PACKAGE_LIST="avahi-daemon"
 
 source /tmp/overlay/install_components/add_overlays.sh
-source /tmp/overlay/install_components/fix_netplan.sh
 
 post_build() {
     echo "ttyGS0" >> /etc/securetty
@@ -34,7 +33,6 @@ post_build() {
 echo "🍰 Rebuild starting..."
 
 add_overlays
-fix_netplan
 post_build
 
 echo "🍰 Rebuild finished"
diff --git a/armbian/customize-image-fluidd.sh b/armbian/customize-image-fluidd.sh
@@ -16,21 +16,19 @@ RELEASE=$1
 LINUXFAMILY=$2
 BOARD=$3
 BUILD_DESKTOP=$4
-PREP_PACKAGE_LIST="avahi-daemon nginx git unzip \
-                   python3-virtualenv virtualenv python3-dev libffi-dev build-essential \
-                   python3-cffi python3-libxml2 libncurses-dev libusb-dev stm32flash \
-                   libnewlib-arm-none-eabi gcc-arm-none-eabi binutils-arm-none-eabi"
+PREP_PACKAGE_LIST="git unzip"
+ADD_PACKAGE_LIST="avahi-daemon"
 
 source /tmp/overlay/install_components/klipper.sh
 source /tmp/overlay/install_components/moonraker.sh
+source /tmp/overlay/install_components/nginx.sh
 source /tmp/overlay/install_components/fluidd.sh
 source /tmp/overlay/install_components/klipperscreen.sh
 source /tmp/overlay/install_components/recore_binaries.sh
 source /tmp/overlay/install_components/ustreamer.sh
 source /tmp/overlay/install_components/autohotspot.sh
 source /tmp/overlay/install_components/prep_install.sh
 source /tmp/overlay/install_components/add_overlays.sh
-source /tmp/overlay/install_components/fix_netplan.sh
 source /tmp/overlay/install_components/post_build.sh
 
 echo "🍰 Rebuild starting..."
@@ -40,14 +38,13 @@ set -e
 prepare_build
 install_klipper
 install_moonraker "fluidd"
+install_nginx "fluidd"
 install_fluidd
-install_fluidd_nginx
 install_klipperscreen
 install_ustreamer
 install_bins
 install_autohotspot
 add_overlays
-fix_netplan
 post_build
 
 systemctl disable [email protected]

diff --git a/armbian/customize-image-mainsail.sh b/armbian/customize-image-mainsail.sh
@@ -16,37 +16,33 @@ RELEASE=$1
 LINUXFAMILY=$2
 BOARD=$3
 BUILD_DESKTOP=$4
-PREP_PACKAGE_LIST="avahi-daemon nginx git unzip \
-                    python3-virtualenv virtualenv python3-dev libffi-dev \
-                    build-essential python3-cffi python3-libxml2 libncurses-dev\
-                    libusb-dev stm32flash libnewlib-arm-none-eabi gcc-arm-none-eabi\
-                    binutils-arm-none-eabi"
+PREP_PACKAGE_LIST="git unzip"
+ADD_PACKAGE_LIST="avahi-daemon"
 
 source /tmp/overlay/install_components/prep_install.sh
 source /tmp/overlay/install_components/klipper.sh
 source /tmp/overlay/install_components/moonraker.sh
+source /tmp/overlay/install_components/nginx.sh
 source /tmp/overlay/install_components/mainsail.sh
 source /tmp/overlay/install_components/klipperscreen.sh
 source /tmp/overlay/install_components/recore_binaries.sh
 source /tmp/overlay/install_components/ustreamer.sh
 source /tmp/overlay/install_components/autohotspot.sh
 source /tmp/overlay/install_components/post_build.sh
 source /tmp/overlay/install_components/add_overlays.sh
-source /tmp/overlay/install_components/fix_netplan.sh
 
 set -e
 echo "🍰 Rebuild starting..."
 prepare_build
 install_klipper
 install_moonraker "mainsail"
+install_nginx "mainsail"
 install_mainsail
-install_mainsail_nginx
 install_klipperscreen
 install_ustreamer
 install_bins
 install_autohotspot
 add_overlays
-fix_netplan
 post_build
 
 echo "🍰 Rebuild finished"
diff --git a/armbian/customize-image-octoprint.sh b/armbian/customize-image-octoprint.sh
@@ -16,7 +16,8 @@ RELEASE=$1
 LINUXFAMILY=$2
 BOARD=$3
 BUILD_DESKTOP=$4
-PREP_PACKAGE_LIST="avahi-daemon git iptables dnsmasq-base"
+PREP_PACKAGE_LIST="git unzip"
+ADD_PACKAGE_LIST="avahi-daemon"
 
 source /tmp/overlay/install_components/klipper.sh
 source /tmp/overlay/install_components/octoprint.sh
@@ -26,7 +27,6 @@ source /tmp/overlay/install_components/autohotspot.sh
 source /tmp/overlay/install_components/ustreamer.sh
 source /tmp/overlay/install_components/prep_install.sh
 source /tmp/overlay/install_components/add_overlays.sh
-source /tmp/overlay/install_components/fix_netplan.sh
 source /tmp/overlay/install_components/post_build.sh
 
 set -e
@@ -42,7 +42,6 @@ install_ustreamer
 install_bins
 install_autohotspot
 add_overlays
-fix_netplan
 post_build
 
 echo "🍰 Rebuild finished"
diff --git a/userpatches/Dockerfile b/userpatches/Dockerfile
diff --git a/userpatches/README b/userpatches/README
diff --git a/userpatches/Vagrantfile b/userpatches/Vagrantfile
diff --git a/userpatches/overlay/bins/get-recore-revision b/userpatches/overlay/bins/get-recore-revision
@@ -13,4 +13,4 @@ REVISION=$(grep Revision "$CONFIG" | cut -d '"' -f 4 | tr '[:upper:]' '[:lower:]
 
 umount /mnt/config
 losetup -d "$LODEV"
-echo "$REVISION"
+echo "$REVISION"
diff --git a/userpatches/overlay/install_components/fluidd.sh b/userpatches/overlay/install_components/fluidd.sh
@@ -8,11 +8,3 @@ install_fluidd(){
     chown -R debian:debian fluidd
     cp /tmp/overlay/fluidd/fluidd.cfg /home/debian/printer_data/config
 }
-
-install_fluidd_nginx(){
-    cp /tmp/overlay/nginx/upstreams.conf /etc/nginx/conf.d/
-    cp /tmp/overlay/nginx/common_vars.conf /etc/nginx/conf.d/
-    cp /tmp/overlay/nginx/fluidd /etc/nginx/sites-available
-    rm /etc/nginx/sites-enabled/default
-    ln -s /etc/nginx/sites-available/fluidd /etc/nginx/sites-enabled/fluidd
-}
diff --git a/userpatches/overlay/install_components/mainsail.sh b/userpatches/overlay/install_components/mainsail.sh
@@ -9,12 +9,3 @@ install_mainsail(){
     cp /tmp/overlay/mainsail/mainsail.cfg /home/debian/printer_data/config
     rm mainsail.zip
 }
-
-install_mainsail_nginx(){
-    echo "🍰 install Nginx"
-    cp /tmp/overlay/nginx/upstreams.conf /etc/nginx/conf.d/
-    cp /tmp/overlay/nginx/common_vars.conf /etc/nginx/conf.d/
-    cp /tmp/overlay/nginx/mainsail /etc/nginx/sites-available
-    rm /etc/nginx/sites-enabled/default
-    ln -s /etc/nginx/sites-available/mainsail /etc/nginx/sites-enabled/mainsail   
-}
diff --git a/userpatches/overlay/install_components/nginx.sh b/userpatches/overlay/install_components/nginx.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+install_nginx(){
+    UI=$1
+    echo "🍰 install Nginx"
+    apt install -y nginx --no-install-suggests --no-install-recommends
+    cp /tmp/overlay/nginx/upstreams.conf /etc/nginx/conf.d/
+    cp /tmp/overlay/nginx/common_vars.conf /etc/nginx/conf.d/
+    cp /tmp/overlay/nginx/"$UI" /etc/nginx/sites-available
+    rm /etc/nginx/sites-enabled/default
+    ln -s /etc/nginx/sites-available/"$UI" /etc/nginx/sites-enabled/"$UI"
+}