[haiku-commits] r35696 - haiku/trunk/data/bin

  • From: superstippi@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 1 Mar 2010 11:11:23 +0100 (CET)

Author: stippi
Date: 2010-03-01 11:11:22 +0100 (Mon, 01 Mar 2010)
New Revision: 35696
Changeset: http://dev.haiku-os.org/changeset/35696/haiku
Ticket: http://dev.haiku-os.org/ticket/5493

Modified:
   haiku/trunk/data/bin/installoptionalpackage
Log:
From: Matt Madia

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

Closes #5493.


Modified: haiku/trunk/data/bin/installoptionalpackage
===================================================================
--- haiku/trunk/data/bin/installoptionalpackage 2010-03-01 10:05:27 UTC (rev 
35695)
+++ haiku/trunk/data/bin/installoptionalpackage 2010-03-01 10:11:22 UTC (rev 
35696)
@@ -30,7 +30,8 @@
 # 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 @@
                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.


Other related posts:

  • » [haiku-commits] r35696 - haiku/trunk/data/bin - superstippi