feat: add orange pi zero2

config/armbian/default

@@ -23,7 +23,7 @@ BASE_IMAGE_RESIZEROOT=600
 # Compress not needed due compression done in workflow
 BASE_RELEASE_COMPRESS=no
 # Modules are valid for 32bit and 64bit images
-MODULES="base,pkgupgrade,armbian(armbian_net,opiconfig,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar)"
+MODULES="base,armbian_pkgupgrade,armbian(armbian_net,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar)"
 
 # export Variables
 export DOWNLOAD_BASE_URL

config/orangepi/default

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Shebang for better file detection
+
+# Declare Variables before exporting.
+# See https://www.shellcheck.net/wiki/SC2155
+
+# Download Base Url
+DOWNLOAD_BASE_URL="https://github.com/mainsail-crew/armbian-builds/releases/latest/download"
+
+# Base User
+BASE_ADD_USER="yes"
+BASE_USER="pi"
+BASE_USER_PASSWORD="armbian"
+
+# Needed while building for non rpi sbc
+BASE_DISTRO="armbian"
+BASE_IMAGE_RASPBIAN="no"
+
+# partition resizing
+BASE_ROOT_PARTITION="2"
+BASE_IMAGE_ENLARGEROOT=2500
+BASE_IMAGE_RESIZEROOT=600
+# Compress not needed due compression done in workflow
+BASE_RELEASE_COMPRESS=no
+# Modules are valid for 32bit and 64bit images
+MODULES="base,pkgupgrade,orangepi(orangepi_net,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar)"
+
+# export Variables
+export DOWNLOAD_BASE_URL
+export BASE_ADD_USER
+export BASE_USER
+export BASE_USER_PASSWORD
+export BASE_DISTRO
+export BASE_IMAGE_RASPBIAN
+export BASE_ROOT_PARTITION
+export BASE_IMAGE_ENLARGEROOT
+export BASE_IMAGE_RESIZEROOT
+export BASE_RELEASE_COMPRESS
+export MODULES

config/orangepi/orangepi_zero2

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Shebang for better file detection
+# shellcheck enable=require-variable-braces
+
+BASE_ARCH="arm64"
+
+# Image source
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/orangepi-orangepi_zero2.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/orangepi-orangepi_zero2.img.xz"
+
+# export Variables
+export BASE_ARCH
+export DOWNLOAD_URL_CHECKSUM
+export DOWNLOAD_URL_IMAGE

src/modules/armbian/config

@@ -1,5 +1,18 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# Shebang for better file detection
+#### MainsailOS Specific Tweaks for armbian images
+####
+#### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
+#### Copyright 2023 - till today
+#### https://github.com/mainsail-crew/MainsailOS
+####
+#### This File is distributed under GPLv3
+####
+
 # shellcheck disable=all
 
-[ -n "$ARMBIAN_DEPS" ] || ARMBIAN_DEPS="armbian-config avahi-daemon iptables \
+[[ -n "$ARMBIAN_DEPS" ]] || ARMBIAN_DEPS="armbian-config avahi-daemon iptables \
 bash-completion"
+[[ -n "$ARMBIAN_CONFIG_TXT_FILE" ]] || ARMBIAN_CONFIG_TXT_FILE="/boot/armbianEnv.txt"
+[[ -n "$ARMBIAN_CONFIG_BAK_FILE" ]] || ARMBIAN_CONFIG_BAK_FILE="/boot/armbianEnv.txt.backup"
+[[ -n "$ARMBIAN_MODULES_FILE" ]] || ARMBIAN_MODULES_FILE="/etc/modules"

src/modules/armbian/end_chroot_script

@@ -1,31 +1,49 @@
 #!/usr/bin/env bash
-# MainsailOS Specific Tweaks for armbian images
-# written by Stephan Wendel aka KwadFan
-# <me@stephanwe.de>
-# GPL V3
-########
+#### MainsailOS Specific Tweaks for armbian images
+####
+#### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
+#### Copyright 2023 - till today
+#### https://github.com/mainsail-crew/MainsailOS
+####
+#### This File is distributed under GPLv3
+####
 
-## functions
+# shellcheck enable=require-variable-braces
+# Source error handling, leave this in place
+set -Ee
+
+# Source CustomPIOS common.sh
+# shellcheck disable=SC1091
+source /common.sh
+install_cleanup_trap
+
+## Helper functions
 gen_root_pw() {
     tr -dc "[:alnum:]" < /dev/urandom | head -c 50
 }
 
-# Clean up
-# Remove autologin and lock root account
-if [ -f "/etc/systemd/system/getty@.service.d/override.conf" ]; then
+## Clean up
+## Step 1: Remove autologin and lock root account
+if [[ -f "/etc/systemd/system/getty@.service.d/override.conf" ]]; then
     rm -f /etc/systemd/system/getty@.service.d/override.conf
 fi
+## END
 
-# Disable autologin on serial console
-if [ -f "/etc/systemd/system/serial-getty@.service.d/override.conf" ]; then
+## Step 2: Disable autologin on serial console
+if [[ -f "/etc/systemd/system/serial-getty@.service.d/override.conf" ]]; then
     sed -i 's/--autologin root //' /etc/systemd/system/serial-getty@.service.d/override.conf
 fi
+## END
 
-# Generate random root passwd
-yes "$(gen_root_pw)" | passwd root
+## Step 3: Delete root passwd
+### Deleting root passwd doesn't let you unlock the account
+sudo passwd -d root
+## END
 
-# lock root account
-sudo -u "${BASE_USER}" passwd -l root
+## Step 4: Lock root account
+sudo passwd -l root
+## END
 
-# Remove passwdless sudo
+## Step 5: Remove passwdless sudo
 sed -i '/'"${BASE_USER}"' ALL=(ALL:ALL) NOPASSWD:ALL/d' /etc/sudoers
+## END

src/modules/armbian/filesystem/root/etc/udev/rules.d/97-gpio.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="gpio", KERNEL=="gpiochip[0-4]", GROUP="gpio", MODE="0660"

src/modules/armbian/filesystem/root/etc/update-motd.d/10-mainsailos

@@ -23,7 +23,6 @@ if [[ -f /etc/armbian-distribution-status ]]; then
     [[ -f /etc/lsb-release ]] && DISTRIBUTION_CODENAME=$(grep CODENAME /etc/lsb-release | cut -d"=" -f2)
     [[ -z "${DISTRIBUTION_CODENAME}" && -f /etc/os-release ]] && DISTRIBUTION_CODENAME=$(grep VERSION_CODENAME /etc/os-release | cut -d"=" -f2)
     [[ -z "${DISTRIBUTION_CODENAME}" && -x /usr/bin/lsb_release ]] && DISTRIBUTION_CODENAME=$(/usr/bin/lsb_release -c | cut -d":" -f2 | tr -d "\t")
-    DISTRIBUTION_STATUS=$(grep "${DISTRIBUTION_CODENAME}" /etc/armbian-distribution-status | cut -d"=" -f2)
 fi
 [[ -f /etc/default/armbian-motd ]] && . /etc/default/armbian-motd
 
@@ -44,23 +43,3 @@ echo -e "Version $(cut -d ' ' -f3 /etc/mainsailos-release), based on \
 \e[34mArmbian ${VERSION} ${DISTRIBUTION_CODENAME^}\e[0m $([[ ${BRANCH} == edge ]])"
 echo -e "Running on \e[34m$(echo "${BOARD_NAME}" | sed 's/Orange Pi/OPi/' | \
 sed 's/NanoPi/NPi/' | sed 's/Banana Pi/BPi/')\e[0m with \e[34mLinux ${KERNELID}\e[0m\n"
-
-# displaying status warnings
-
-if [[ "${IMAGE_TYPE}" != "stable" ]]; then
-    [[ "${IMAGE_TYPE}" == "user-built" ]] && UNSUPPORTED_TEXT="built from trunk"
-    [[ "${IMAGE_TYPE}" == "nightly" ]] && UNSUPPORTED_TEXT="untested automated build"
-else
-    [[ "${BOARD_TYPE}" == "csc" || "${BOARD_TYPE}" == "tvb" ]] && UNSUPPORTED_TEXT="community creations"
-    [[ "${BOARD_TYPE}" == "wip" ]] && UNSUPPORTED_TEXT="work in progress"
-    [[ "${BOARD_TYPE}" == "eos" ]] && UNSUPPORTED_TEXT="end of life"
-fi
-
-if [[ -n ${DISTRIBUTION_STATUS} && ${DISTRIBUTION_STATUS} != supported ]]; then
-    [[ -n ${UNSUPPORTED_TEXT} ]] && UNSUPPORTED_TEXT+=" & "
-    UNSUPPORTED_TEXT+="unsupported (${DISTRIBUTION_CODENAME}) userspace!"
-fi
-
-if [[ -n ${UNSUPPORTED_TEXT} ]]; then
-    echo -e "\e[0;91mNo end-user support: \x1B[0m${UNSUPPORTED_TEXT}\n"
-fi

src/modules/armbian/start_chroot_script

@@ -1,26 +1,32 @@
 #!/usr/bin/env bash
-# MainsailOS Specific Tweaks for armbian images
-# written by Stephan Wendel aka KwadFan
-# <me@stephanwe.de>
-# GPL V3
-########
+#### MainsailOS Specific Tweaks for armbian images
+####
+#### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
+#### Copyright 2023 - till today
+#### https://github.com/mainsail-crew/MainsailOS
+####
+#### This File is distributed under GPLv3
+####
 
+# shellcheck enable=require-variable-braces
 # Source error handling, leave this in place
-set -xe
+set -Ee
 
 # Source CustomPIOS common.sh
 # shellcheck disable=SC1091
 source /common.sh
 install_cleanup_trap
 
-# Install armbian specific packages
-apt update
-# shellcheck disable=SC2086
-check_install_pkgs ${ARMBIAN_DEPS}
-
-# passwordless sudo during install
-# Will be removed in cleanup
-echo "${BASE_USER} ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers
+### Helper func
+is_board_type() {
+    local board releasefile
+    board=""
+    releasefile="/etc/armbian-release-info.txt"
+    if [[ -f "${releasefile}" ]]; then
+        board="$(grep "BOARD=" "${releasefile}" | cut -d'=' -f2)"
+    fi
+    echo "${board}"
+}
 
 # Base User groups
 # Shameless "stolen" from
@@ -33,26 +39,93 @@ if_group_exists_run() {
     fi
 }
 
-# set groups
+# passwordless sudo during install
+# Will be removed in cleanup
+echo "${BASE_USER} ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+## Step 1: Install armbian specific packages
+apt update
+# shellcheck disable=SC2086
+check_install_pkgs ${ARMBIAN_DEPS}
+
+
+
+## Step 1: Manage groups
+### Substep 1: Create group for gpio usage
+sudo groupadd gpio
+### END Substep 1
+
+### Substep 2: Set default groups
 if_group_exists_run i2c usermod -aG i2c "${BASE_USER}"
-usermod -aG video,audio,plugdev,games,netdev,sudo "${BASE_USER}"
+usermod -aG video,audio,plugdev,games,netdev,sudo,systemd-journal,gpio "${BASE_USER}"
+### END Substep 2
 
-# Patch sshd_config
+## Step 2: patch sshd_config
 sed -i 's/PermitRootLogin yes/PermitRootLogin no/' /etc/ssh/sshd_config
 sed -i 's/^X11Forwarding/#X11Forwarding/' /etc/ssh/sshd_config
 sed -i 's/^#MaxAuthTries 6/MaxAuthTries 3/' /etc/ssh/sshd_config
+## END
 
-# Try patching first login in build stage
-if [ -f "/root/.not_logged_in_yet" ]; then
+## Step 4: Try patching first login in build stage
+if [[ -f "/root/.not_logged_in_yet" ]]; then
     rm -f /root/.not_logged_in_yet
 fi
+## END
 
-# Move armbian-release to display mainsailos-release
-mv /etc/armbian-release /etc/armbian-release-info.txt
+## Step 5: Move armbian-release to display mainsailos-release
+### Substep 1: Move armbian-release
+    if [[ -f "/etc/armbian-release" ]]; then
+        echo_green "Armbian release file found! moving to: 'armbian-release-info.txt'"
+        mv /etc/armbian-release /etc/armbian-release-info.txt
+    else
+        echo_red "Armbian release file not found! [SKIPPED]"
+    fi
+### END Substep 1
+### Substep 2: patch Armbian scripts to new file location
+    echo_green "Patching armbian scripts (release file path) ..."
+    pushd "/usr/lib/armbian" &> /dev/null || exit 1
+    files=()
+    while IFS='' read -r line; do
+        files+=("${line}")
+    done < <(grep -R "/etc/armbian-release" -- * | cut -d":" -f1)
+    for f in "${files[@]}"; do
+        sed -i "s|/etc/armbian-release|/etc/armbian-release-info.txt|g" "${f}"
+    done
+    popd &> /dev/null || exit 1
+## END
 
-# update motd
+## Step 6: Patch dynamic motd
+echo_green "Patch dynamic motd ..."
 unpack /filesystem/root /
 chmod +x /etc/update-motd.d/*
-if [ -f "/etc/default/armbian-motd" ]; then
+if [[ -f "/etc/default/armbian-motd" ]]; then
     sed -i 's/MOTD_DISABLE=""/MOTD_DISABLE="header"/' /etc/default/armbian-motd
 fi
+## END
+
+## Step 7: Enable SPI interface by default
+echo_green "Enable SPI interface on Orange Pi SBC's ..."
+
+### Substep 1: Copy default config to backup file
+cp "${ARMBIAN_CONFIG_TXT_FILE}" "${ARMBIAN_CONFIG_BAK_FILE}"
+### END Substep 1
+
+### Substep 2: Enable SPI in armbianEnv.txt depending on device
+#### OrangePi 3 LTS
+if [[ "$(is_board_type)" == "orangepi3-lts" ]]; then
+    echo "overlays=spi-spidev1" >> "${ARMBIAN_CONFIG_TXT_FILE}"
+fi
+
+#### OrangePi 4 LTS
+if [[ "$(is_board_type)" == "orangepi4-lts" ]]; then
+    echo "overlays=spi-spidev" >> "${ARMBIAN_CONFIG_TXT_FILE}"
+    echo "param_spidev_spi_bus=1" >> "${ARMBIAN_CONFIG_TXT_FILE}"
+fi
+### END Substep 2:
+
+### Substep 3: add spi-dev module to /etc/modules
+echo "spi-dev" >> "${ARMBIAN_MODULES_FILE}"
+### END Substep 3
+
+echo_green "Enable SPI interface on Orange Pi SBC's ... DONE!"
+## END

src/modules/armbian_net/config

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-#Shebang for better file detection
-#### mainsail module
+# Shebang for better file detection
+#### MainsailOS network configurator for armbian images
 ####
 #### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
 #### Copyright 2023 - till today
@@ -11,6 +11,6 @@
 
 # shellcheck disable=all
 
-[ -n "$ARMBIAN_NET_FIRSTRUN_FILE" ] || ARMBIAN_NET_FIRSTRUN_FILE="/boot/armbian_first_run.txt.template"
-[ -n "$ARMBIAN_NET_FIRSTRUN_SCRIPT" ] || ARMBIAN_NET_FIRSTRUN_SCRIPT="/usr/lib/armbian/armbian-firstrun-config"
-[ -n "$ARMBIAN_NET_NC_PATH" ] || ARMBIAN_NET_NC_PATH="/usr/local/bin/network-configurator"
+[[ -n "$ARMBIAN_NET_FIRSTRUN_FILE" ]] || ARMBIAN_NET_FIRSTRUN_FILE="/boot/armbian_first_run.txt.template"
+[[ -n "$ARMBIAN_NET_FIRSTRUN_SCRIPT" ]] || ARMBIAN_NET_FIRSTRUN_SCRIPT="/usr/lib/armbian/armbian-firstrun-config"
+[[ -n "$ARMBIAN_NET_NC_PATH" ]] || ARMBIAN_NET_NC_PATH="/usr/local/bin/network-configurator"