diff --git a/Makefile b/Makefile index 8af03f3e..5e323480 100644 --- a/Makefile +++ b/Makefile @@ -10,28 +10,28 @@ all: $(BUILD)/harddrive.img live: -$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) /tmp/redox_installer/ || true - rm -f $(BUILD)/livedisk.iso - $(MAKE) $(BUILD)/livedisk.iso + rm -f $(BUILD)/redox-live.iso + $(MAKE) $(BUILD)/redox-live.iso netboot: -$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) /tmp/redox_installer/ || true - rm -rf $(BUILD)/livedisk.iso $(BUILD)/tftproot + rm -rf $(BUILD)/redox-live.iso $(BUILD)/tftproot $(MAKE) $(BUILD)/tftproot -popsicle: $(BUILD)/livedisk.iso - popsicle-gtk $(BUILD)/livedisk.iso +popsicle: $(BUILD)/redox-live.iso + popsicle-gtk $(BUILD)/redox-live.iso image: -$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) /tmp/redox_installer/ || true - rm -f $(BUILD)/harddrive.img $(BUILD)/livedisk.iso + rm -f $(BUILD)/harddrive.img $(BUILD)/redox-live.iso $(MAKE) all rebuild: -$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) /tmp/redox_installer/ || true - rm -rf $(BUILD)/repo.tag $(BUILD)/harddrive.img $(BUILD)/livedisk.iso + rm -rf $(BUILD)/repo.tag $(BUILD)/harddrive.img $(BUILD)/redox-live.iso $(MAKE) all clean: $(CONTAINER_TAG) diff --git a/build.sh b/build.sh index 72249adc..da48a43f 100755 --- a/build.sh +++ b/build.sh @@ -34,7 +34,7 @@ usage() echo " config/ARCH/CONFIG.toml" echo " If you specify both CONFIG and FILESYSTEM_CONFIG, it is not" echo " necessary that they match, but it is recommended." - echo " Examples: ./build.sh -c demo live - make build/x86_64/demo/livedisk.iso" + echo " Examples: ./build.sh -c demo live - make build/x86_64/demo/redox-live.iso" echo " ./build.sh -6 qemu - make build/i686/desktop/harddrive.img and" echo " and run it in qemu" echo " NOTE: If you do not change ARCH or CONFIG very often, edit mk/config.mk" diff --git a/mk/ci.mk b/mk/ci.mk index 16270a6e..9d7cde36 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -15,11 +15,11 @@ ci-img: FORCE # The name of the target must match the name of the filesystem config file minimal minimal-net server desktop demo: FORCE - rm -f "build/$(ARCH)/$@/harddrive.img" "build/$(ARCH)/$@/livedisk.iso" - $(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/livedisk.iso + rm -f "build/$(ARCH)/$@/harddrive.img" "build/$(ARCH)/$@/redox-live.iso" + $(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/redox-live.iso mkdir -p $(IMG_DIR) 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" + cp "build/$(ARCH)/$@/redox-live.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_redox-live.iso" # CI packaging target ci-pkg: prefix $(FSTOOLS_TAG) $(CONTAINER_TAG) FORCE diff --git a/mk/disk.mk b/mk/disk.mk index 2ab57bcc..a3c64a39 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -12,7 +12,7 @@ $(BUILD)/harddrive.img: $(HOST_FSTOOLS) $(REPO_TAG) umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) $@.partial mv $@.partial $@ -$(BUILD)/livedisk.iso: $(HOST_FSTOOLS) $(REPO_TAG) +$(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG) mkdir -p $(BUILD) rm -rf $@ $@.partial -$(FUMOUNT) /tmp/redox_installer || true @@ -24,11 +24,11 @@ $(BUILD)/livedisk.iso: $(HOST_FSTOOLS) $(REPO_TAG) umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(BUILD)/bootloader-live.efi" --live $@.partial mv $@.partial $@ -$(BUILD)/tftproot: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/livedisk.iso +$(BUILD)/tftproot: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/redox-live.iso rm -r $(BUILD)/tftproot || true mkdir $(BUILD)/tftproot cp $(BUILD)/bootloader-live.efi $(BUILD)/tftproot/bootloader-live.efi - ln -s ../livedisk.iso $(BUILD)/tftproot/redox-live.iso + ln -s ../redox-live.iso $(BUILD)/tftproot/redox-live.iso cp redox.ipxe $(BUILD)/tftproot/redox.ipxe $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG) diff --git a/mk/qemu.mk b/mk/qemu.mk index b91923f7..14eef958 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -108,7 +108,7 @@ ifneq ($(QEMU_KERNEL),) endif ifeq ($(live),yes) - DISK=$(BUILD)/livedisk.iso + DISK=$(BUILD)/redox-live.iso else DISK=$(BUILD)/harddrive.img endif diff --git a/scripts/ventoy.sh b/scripts/ventoy.sh index 8022f04b..e3ac3bed 100755 --- a/scripts/ventoy.sh +++ b/scripts/ventoy.sh @@ -24,7 +24,7 @@ for ARCH in "${ARCHS[@]}" do for CONFIG_NAME in "${CONFIGS[@]}" do - IMAGE="build/${ARCH}/${CONFIG_NAME}/livedisk.iso" + IMAGE="build/${ARCH}/${CONFIG_NAME}/redox-live.iso" make ARCH="${ARCH}" CONFIG_NAME="${CONFIG_NAME}" "${IMAGE}" cp -v "${IMAGE}" "${VENTOY}/redox-${CONFIG_NAME}-${ARCH}.iso" done