diff --git a/builder/offline.sh b/builder/offline.sh index 6329dc4..0abf272 100755 --- a/builder/offline.sh +++ b/builder/offline.sh @@ -30,7 +30,6 @@ arch_packages=( gum jq openssl - plymouth tzupdate # This is technically an AUR package ) @@ -97,7 +96,10 @@ printf '%s\n' "${arch_packages[@]}" >>"$build_cache_dir/packages.x86_64" # Need to do this from the cache_dir cd $build_cache_dir for patch in /builder/patches/*.patch; do - git apply "$patch" + # Skip profiledef.patch as it conflicts with offline/permissions.patch + if [[ "$(basename "$patch")" != "profiledef.patch" ]]; then + git apply "$patch" + fi done cd - @@ -126,18 +128,6 @@ git clone -b $OMARCHY_INSTALLER_REF --single-branch https://github.com/$OMARCHY_ mkdir -p "$build_cache_dir/airootfs/root/.local/share/applications/icons" cp /builder/icons/*.png "$build_cache_dir/airootfs/root/.local/share/applications/icons/" -# Copy plymouth theme to the system location -mkdir -p "$build_cache_dir/airootfs/usr/share/plymouth/themes/omarchy" -cp "$build_cache_dir/airootfs/root/omarchy/default/plymouth/"* "$build_cache_dir/airootfs/usr/share/plymouth/themes/omarchy/" - -# Configure plymouth to use our theme -mkdir -p "$build_cache_dir/airootfs/etc/plymouth" -tee "$build_cache_dir/airootfs/etc/plymouth/plymouthd.conf" >/dev/null <