From 6535aa6573f0d9187eda8024f68ba1e6ab7ac036 Mon Sep 17 00:00:00 2001 From: Koen Date: Sat, 16 Mar 2024 00:08:02 +0100 Subject: [PATCH 1/3] Delete config/armbian directory --- config/armbian/CB1 | 23 --------------------- config/armbian/bananapim2zero | 12 ----------- config/armbian/default | 39 ----------------------------------- 3 files changed, 74 deletions(-) delete mode 100644 config/armbian/CB1 delete mode 100644 config/armbian/bananapim2zero delete mode 100644 config/armbian/default diff --git a/config/armbian/CB1 b/config/armbian/CB1 deleted file mode 100644 index 8c9a1f042..000000000 --- a/config/armbian/CB1 +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -# Shebang for better file detection -# shellcheck enable=require-variable-braces - -BASE_ARCH="arm64" -BASE_IMAGE_ENLARGEROOT=10500 -BASE_IMAGE_RESIZEROOT=600 -BASE_ADD_USER="yes" -BASE_USER="pi" -BASE_USER_PASSWORD="raspberry" - -# Image source -DOWNLOAD_URL_CHECKSUM="https://github.com/bigtreetech/CB1/releases/download/V2.3.1/CB1_Debian11_Klipper_kernel5.16_20230215.img.sha256" -DOWNLOAD_URL_IMAGE="https://github.com/bigtreetech/CB1/releases/download/V2.3.1/CB1_Debian11_minimal_kernel5.16_20230215.img.xz" - -# export Variables -export BASE_ARCH -export BASE_IMAGE_ENLARGEROOT -export BASE_IMAGE_RESIZEROOT -export DOWNLOAD_URL_CHECKSUM -export DOWNLOAD_URL_IMAGE - -export MODULES="base,deb_namserver,passwordless_sudo,pkgupgrade(network,cb1config,klipper,node,is_req_preinstall,moonraker,cb1spi,ratos(mainsail,crowsnest,linear_movement_analysis,timelapse,klipperscreen,rpi_mcu,disable-services(hotspot_cb1),dfu-util),password-for-sudo),postrename" \ No newline at end of file diff --git a/config/armbian/bananapim2zero b/config/armbian/bananapim2zero deleted file mode 100644 index e22a42b26..000000000 --- a/config/armbian/bananapim2zero +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -# Shebang for better file detection -# shellcheck enable=require-variable-braces - -# Image source -DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-bananapi_m2_zero_bullseye.img.xz.sha256" -DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-bananapi_m2_zero_bullseye.img.xz" - -# export Variables -export BASE_ARCH -export DOWNLOAD_URL_CHECKSUM -export DOWNLOAD_URL_IMAGE diff --git a/config/armbian/default b/config/armbian/default deleted file mode 100644 index 7423ea9a7..000000000 --- a/config/armbian/default +++ /dev/null @@ -1,39 +0,0 @@ -#!/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=6500 -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,udev_fix,armbian(armbian_net,mainsailos,klipper,node,is_req_preinstall,moonraker,mainsail,crowsnest,ratos(linear_movement_analysis,timelapse,klipperscreen,rpi_mcu,disable-services(hotspot),dfu-util))" - -# 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 From fc4000ea97ca044eb165dbed81287d7ec0ec5d2d Mon Sep 17 00:00:00 2001 From: Koen Date: Sat, 16 Mar 2024 00:08:17 +0100 Subject: [PATCH 2/3] Delete config/raspberry/rpi32 --- config/raspberry/rpi32 | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 config/raspberry/rpi32 diff --git a/config/raspberry/rpi32 b/config/raspberry/rpi32 deleted file mode 100644 index f0ca5e091..000000000 --- a/config/raspberry/rpi32 +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -# Shebang for better file detection - -# Keep for Bookworm template -# DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.org/raspios_lite_armhf_latest.sha256" -# DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_armhf_latest.torrent" - -# New locations after Bullseye turned into 'oldstable' -DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.com/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-10-10/2023-05-03-raspios-bullseye-armhf-lite.img.xz.sha256" -DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.com/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-10-10/2023-05-03-raspios-bullseye-armhf-lite.img.xz.torrent" - -export DOWNLOAD_URL_CHECKSUM -export DOWNLOAD_URL_IMAGE From fae4dd8a2c162ed71538beeedd0a278d7962c377 Mon Sep 17 00:00:00 2001 From: Koen Date: Sat, 16 Mar 2024 00:25:07 +0100 Subject: [PATCH 3/3] Update rpi64 --- config/raspberry/rpi64 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/raspberry/rpi64 b/config/raspberry/rpi64 index 15e90dd10..793132acb 100644 --- a/config/raspberry/rpi64 +++ b/config/raspberry/rpi64 @@ -4,12 +4,12 @@ BASE_ARCH="arm64" # Keep for Bookworm template -# DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.sha256" -# DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.torrent" +DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.sha256" +DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.torrent" # New locations after Bullseye turned into 'oldstable' -DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256" -DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.torrent" +# DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256" +# DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.com/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-10-10/2023-05-03-raspios-bullseye-arm64-lite.img.xz.torrent" # export variables