Use local packages for ci images

This commit is contained in:
Jeremy Soller 2022-11-11 12:19:51 -07:00
parent 9c4f0756ec
commit 04286c49ac
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE

View file

@ -13,10 +13,7 @@ ci-img: FORCE
# The name of the target must match the name of the filesystem config file # The name of the target must match the name of the filesystem config file
desktop server demo: FORCE desktop server demo: FORCE
rm -f "$(BUILD)/harddrive.img" "$(BUILD)/livedisk.iso" rm -f "$(BUILD)/harddrive.img" "$(BUILD)/livedisk.iso"
$(MAKE) REPO_BINARY=1 \ $(MAKE) FILESYSTEM_CONFIG=config/$(ARCH)/$@.toml $(BUILD)/harddrive.img $(BUILD)/livedisk.iso
FILESYSTEM_CONFIG=config/$(ARCH)/$@.toml \
$(BUILD)/harddrive.img \
$(BUILD)/livedisk.iso
cp "$(BUILD)/harddrive.img" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_harddrive.img" cp "$(BUILD)/harddrive.img" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_harddrive.img"
cp "$(BUILD)/livedisk.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_livedisk.iso" cp "$(BUILD)/livedisk.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_livedisk.iso"