From e06e1cf9a7ad633377e847da93e94937b5c8129d Mon Sep 17 00:00:00 2001
From: Tulip Blossom <tulilirockz@outlook.com>
Date: Sat, 10 Jan 2026 12:21:45 -0300
Subject: [PATCH 1/3] feat(just): add overlay command for sysext testing

Signed-off-by: Tulip Blossom <tulilirockz@outlook.com>
---
 .gitignore |  3 +++
 Justfile   | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..fccc4585
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.raw
+*.img
+*.erofs
diff --git a/Justfile b/Justfile
index 39502497..448500a3 100644
--- a/Justfile
+++ b/Justfile
@@ -33,3 +33,33 @@ tree IMAGE="localhost/bluefin-common:latest":
     podman run --rm tree-temp
     rm TreeContainerfile
     podman rmi tree-temp
+
+overlay $BLUEFIN_MERGE="1":
+    #!/usr/bin/env bash
+    ROOTFS_DIR="$(mktemp -d --tmpdir="${ROOTFS_BASE:-/tmp}")"
+    trap 'rm -rf "${ROOTFS_DIR}"' EXIT
+    NAME_TRIMMED=bfincommon
+    crane export ghcr.io/projectbluefin/common:latest - | tar -xvf - -C "${ROOTFS_DIR}"
+    install -d -m0755 "${ROOTFS_DIR}/usr/lib/extension-release.d"
+    tee "${ROOTFS_DIR}/usr/lib/extension-release.d/extension-release.${NAME_TRIMMED}" <<EOF
+    ID="_any"
+    ARCHITECTURE="$(sed 's/_/-/g' <<< "$(arch)")"
+    EOF
+    cp -a "${ROOTFS_DIR}/system_files/shared/." "${ROOTFS_DIR}"
+    if [ "${BLUEFIN_MERGE}" == "1" ] ; then
+        cp -a "${ROOTFS_DIR}/system_files/bluefin/." "${ROOTFS_DIR}"
+    fi
+    rm -r "${ROOTFS_DIR}/system_files"
+    if [ -d "${ROOTFS_DIR}/etc" ] ; then
+        mv --no-clobber "${ROOTFS_DIR}/etc" "${ROOTFS_DIR}/usr/etc"
+    fi
+    for dir in "var" "run"; do
+        if [ -d "${ROOTFS_DIR}"/"${dir}" ] ; then
+            rm -r "${ROOTFS_DIR:?}/${dir}"
+        fi
+    done
+    filecontexts="/etc/selinux/targeted/contexts/files/file_contexts"
+    sudo setfiles -r "${ROOTFS_DIR}" "${filecontexts}" "${ROOTFS_DIR}"
+    sudo chcon --user=system_u --recursive "${ROOTFS_DIR}"
+    mkfs.erofs "${NAME_TRIMMED}.raw" "${ROOTFS_DIR}"
+

From 4fc1a23174f4d4011ae2dbd3fff42cf76c32251d Mon Sep 17 00:00:00 2001
From: Tulip Blossom <tulilirockz@outlook.com>
Date: Sat, 10 Jan 2026 12:32:19 -0300
Subject: [PATCH 2/3] fix(justfile, overlay): add `dir` type for local
 overrides

Signed-off-by: Tulip Blossom <tulilirockz@outlook.com>
---
 Justfile | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/Justfile b/Justfile
index 448500a3..979b5955 100644
--- a/Justfile
+++ b/Justfile
@@ -34,25 +34,39 @@ tree IMAGE="localhost/bluefin-common:latest":
     rm TreeContainerfile
     podman rmi tree-temp
 
-overlay $BLUEFIN_MERGE="1":
+overlay $BLUEFIN_MERGE="1" $SOURCE="dir":
     #!/usr/bin/env bash
     ROOTFS_DIR="$(mktemp -d --tmpdir="${ROOTFS_BASE:-/tmp}")"
     trap 'rm -rf "${ROOTFS_DIR}"' EXIT
     NAME_TRIMMED=bfincommon
-    crane export ghcr.io/projectbluefin/common:latest - | tar -xvf - -C "${ROOTFS_DIR}"
+
+    if [ "$SOURCE" == "dir" ] ; then
+        cp -a ./system_files/shared/. "${ROOTFS_DIR}"
+        if [ "${BLUEFIN_MERGE}" == "1" ] ; then
+            cp -a ./system_files/bluefin/. "${ROOTFS_DIR}"
+        fi
+    elif [ "$SOURCE" == "image" ] ; then
+        podman export "$(podman create ghcr.io/projectbluefin/common:latest)" -o - | tar -xvf - -C "${ROOTFS_DIR}"
+    fi
+
     install -d -m0755 "${ROOTFS_DIR}/usr/lib/extension-release.d"
     tee "${ROOTFS_DIR}/usr/lib/extension-release.d/extension-release.${NAME_TRIMMED}" <<EOF
     ID="_any"
     ARCHITECTURE="$(sed 's/_/-/g' <<< "$(arch)")"
     EOF
-    cp -a "${ROOTFS_DIR}/system_files/shared/." "${ROOTFS_DIR}"
-    if [ "${BLUEFIN_MERGE}" == "1" ] ; then
-        cp -a "${ROOTFS_DIR}/system_files/bluefin/." "${ROOTFS_DIR}"
+
+    if [ -e "${ROOTFS_DIR}/system_files" ] ; then 
+        cp -a "${ROOTFS_DIR}/system_files/shared/." "${ROOTFS_DIR}"
+        if [ "${BLUEFIN_MERGE}" == "1" ] ; then
+            cp -a "${ROOTFS_DIR}/system_files/bluefin/." "${ROOTFS_DIR}"
+        fi
+        rm -r "${ROOTFS_DIR}/system_files"
     fi
-    rm -r "${ROOTFS_DIR}/system_files"
+
     if [ -d "${ROOTFS_DIR}/etc" ] ; then
         mv --no-clobber "${ROOTFS_DIR}/etc" "${ROOTFS_DIR}/usr/etc"
     fi
+
     for dir in "var" "run"; do
         if [ -d "${ROOTFS_DIR}"/"${dir}" ] ; then
             rm -r "${ROOTFS_DIR:?}/${dir}"

From 8ada5a3a09b59dcf61def1be17b8ee47cc6eb16a Mon Sep 17 00:00:00 2001
From: renner <renner0@posteo.de>
Date: Tue, 7 Apr 2026 15:44:38 +0200
Subject: [PATCH 3/3] fix: make validation happy

---
 Justfile                                                   | 1 -
 system_files/bluefin/usr/share/ublue-os/just/00-entry.just | 1 +
 system_files/bluefin/usr/share/ublue-os/just/system.just   | 1 +
 system_files/shared/usr/share/ublue-os/just/apps.just      | 1 -
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Justfile b/Justfile
index 979b5955..8cd876ad 100644
--- a/Justfile
+++ b/Justfile
@@ -76,4 +76,3 @@ overlay $BLUEFIN_MERGE="1" $SOURCE="dir":
     sudo setfiles -r "${ROOTFS_DIR}" "${filecontexts}" "${ROOTFS_DIR}"
     sudo chcon --user=system_u --recursive "${ROOTFS_DIR}"
     mkfs.erofs "${NAME_TRIMMED}.raw" "${ROOTFS_DIR}"
-
diff --git a/system_files/bluefin/usr/share/ublue-os/just/00-entry.just b/system_files/bluefin/usr/share/ublue-os/just/00-entry.just
index f586fb81..dea4fe2e 100644
--- a/system_files/bluefin/usr/share/ublue-os/just/00-entry.just
+++ b/system_files/bluefin/usr/share/ublue-os/just/00-entry.just
@@ -7,6 +7,7 @@ _default:
     ujust --list --list-heading $'Available commands:\n' --list-prefix $' - '
 
 # Imports
+
 import "/usr/share/ublue-os/just/apps.just"
 import "/usr/share/ublue-os/just/changelog.just"
 import "/usr/share/ublue-os/just/default.just"
diff --git a/system_files/bluefin/usr/share/ublue-os/just/system.just b/system_files/bluefin/usr/share/ublue-os/just/system.just
index 992fd4a3..0579834a 100644
--- a/system_files/bluefin/usr/share/ublue-os/just/system.just
+++ b/system_files/bluefin/usr/share/ublue-os/just/system.just
@@ -84,6 +84,7 @@ install-system-flatpaks $confirm="1" $dx_only="0":
     brew bundle --file="${TARGET_FLATPAK_FILE:-/usr/share/ublue-os/homebrew/system-flatpaks.Brewfile}"
 
 # Install default system flatpaks (alias for install-system-flatpaks)
+
 # For additional applications, use: ujust bbrew
 [group('System')]
 bluefin-apps:
diff --git a/system_files/shared/usr/share/ublue-os/just/apps.just b/system_files/shared/usr/share/ublue-os/just/apps.just
index 0fc4d1c9..b741df06 100644
--- a/system_files/shared/usr/share/ublue-os/just/apps.just
+++ b/system_files/shared/usr/share/ublue-os/just/apps.just
@@ -12,7 +12,6 @@ install-jetbrains-toolbox:
     brew tap ublue-os/homebrew-tap
     brew install --cask jetbrains-toolbox-linux
 
-
 # Install OpenTabletDriver, an open source, cross-platform, user-mode tablet driver
 [group('Apps')]
 install-opentabletdriver: