i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extended AddWifiFirmwareToHaikuImage to support a boolean, which determines

Browse Source 
whether to extract the firmware archive onto Haiku Image or to simply copy
it intact. This allows the ipw2100 and iprowifi2200 firmware archives to be
copied onto the default images. Fixes #5523


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35738 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-03-03 17:23:06 +00:00
parent 88f1263865
commit b353282928
8 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+4 -1
View File
@@ -196,11 +196,14 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ;
local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
local extract = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_DO_EXTRACT) ] ;
if $(archive) {
AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive) ;
AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive)
: $(extract) ;
}
}
# modules
AddFilesToHaikuImage system add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
build/jam/ImageRules
+8 -5
View File
@@ -698,18 +698,21 @@ rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate
: $(dirName) : -x .svn : $(alwaysUpdate) ;
}
rule AddWifiFirmwareToHaikuImage driver : package : archive
rule AddWifiFirmwareToHaikuImage driver : package : archive : extract
{
#AddWifiFirmwareToHaikuImage <driver> : <package> : <archive>
#AddWifiFirmwareToHaikuImage <driver> : <package> : <archive> : <extract>
# 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) ;
if $(extract) = true || $(extract) = 1 {
ExtractArchiveToHaikuImage $(dirTokens) : $(firmwareArchive) :
: $(package) ;
} else {
AddFilesToHaikuImage $(dirTokens) : $(firmwareArchive) ;
}
}
rule ExtractArchiveToHaikuImage dirTokens : archiveFile : alwaysUpdate