From 2355bc96c511c4d9620bdaeeaa81a5ce59e71afb Mon Sep 17 00:00:00 2001 From: Stephan Wendel Date: Mon, 7 Oct 2024 11:20:37 +0200 Subject: [PATCH 1/5] test: test branch for wip custompios pr * This branch will be deleted after testing! Signed-off-by: Stephan Wendel --- .github/workflow_config.yml | 11 ++++++----- .github/workflows/BuildImages.yml | 2 ++ config/raspberry/default | 10 ++++++---- config/raspberry/rpi64-bullseye | 23 +++++++++++++++++++++++ 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 config/raspberry/rpi64-bullseye diff --git a/.github/workflow_config.yml b/.github/workflow_config.yml index 1e6b40b30..5b1f5dd76 100644 --- a/.github/workflow_config.yml +++ b/.github/workflow_config.yml @@ -16,16 +16,17 @@ buildtest: # armbian based images - - armbian/bananapim2zero - - armbian/orangepi3lts + #- armbian/bananapim2zero + #- armbian/orangepi3lts - armbian/orangepi4lts - - armbian/orangepi_zero2 + #- armbian/orangepi_zero2 # Orange Pi OS based images # Raspberry Pi OS based images - - raspberry/rpi32 + #- raspberry/rpi32 - raspberry/rpi64 + - raspberry/rpi64-bullseye # rpi 64 with KS - - raspberry/rpi64-ks + #- raspberry/rpi64-ks # This is used to setup release build chain. # Each entry will be used in setup matrix for releases diff --git a/.github/workflows/BuildImages.yml b/.github/workflows/BuildImages.yml index a0813ad53..5eb1b9d46 100644 --- a/.github/workflows/BuildImages.yml +++ b/.github/workflows/BuildImages.yml @@ -64,6 +64,8 @@ jobs: uses: ./repository/.github/actions/build with: config: ${{ matrix.config }} + custompios-repository: "KwadFan/CustomPiOS" + custompios-ref: "upstream/headless_nm" - name: Rename image file id: move-image diff --git a/config/raspberry/default b/config/raspberry/default index 18d0d138d..a54207db1 100644 --- a/config/raspberry/default +++ b/config/raspberry/default @@ -5,16 +5,18 @@ # See https://www.shellcheck.net/wiki/SC2155 # New locations after Bullseye turned into 'oldstable' -DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06/2023-12-05-raspios-bullseye-arm64-lite.img.xz" -DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}.sha256" -DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}.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" + + BASE_IMAGE_ENLARGEROOT=4500 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,mainsailos(net,piconfig,klipper,is_req_preinstall,moonraker,timelapse,mainsail,crowsnest,sonar,password-for-sudo),postrename)" +MODULES="base(pkgupgrade,headless_nm,password-for-sudo)" # export Variables export DOWNLOAD_BASE_URL diff --git a/config/raspberry/rpi64-bullseye b/config/raspberry/rpi64-bullseye new file mode 100644 index 000000000..109a0cb85 --- /dev/null +++ b/config/raspberry/rpi64-bullseye @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# Shebang for better file detection + +# Declare Variables before exporting. +# See https://www.shellcheck.net/wiki/SC2155 + +DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06/2023-12-05-raspios-bullseye-arm64-lite.img.xz" +DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}.sha256" +DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}.torrent" + + +BASE_ARCH="arm64" + +# export variables +export BASE_ARCH +export DOWNLOAD_BASE_URL +export DOWNLOAD_URL_CHECKSUM +export DOWNLOAD_URL_IMAGE + +### JSON sniplet Setup +### NOTE: Please see all config files for setup variables!!! +# shellcheck disable=SC2034 +JSON_SUPPORTED_SBC="pi3-64bit pi4-64bit" From 295cce7532ccdb9aaaf0db05f22e55207aadcf71 Mon Sep 17 00:00:00 2001 From: Stephan Wendel Date: Mon, 7 Oct 2024 11:28:31 +0200 Subject: [PATCH 2/5] wip: shorten modules for armbian build Signed-off-by: Stephan Wendel --- config/armbian/default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/armbian/default b/config/armbian/default index ed699d4a8..01f4b3c66 100644 --- a/config/armbian/default +++ b/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,udev_fix,armbian(armbian_net,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar))" +MODULES="base(pkgupgrade,headless_nm,password-for-sudo)" # export Variables export DOWNLOAD_BASE_URL From 847dcbf93add50e8c2c9a33fc45a04615a331a8d Mon Sep 17 00:00:00 2001 From: Stephan Wendel Date: Tue, 8 Oct 2024 16:16:17 +0200 Subject: [PATCH 3/5] fix: change opi 4 lts to bookworm Signed-off-by: Stephan Wendel --- config/armbian/orangepi4lts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/armbian/orangepi4lts b/config/armbian/orangepi4lts index 6fbcf889a..0bc5cb703 100644 --- a/config/armbian/orangepi4lts +++ b/config/armbian/orangepi4lts @@ -5,8 +5,8 @@ BASE_ARCH="arm64" # Image source -DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-orangepi4_lts_bullseye.img.xz.sha256" -DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-orangepi4_lts_bullseye.img.xz" +DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-orangepi4_lts_bookworm.img.xz.sha256" +DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-orangepi4_lts_bookworm.img.xz" # export Variables export BASE_ARCH From d75d1eba2ee908b4d2738b5a81bfcc2b48692e35 Mon Sep 17 00:00:00 2001 From: Stephan Wendel Date: Tue, 8 Oct 2024 16:30:47 +0200 Subject: [PATCH 4/5] chore: update bullseye url to latest image Signed-off-by: Stephan Wendel --- config/raspberry/rpi64-bullseye | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/raspberry/rpi64-bullseye b/config/raspberry/rpi64-bullseye index 109a0cb85..7d45e9986 100644 --- a/config/raspberry/rpi64-bullseye +++ b/config/raspberry/rpi64-bullseye @@ -4,7 +4,7 @@ # Declare Variables before exporting. # See https://www.shellcheck.net/wiki/SC2155 -DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06/2023-12-05-raspios-bullseye-arm64-lite.img.xz" +DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2024-07-04/2024-07-04-raspios-bullseye-arm64-lite.img.xz" DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}.sha256" DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}.torrent" From 4937cc7303bdc8447cbb4db37b3e9a59b7527335 Mon Sep 17 00:00:00 2001 From: Stephan Wendel Date: Sun, 17 Nov 2024 08:22:18 +0100 Subject: [PATCH 5/5] chore: update bullseye url to latest build Signed-off-by: Stephan Wendel --- config/raspberry/rpi64-bullseye | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/raspberry/rpi64-bullseye b/config/raspberry/rpi64-bullseye index 7d45e9986..ba61fc400 100644 --- a/config/raspberry/rpi64-bullseye +++ b/config/raspberry/rpi64-bullseye @@ -4,7 +4,7 @@ # Declare Variables before exporting. # See https://www.shellcheck.net/wiki/SC2155 -DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2024-07-04/2024-07-04-raspios-bullseye-arm64-lite.img.xz" +DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2024-10-28/2024-10-22-raspios-bullseye-arm64-lite.img.xz" DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}.sha256" DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}.torrent"