[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gobolinux-commits
Subject:    [gobolinux-commits] tools/Bootstrap/functions PkgFunctions
From:       lucasvr () gobolinux ! org (Lucas Correia Villa Real)
Date:       2006-04-25 19:43:15
Message-ID: E1FYSaw-0007fK-EI () savannah ! gnu ! org
[Download RAW message or body]

CVSROOT:	/sources/goboscripts
Module name:	tools
Branch: 	
Changes by:	Lucas Correia Villa Real <lucasvr@savannah.gnu.org>	06/04/25 18:49:06

Modified files:
	Bootstrap/functions: PkgFunctions 

Log message:
	Using a new boolean called 'cross_compiling' instead of checking for \
$kernelVersion's contents;  Fixing Udev version on 070.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/goboscripts/tools/Bootstrap/functions/PkgFunctions.diff?tr1=1.7&tr2=1.8&r1=text&r2=text


Patches:
Index: tools/Bootstrap/functions/PkgFunctions
diff -u tools/Bootstrap/functions/PkgFunctions:1.7 \
                tools/Bootstrap/functions/PkgFunctions:1.8
--- tools/Bootstrap/functions/PkgFunctions:1.7	Thu Apr 13 13:52:37 2006
+++ tools/Bootstrap/functions/PkgFunctions	Tue Apr 25 18:49:06 2006
@@ -66,8 +66,9 @@
 	
     mkdir -p "$app_dir/$version_dir"
 
+    [ "$cross_compiling" ] && source "$goboSettings/Compile/Cross-$arch_conf.conf"
+    
 	pushd "$module" >& /dev/null
-    [ "$kernelVersion" != "" ] && source \
"$goboSettings/Compile/Cross-$arch_conf.conf"  make CC=$CC "$@" || exit 1
 	make CC=$CC install PREFIX="$app_dir/$version_dir" "$@" || exit 1
 	cp -a * "$app_dir/$version_dir"
@@ -85,13 +86,13 @@
 }
 
 function DirectFB_hook() {
-    # dirty test to check whether we're cross compiling or not
-    [ "$kernelVersion" = "" ] && return
+    [ ! "$cross_compiling" ] && return
     [ "$kernelArch" = "sh" ] && echo "CVS"
 }
 
 function Linux() {
-    [ "$kernelVersion" != "" ] && echo "$kernelVersion"
+    [ ! "$cross_compiling" ] && return
+    echo "$kernelVersion"
 }
 
 function Linux_Fusion_hook() {
@@ -100,14 +101,14 @@
 }
 
 function Udev_hook() {
-    # dirty test to check whether we're cross compiling or not
-    [ "$kernelVersion" = "" ] && return
+    [ ! "$cross_compiling" ] && return
+    echo "070"
     
-    kernel_version=`echo $kernelVersion | sed 's/-.*//g'`
-    latest_kernel=`GuessLatest $kernelVersion 2.6.15`
-    [ "$kernel_version" = "$latest_kernel" ] && return
+#    kernel_version=`echo $kernelVersion | sed 's/-.*//g'`
+#    latest_kernel=`GuessLatest $kernelVersion 2.6.15`
+#    [ "$kernel_version" = "$latest_kernel" ] && return
 
     # if kernelVersion for cross-compile is older than 2.6.15,
     # recommend usage of Udev 070 instead of the latest release.
-    [ "$latest_kernel" = "2.6.15" ] && echo "070"
+#    [ "$latest_kernel" = "2.6.15" ] && echo "070"
 }


[prev in list] [next in list] [prev in thread] [next in thread]