From 0c4323bde07354ef0c5647e346be556d308ee69a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Mon, 1 Mar 2010 10:11:22 +0000
Subject: [PATCH] From: Matt Madia

 * 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
---
 data/bin/installoptionalpackage | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage
index 5263305b7b..a081e9406d 100755
--- a/data/bin/installoptionalpackage
+++ b/data/bin/installoptionalpackage
@@ -30,7 +30,8 @@ declare availablePackagesKeys=""
 # Some Packages cannot be installed,
 # as they require either the source code or compiled binaries
 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()
@@ -295,10 +296,10 @@ function DetectSystemConfiguration()
 		isHybridBuild=1
 	elif [ -f "$libDir"/libsupc++.so ] ; then
 		HAIKU_GCC_VERSION[1]=4
-		isHybridBuild=0
+		isHybridBuild=""
 	else
 		HAIKU_GCC_VERSION[1]=2
-		isHybridBuild=0
+		isHybridBuild=""
 	fi
 
 	# Determine the Architecture.