From 3b83bb5672540092ad69a9a6e00e8cfef16afc64 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 20 Aug 2025 13:49:21 +0200 Subject: [PATCH] Move patches that are only for offline builder --- builder/offline.sh | 6 +++--- builder/patches/{ => offline}/aur-mirror.patch | 0 builder/patches/{ => offline}/offline-mirror.patch | 0 builder/patches/{ => offline}/permissions.patch | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename builder/patches/{ => offline}/aur-mirror.patch (100%) rename builder/patches/{ => offline}/offline-mirror.patch (100%) rename builder/patches/{ => offline}/permissions.patch (100%) diff --git a/builder/offline.sh b/builder/offline.sh index 02ad415..28312f6 100755 --- a/builder/offline.sh +++ b/builder/offline.sh @@ -183,9 +183,9 @@ cat <<-_EOF_ | tee $cache_dir/airootfs/root/.automated_script.sh _EOF_ # We patch permissions, grub and efi loaders to our liking: -(cd $cache_dir/ && git apply /permissions.patch) -(cd $cache_dir/ && git apply /grub-autoboot.patch) -(cd $cache_dir/ && git apply /efi-autoboot.patch) +(cd $cache_dir/ && git apply /builder/patches/offline/permissions.patch) +(cd $cache_dir/ && git apply /builder/patches/grub-autoboot.patch) +(cd $cache_dir/ && git apply /builder/patches/efi-autoboot.patch) # We could also use: # patch -p1 < aur-mirror.patch # patch -p1 < permissions.patch diff --git a/builder/patches/aur-mirror.patch b/builder/patches/offline/aur-mirror.patch similarity index 100% rename from builder/patches/aur-mirror.patch rename to builder/patches/offline/aur-mirror.patch diff --git a/builder/patches/offline-mirror.patch b/builder/patches/offline/offline-mirror.patch similarity index 100% rename from builder/patches/offline-mirror.patch rename to builder/patches/offline/offline-mirror.patch diff --git a/builder/patches/permissions.patch b/builder/patches/offline/permissions.patch similarity index 100% rename from builder/patches/permissions.patch rename to builder/patches/offline/permissions.patch