From: Matt Madia

* Added "extractedSubDir" parameter to ExtractArchiveTo{Container,HaikuImage}.
  If given it specified the path of the subdirectory in the archive that
  shall be extracted.
* Added AddWifiFirmwareToHaikuImage rule for extracting Wifi firmware
  archives onto the image.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35635 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/scripts/build_haiku_cd

@@ -40,6 +40,7 @@ extractFile()
 	# extractFile <archive> <directory>
 	archiveFile=$1
 	targetExtractDir=$2
+	extractedSubDir=$3
 
 	echo "Extracting $archiveFile ..."
 
@@ -66,7 +67,7 @@ extractFile()
 		rm $extractDir/.OptionalPackageDescription
 	fi
 
-	$cp -r "$extractDir/." "${tPrefix}$targetExtractDir"
+	$cp -r "$extractDir/$extractedSubDir/." "${tPrefix}$targetExtractDir"
 
 	$rmAttrs -rf "$extractDir"
 }

build/scripts/build_haiku_image

@@ -79,6 +79,7 @@ extractFile()
 	# extractFile <archive> <directory>
 	archiveFile=$1
 	targetExtractedDir=$2
+	extractedSubDir=$3
 
 	echo "Extracting $archiveFile ..."
 
@@ -105,7 +106,7 @@ extractFile()
 		rm $extractDir/.OptionalPackageDescription
 	fi
 
-	$cp -r "${sPrefix}$extractDir/." "${tPrefix}$targetExtractedDir"
+	$cp -r "${sPrefix}$extractDir/$extractedSubDir/." "${tPrefix}$targetExtractedDir"
 
 	$rmAttrs -rf "$extractDir"
 }