From 2b355ea6fc8fbfda29b266d5b16a03502fcf6aea Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Wed, 24 Mar 2010 16:30:04 +0000 Subject: [PATCH] Updated the optional package WifiFirmwareScriptData. The firmware archives for ipw2100 & iprowifi2200 are distributed with the default image. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35943 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 5b6e2a311f..6fcbcd65b6 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -407,6 +407,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] 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 @@ if [ IsOptionalHaikuImagePackageAdded WifiFirmwareScriptData ] { 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) ;