From 0afec1917eb42cdee067fe64ea47282964c80352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Mon, 9 Jun 2008 20:32:54 +0000
Subject: [PATCH] added AddNewDriversToHaikuImage to replace
 AddDriverRegistrationToHaikuImage: it places drivers which supports the new
 device architecture at the right place

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25889 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/ImageRules | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index f44261235f..0fbd633301 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -298,25 +298,16 @@ rule AddDriversToContainer container : relativeDirectoryTokens : targets
 	}
 }
 
-rule AddDriverRegistrationToContainer container : relativeDirectoryTokens
-	: target : links
+rule AddNewDriversToContainer container : relativeDirectoryTokens
+	: targets
 {
-	# AddDriverRegistrationToContainer <container> : <directory>
-	#	: <link target> : <link names> ] ;
+	# AddNewDriversToContainer <container> : <directory> : <targets> ;
 	#
-	local directoryTokens = beos system add-ons kernel registration
+	local directoryTokens = beos system add-ons kernel drivers
 		$(relativeDirectoryTokens) ;
 
-	# get the relative symlink path prefix
-	local linkPrefix = ;
-	for i in $(relativeDirectoryTokens) {
-		linkPrefix += .. ;
-	}
-	linkPrefix += .. drivers bin ;
-
-	# add the symlink
-	AddSymlinkToContainer $(container) : $(directoryTokens)
-		: [ FDirName $(linkPrefix) $(target:BS) ] : $(links) ;
+	AddFilesToContainer $(container) : $(directoryTokens)
+		: $(targets) ;
 }
 
 rule AddBootModuleSymlinksToContainer container : targets
@@ -666,12 +657,12 @@ rule AddDriversToHaikuImage relativeDirectoryTokens : targets
 		: $(relativeDirectoryTokens) : $(targets) ;
 }
 
-rule AddDriverRegistrationToHaikuImage relativeDirectoryTokens : target : links
+rule AddNewDriversToHaikuImage relativeDirectoryTokens : targets
 {
-	# AddDriverRegistrationToHaikuImage <directory> : <link target> : <link names> ] ;
+	# AddNewDriversToHaikuImage <relative directory> : <targets> ;
 
-	AddDriverRegistrationToContainer $(HAIKU_IMAGE_CONTAINER_NAME)
-		: $(relativeDirectoryTokens) : $(target) : $(links) ;
+	AddNewDriversToContainer $(HAIKU_IMAGE_CONTAINER_NAME)
+		: $(relativeDirectoryTokens) : $(targets) ;
 }
 
 rule AddBootModuleSymlinksToHaikuImage targets