From dee358f0eccb9d6f6cc2008327089c60e408ff0c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 12 Sep 2013 23:27:22 +0200 Subject: [PATCH] AddBootModuleSymlinksToContainer: Fix symlink target 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. --- build/jam/ImageRules | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index 4305327159..67d468242b 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -525,8 +525,15 @@ rule AddBootModuleSymlinksToContainer container : targets 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 linkTarget = [ FDirName ../../.. $(installDir:G=) $(name) ] ; + local linkTarget = [ FDirName ../../.. $(installDir) $(name) ] ; AddSymlinkToContainer $(container) : $(systemDirTokens) add-ons kernel boot