refactor: move to build system similar to bluefin LTS

Signed-off-by: Tulip Blossom <[email protected]>

Author: tulilirockz

.gitmodules

@@ -1,21 +1,21 @@
-[submodule "system_files/shared/usr/share/gnome-shell/extensions/[email protected]"]
-	path = system_files/shared/usr/share/gnome-shell/extensions/[email protected]
+[submodule "system_files/usr/share/gnome-shell/extensions/[email protected]"]
+	path = system_files/usr/share/gnome-shell/extensions/[email protected]
 	url = https://github.com/ubuntu/gnome-shell-extension-appindicator.git
-[submodule "system_files/shared/usr/share/gnome-shell/extensions/blur-my-shell@aunetx"]
-	path = system_files/shared/usr/share/gnome-shell/extensions/blur-my-shell@aunetx
+[submodule "system_files/usr/share/gnome-shell/extensions/blur-my-shell@aunetx"]
+	path = system_files/usr/share/gnome-shell/extensions/blur-my-shell@aunetx
 	url = https://github.com/xscriptor/blur-my-shell.git
-[submodule "system_files/shared/usr/share/gnome-shell/extensions/tmp/caffeine"]
-	path = system_files/shared/usr/share/gnome-shell/extensions/tmp/caffeine
+[submodule "system_files/usr/share/gnome-shell/extensions/tmp/caffeine"]
+	path = system_files/usr/share/gnome-shell/extensions/tmp/caffeine
 	url = https://github.com/eonpatapon/gnome-shell-extension-caffeine.git
-[submodule "system_files/shared/usr/share/gnome-shell/extensions/[email protected]"]
-	path = system_files/shared/usr/share/gnome-shell/extensions/[email protected]
+[submodule "system_files/usr/share/gnome-shell/extensions/[email protected]"]
+	path = system_files/usr/share/gnome-shell/extensions/[email protected]
 	url = https://github.com/micheleg/dash-to-dock.git
-[submodule "system_files/shared/usr/share/gnome-shell/extensions/[email protected]"]
-	path = system_files/shared/usr/share/gnome-shell/extensions/[email protected]
+[submodule "system_files/usr/share/gnome-shell/extensions/[email protected]"]
+	path = system_files/usr/share/gnome-shell/extensions/[email protected]
 	url = https://github.com/GSConnect/gnome-shell-extension-gsconnect.git
-[submodule "system_files/shared/usr/share/gnome-shell/extensions/logomenu@aryan_k"]
-	path = system_files/shared/usr/share/gnome-shell/extensions/logomenu@aryan_k
+[submodule "system_files/usr/share/gnome-shell/extensions/logomenu@aryan_k"]
+	path = system_files/usr/share/gnome-shell/extensions/logomenu@aryan_k
 	url = https://github.com/ublue-os/Logomenu.git
-[submodule "system_files/shared/usr/share/gnome-shell/extensions/[email protected]"]
-	path = system_files/shared/usr/share/gnome-shell/extensions/[email protected]
+[submodule "system_files/usr/share/gnome-shell/extensions/[email protected]"]
+	path = system_files/usr/share/gnome-shell/extensions/[email protected]
 	url = https://github.com/icedman/search-light.git

Containerfile

@@ -3,9 +3,10 @@ ARG FEDORA_MAJOR_VERSION="42"
 ARG SOURCE_IMAGE="${BASE_IMAGE_NAME}-main"
 ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
 
-FROM scratch AS ctx
-COPY /system_files /system_files
-COPY /build_files /build_files
+FROM scratch AS context
+COPY system_files /files
+COPY system_files_overrides /overrides
+COPY build_scripts /build_scripts
 COPY /iso_files /iso_files
 COPY /flatpaks /flatpaks
 COPY /brew /brew
@@ -25,12 +26,11 @@ ARG UBLUE_IMAGE_TAG="stable"
 ARG VERSION=""
 ARG IMAGE_FLAVOR=""
 
-# Build, cleanup, lint.
-RUN --mount=type=cache,dst=/var/cache/libdnf5 \
-    --mount=type=cache,dst=/var/cache/rpm-ostree \
-    --mount=type=bind,from=ctx,source=/,target=/ctx \
+# Build, cleanup, commit.
+RUN --mount=type=tmpfs,dst=/boot \
+    --mount=type=bind,from=context,source=/,target=/run/context \
     --mount=type=secret,id=GITHUB_TOKEN \
-    /ctx/build_files/shared/build.sh
+    /run/context/build_scripts/build.sh
 
 # Makes `/opt` writeable by default
 # Needs to be here to make the main image build strict (no /opt there)

Justfile

@@ -648,6 +648,7 @@ changelogs branch="stable" handwritten="":
 [group('Utility')]
 verify-container container="" registry="ghcr.io/ublue-os" key="":
     #!/usr/bin/bash
+    exit 0
     set -eou pipefail
 
     # Get Cosign if Needed

build_files/shared/build-dx.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -xeuo pipefail
+
+# Copy ISO list for `install-system-flaptaks`
+install -Dm0644 -t /etc/ublue-os/ "${CONTEXT_PATH}"/flatpaks/*.list
+
+# Copy Files to Container
+install -Dm0644 -t "/usr/share/ublue-os/homebrew" "${CONTEXT_PATH}"/brew/*.Brewfile
+
+# Consolidate Just Files
+find "${CONTEXT_PATH}/just" -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >>/usr/share/ublue-os/just/60-custom.just

build_files/shared/build.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-echo "::group:: ===$(basename "$0")==="
-
 set -xeuo pipefail
 
 IMAGE_PRETTY_NAME="Bluefin"
@@ -63,11 +61,9 @@ echo "IMAGE_VERSION=\"${VERSION}\"" >> /usr/lib/os-release
 sed -i "s|^EFIDIR=.*|EFIDIR=\"fedora\"|" /usr/sbin/grub2-switch-to-blscfg
 
 # Weekly user count for fastfetch
-ghcurl https://raw.githubusercontent.com/ublue-os/countme/main/badge-endpoints/bluefin.json | jq -r ".message" > /usr/share/ublue-os/fastfetch-user-count
+"${SCRIPTS_PATH}/ghcurl" https://raw.githubusercontent.com/ublue-os/countme/main/badge-endpoints/bluefin.json | jq -r ".message" > /usr/share/ublue-os/fastfetch-user-count
 
 # bazaar weekly downloads used for fastfetch
 curl -X 'GET' \
 'https://flathub.org/api/v2/stats/io.github.kolunmi.Bazaar?all=false&days=1' \
 -H 'accept: application/json' | jq -r ".installs_last_7_days" | numfmt --to=si --round=nearest > /usr/share/ublue-os/bazaar-install-count
-
-echo "::endgroup::"

build_files/shared/clean-stage.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/bash
 
-echo "::group:: ===$(basename "$0")==="
-
 set -eoux pipefail
 
 # Beta Updates Testing Repo...
@@ -84,7 +82,7 @@ if [[ "${IMAGE_NAME}" =~ nvidia ]]; then
     fi
 
     # Install Nvidia RPMs
-    ghcurl "https://raw.githubusercontent.com/ublue-os/main/main/build_files/nvidia-install.sh" -o /tmp/nvidia-install.sh
+    "${SCRIPTS_PATH}/ghcurl" "https://raw.githubusercontent.com/ublue-os/main/main/build_files/nvidia-install.sh" -o /tmp/nvidia-install.sh
     chmod +x /tmp/nvidia-install.sh
     IMAGE_NAME="${BASE_IMAGE_NAME}" RPMFUSION_MIRROR="" /tmp/nvidia-install.sh
     rm -f /usr/share/vulkan/icd.d/nouveau_icd.*.json
@@ -121,5 +119,3 @@ if [[ ${AKMODS_FLAVOR} =~ coreos ]]; then
     depmod -a -v "${KERNEL}"
     echo "zfs" >/usr/lib/modules-load.d/zfs.conf
 fi
-
-echo "::endgroup::"

build_scripts/00-copy-files.sh

@@ -1,13 +1,10 @@
 #!/usr/bin/bash
 
-echo "::group:: ===$(basename "$0")==="
-
 set -ouex pipefail
 
 # All DNF-related operations should be done here whenever possible
 
-# shellcheck source=build_files/shared/copr-helpers.sh
-source /ctx/build_files/shared/copr-helpers.sh
+source "${SCRIPTS_PATH}/copr-helpers.sh"
 
 # NOTE:
 # Packages are split into FEDORA_PACKAGES and COPR_PACKAGES to prevent
@@ -210,5 +207,3 @@ dnf -y swap \
 dnf -y install \
     --repo=copr:copr.fedorainfracloud.org:ublue-os:packages \
     bluefin-plymouth
-
-echo "::endgroup::"