Makefile: support absolute VM_DIR paths (e.g. external SSD)#345
Open
Xplo8E wants to merge 1 commit into
Open
Conversation
The fw_patch* and restore_* targets built the VM directory argument as $(CURDIR)/$(VM_DIR), which assumes VM_DIR is relative to the repo. An absolute VM_DIR (e.g. /Volumes/ssd/vphone-vm) produced a broken joined path like /Users/.../vphone-cli//Volumes/ssd/vphone-vm and failed with 'no such file'. Add VM_DIR_ABS := $(abspath $(VM_DIR)) and use it for the VM directory argument. abspath leaves absolute paths intact and joins relative ones against CURDIR, so both the default 'vm' and absolute paths work. The cd $(VM_DIR) targets were already absolute-safe and are unchanged.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The fw_patch* and restore_* targets built the VM directory argument as$(CURDIR)/$ (VM_DIR), which assumes VM_DIR is relative to the repo. An absolute VM_DIR (e.g. /Volumes/ssd/vphone-vm) produced a broken joined path like /Users/.../vphone-cli//Volumes/ssd/vphone-vm and failed with 'no such file'.
Add VM_DIR_ABS :=$(abspath $ (VM_DIR)) and use it for the VM directory argument. abspath leaves absolute paths intact and joins relative ones against CURDIR, so both the default 'vm' and absolute paths work. The cd $(VM_DIR) targets were already absolute-safe and are unchanged.