Ticket #5455: ImageRules-ruleAddWifiFirmwareToHaikuImage.patch

haiku/build/jam/ImageRules

@@ -273 +273 @@
     DIRECTORIES_TO_INSTALL on $(directory) += $(targetDir) ;
 }
 
-rule ExtractArchiveToContainer container : directoryTokens : archiveFile
+rule ExtractArchiveToContainer container : directoryTokens : archiveFile : extractedSubDir
 {
-    # ExtractArchiveToContainer <container> : <directory> : <archiveFile> ;
+    # ExtractArchiveToContainer <container> : <directory> : <archiveFile> : <extractedSubDir> ;
     #
 
     local directory = [ AddDirectoryToContainer $(container)
         : $(directoryTokens) ] ;
 
     ARCHIVE_FILES_TO_INSTALL on $(directory) += $(archiveFile) ;
+    ARCHIVE_SUBDIR_TO_INSTALL_FROM on $(archiveFile) = $(extractedSubDir) ;
 }
 
 rule AddDriversToContainer container : relativeDirectoryTokens : targets
@@ -590 +591 @@
             NotFile $(dummyTarget) ;
             TARGET_DIR on $(dummyTarget) = $(dir:G=) ;
 
+            local extractedSubDir = [ on $(archiveFile) 
+                return $(ARCHIVE_SUBDIR_TO_INSTALL_FROM) ] ;
+            NotFile $(extractedSubDir) ;
+
             Depends $(dummyTarget) : $(initScript) $(archiveFile)
                 $(serializationDependency) ;
             Depends $(script) : $(dummyTarget) ;
             serializationDependency = $(dummyTarget) ;
 
             AddExtractFileToContainerExtractFilesScript $(dummyTarget) 
-                : $(initScript) $(archiveFile) ;
+                : $(initScript) $(archiveFile) $(extractedSubDir) ;
         }
     }
 }
@@ -604 +609 @@
 
 actions AddExtractFileToContainerExtractFilesScript
 {
-    echo extractFile "\"$(2[2])\"" "\"$(TARGET_DIR)\"" >> $(2[1])
+    echo extractFile "\"$(2[2])\"" "\"$(TARGET_DIR)\"" "\"$(2[3])\"" >> $(2[1])
 }
 
 
@@ -691 +696 @@
         : $(dirName) : -x .svn : $(alwaysUpdate) ;
 }
 
-rule ExtractArchiveToHaikuImage dirTokens : archiveFile : alwaysUpdate
+rule AddWifiFirmwareToHaikuImage driver : package : archive
 {
-    # ExtractArchiveToHaikuImage <dirTokens> : <archiveFile> : <alwaysUpdate> ;
+    #AddWifiFirmwareToHaikuImage <driver> : <package> : <archive>
+    
+    # complete location to wifi firmware archive
+    local firmwareArchive = [ FDirName 
+        $(HAIKU_TOP) data system data firmware $(driver) $(archive) ] ;
+    
+    local dirTokens = system data firmware $(driver) ;
+    
+    ExtractArchiveToHaikuImage $(dirTokens) : $(firmwareArchive) : : $(package) ;
+}
+
+rule ExtractArchiveToHaikuImage dirTokens : archiveFile : alwaysUpdate : extractedSubDir
+{
+    # ExtractArchiveToHaikuImage <dirTokens> : <archiveFile> : <alwaysUpdate>  : <extractedSubDir> ;
 
     # If the image shall only be updated, we extract only, if explicitely
     # requested.
     if ! [ IsUpdateHaikuImageOnly ] || $(alwaysUpdate) {
         ExtractArchiveToContainer $(HAIKU_IMAGE_CONTAINER_NAME) : $(dirTokens)
-            : $(archiveFile) ;
+            : $(archiveFile) : $(extractedSubDir) ;
     }
 }
 

haiku/build/scripts/build_haiku_cd

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

haiku/build/scripts/build_haiku_image

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