From 630e2e33e3bbce78b74694d717e77ddec6edeabb Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Sun, 29 Sep 2024 20:23:53 +0200
Subject: [PATCH] Add rootfs configuration and add it to targets-not-eos config

---
 userpatches/config-armbian-rootfs.conf | 23 +++++++++++++++++++++++
 userpatches/targets-all-not-eos.yaml   | 10 +++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 userpatches/config-armbian-rootfs.conf

diff --git a/userpatches/config-armbian-rootfs.conf b/userpatches/config-armbian-rootfs.conf
new file mode 100644
index 0000000000..c16e3ef002
--- /dev/null
+++ b/userpatches/config-armbian-rootfs.conf
@@ -0,0 +1,23 @@
+display_alert "Common settings for Armbian rootfs generation" "setting default values" "info"
+declare -g SKIP_ARMBIAN_REPO=yes
+declare -g SYNC_CLOCK="no"
+declare -g INSTALL_HEADERS="no"
+declare -g WIREGUARD="no"
+declare -g VENDOR="Armbian"
+declare -g VENDORURL="https://www.armbian.com"
+declare -g VENDORDOCS="https://docs.armbian.com"
+declare -g VENDORSUPPORT="https://forum.armbian.com"
+declare -g VENDORPRIVACY="https://www.armbian.com"
+declare -g VENDORBUGS="https://www.armbian.com/bugs"
+declare -g VENDORLOGO="armbian-logo"
+declare -g MAINTAINERMAIL=info@armbian.com
+declare -g MAINTAINER="Armbian Linux"
+declare -g COMPRESS_OUTPUTIMAGE="sha,img,xz"
+declare -g IMAGE_XZ_COMPRESSION_RATIO=8
+declare -g EXPERT="yes"
+declare -g KERNEL_CONFIGURE=no
+declare -g PASTE_URL="https://paste.armbian.de/log"
+#[[ $BOARD == bananapif3 ]] && 
+declare -g DOCKER_ARMBIAN_BASE_IMAGE="ubuntu:noble"
+declare -g DONT_BUILD_ARTIFACTS="kernel,firmware,full_firmware,fake_ubuntu_advantage_tools,armbian-config,armbian-zsh,armbian-plymouth-theme"
+declare -g PREFER_DOCKER="yes"
diff --git a/userpatches/targets-all-not-eos.yaml b/userpatches/targets-all-not-eos.yaml
index 88da7b98e6..73ab8bfd22 100644
--- a/userpatches/targets-all-not-eos.yaml
+++ b/userpatches/targets-all-not-eos.yaml
@@ -18,7 +18,7 @@ common-gha-configs:
 targets:
 
   all-userspace:
-    configs: [ armbian-images ]
+    configs: [ armbian-rootfs ]
     pipeline:
       build-image: no # don't build images for this
       only-artifacts: [ "armbian-base-files", "armbian-desktop", "rootfs" ] # only these artifacts
@@ -45,7 +45,7 @@ targets:
           amd64: [ { BOARD: "uefi-x86", BRANCH: "current" } ]
 
   all-userspace-riscv64:
-    configs: [ armbian-images ]
+    configs: [ armbian-rootfs ]
     pipeline:
       build-image: no # don't build images for this
       only-artifacts: [ "armbian-base-files", "armbian-desktop", "rootfs" ] # only these artifacts
@@ -67,7 +67,7 @@ targets:
           riscv64: [ { BOARD: "uefi-riscv64", BRANCH: "edge" } ]
 
   all-userspace-armhf:
-    configs: [ armbian-images ]
+    configs: [ armbian-rootfs ]
     pipeline:
       build-image: no # don't build images for this
       only-artifacts: [ "armbian-base-files", "armbian-desktop", "rootfs" ] # only these artifacts
@@ -96,7 +96,7 @@ targets:
 
   all-desktop:
     enabled: yes
-    configs: [ armbian-images ]
+    configs: [ armbian-rootfs ]
     pipeline:
       gha: *armbian-gha
     vars:
@@ -115,7 +115,7 @@ targets:
 
   all-cli:
     enabled: yes
-    configs: [ armbian-images ]
+    configs: [ armbian-rootfs ]
     pipeline:
       gha: *armbian-gha
     vars: