From 5e4d5af2f9eab2ebd1cb268cf50fb782207b1ee2 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 23 Apr 2025 15:38:21 -0600 Subject: [PATCH] Revert "Make sure repo.tag is built before harddrive.img and livedisk.iso in ci-img" This reverts commit d6f1dbf284c411ba82a5cd33372833678f2291e5. --- mk/ci.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mk/ci.mk b/mk/ci.mk index 1f09a9e7..24def081 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -16,9 +16,7 @@ ci-img: FORCE # The name of the target must match the name of the filesystem config file server desktop demo: FORCE rm -f "build/$(ARCH)/$@/harddrive.img" "build/$(ARCH)/$@/livedisk.iso" - $(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/repo.tag - $(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/harddrive.img - $(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/livedisk.iso + $(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/livedisk.iso cp "build/$(ARCH)/$@/harddrive.img" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_harddrive.img" cp "build/$(ARCH)/$@/livedisk.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_livedisk.iso"