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

From: Matt Madia

Browse Source 
* Fixes check for hybrid builds in installoptionalpackage script.
 * Adds WifiFirmwareScriptData to the packages to ignore.

Closes #5493.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35696 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-03-01 10:11:22 +00:00
parent b6c650ce68
commit 0c4323bde0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/bin/installoptionalpackage
+4 -3
View File
@@ -30,7 +30,8 @@ declare availablePackagesKeys=""
# Some Packages cannot be installed, # Some Packages cannot be installed,
# as they require either the source code or compiled binaries # as they require either the source code or compiled binaries
declare packageIgnoreList='Bluetooth Development DevelopmentMin \ declare packageIgnoreList='Bluetooth Development DevelopmentMin \
DevelopmentBase P7zip UserlandFS Welcome Wifi-ipw2100+fw Wifi-iprowifi2200+fw' DevelopmentBase P7zip UserlandFS Welcome Wifi-ipw2100+fw Wifi-iprowifi2200+fw \
WifiFirmwareScriptData'
function CreateInstallerScript() function CreateInstallerScript()
@@ -295,10 +296,10 @@ function DetectSystemConfiguration()
isHybridBuild=1 isHybridBuild=1
elif [ -f "$libDir"/libsupc++.so ] ; then elif [ -f "$libDir"/libsupc++.so ] ; then
HAIKU_GCC_VERSION[1]=4 HAIKU_GCC_VERSION[1]=4
isHybridBuild=0 isHybridBuild=""
else else
HAIKU_GCC_VERSION[1]=2 HAIKU_GCC_VERSION[1]=2
isHybridBuild=0 isHybridBuild=""
fi fi
# Determine the Architecture. # Determine the Architecture.