[haiku-commits] r35943 - haiku/trunk/build/jam

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 24 Mar 2010 17:30:04 +0100 (CET)

Author: mmadia
Date: 2010-03-24 17:30:04 +0100 (Wed, 24 Mar 2010)
New Revision: 35943
Changeset: http://dev.haiku-os.org/changeset/35943/haiku

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Updated the optional package WifiFirmwareScriptData. The firmware archives for
ipw2100 & iprowifi2200 are distributed with the default image.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2010-03-24 16:26:47 UTC (rev 
35942)
+++ haiku/trunk/build/jam/OptionalPackages      2010-03-24 16:30:04 UTC (rev 
35943)
@@ -407,6 +407,7 @@
                InstallOptionalHaikuImagePackage 
gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip
                        : $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip ;
                if $(HAIKU_GCC_VERSION[1]) = 2 {
+                       # symlink to the appropriate system/lib[/gcc2] folder
                        AddSymlinkToHaikuHybridImage
                                develop abi x86 gcc2 tools 
gcc-2.95.3-haiku-090629 lib
                                : /system/lib libstdc++.r4.so : : true ;
@@ -1186,22 +1187,6 @@
                AddFilesToHaikuImage system data firmware broadcom43xx
                        : $(broadcom43xxFile) ;
 
-               # ipw2100
-               local FirmwareTopDirectory = [ FDirName
-                       $(HAIKU_TOP) data system data firmware ] ;
-               local ipw2100FWArchive = [ FDirName
-                       $(FirmwareTopDirectory) ipw2100 ipw2100-fw-1.3.tgz ] ;
-               AddFilesToHaikuImage system data firmware ipw2100
-                       : $(ipw2100FWArchive) ;
-
-               # iprowifi2200
-               local FirmwareTopDirectory = [ FDirName
-                       $(HAIKU_TOP) data system data firmware ] ;
-               local iprowifi2200FWArchive = [ FDirName
-                       $(FirmwareTopDirectory) iprowifi2200 ipw2200-fw-3.1.tgz 
] ;
-               AddFilesToHaikuImage system data firmware iprowifi2200
-                       : $(iprowifi2200FWArchive) ;
-
                # marvell88w8335
                local marvelArchive = malo-firmware-1.4.tgz ;
                local marvelURL = http://www.nazgul.ch/malo/$(marvelArchive) ;


Other related posts:

  • » [haiku-commits] r35943 - haiku/trunk/build/jam - mattmadia