MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 23:44:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Make sure repo.tag is built before harddrive.img and livedisk.iso in ci-img"

Browse Source 
This reverts commit d6f1dbf284.
This commit is contained in:
Jeremy Soller 2025-04-23 15:38:21 -06:00
parent cecae079fc
commit 5e4d5af2f9
No known key found for this signature in database
GPG Key ID: 670FDFB5428E05CA
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/ci.mk
View File

@ -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"