Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AddBootModuleSymlinksToContainer: Fix symlink target

Browse Source 
The symlink was only correct, if the container was a package. For
containers with a non-empty path to the system directory the link would
duplicate the system directory path.
This commit is contained in:
Ingo Weinhold 2013-09-12 23:27:22 +02:00
parent b3eaedd14a
commit dee358f0ec
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/jam/ImageRules
View File

@ -525,8 +525,15 @@ rule AddBootModuleSymlinksToContainer container : targets
Exit "ERROR: Add*ToContainer has not been invoked for it yet." ; Exit "ERROR: Add*ToContainer has not been invoked for it yet." ;
} }
# chop off the system dir prefix from installDir
installDir = [ on $(installDir) return $(DIRECTORY_TOKENS) ] ;
local dummy ;
for dummy in $(systemDirTokens) {
installDir = $(installDir[2-]) ;
}
local name = $(target:BS) ; local name = $(target:BS) ;
local linkTarget = [ FDirName ../../.. $(installDir:G=) $(name) ] ; local linkTarget = [ FDirName ../../.. $(installDir) $(name) ] ;
AddSymlinkToContainer $(container) AddSymlinkToContainer $(container)
: $(systemDirTokens) add-ons kernel boot : $(systemDirTokens) add-ons kernel boot