# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1398810888 -7200
# Node ID 6b9ff2df085e2cfb018527712e1c037d0b2c9f36
# Parent  d39012c42de3fcd8c4b8e006050673f8971b1f77
Treat all arch the same way (fix pkgs counting in web interface)

diff -r d39012c42de3 -r 6b9ff2df085e cook
--- a/cook	Sat Apr 26 11:00:36 2014 +0200
+++ b/cook	Wed Apr 30 00:34:48 2014 +0200
@@ -1160,13 +1160,11 @@
 		esac
 		sed -i \
 			-e s"/CFLAGS=.*/CFLAGS=\"$flags\"/" \
-			-e s"/HOST_SYSTEM=.*/HOST_SYSTEM=$host/" \
-			/etc/slitaz/cook.conf
+			-e s"/HOST_SYSTEM=.*/HOST_SYSTEM=$host/" /etc/slitaz/cook.conf
 		. /etc/slitaz/cook.conf
 		sysroot=$CROSS_TREE/sysroot
 		tools=/cross/$arch/tools
 		root=$sysroot
-		CC=$tools/bin/${HOST_SYSTEM}-gcc
 		# L10n: keep the same width of translations to get a consistent view
 		_ "Target arch     : \$ARCH"
 		_ "Configure args  : \$CONFIGURE_ARGS"
@@ -1188,7 +1186,7 @@
 			colorize 36 $(_ "WARNING: (e)glibc-base is not installed in sysroot")
 		fi
 		# Show GCC version or warn if not yet compiled.
-		if [ -x $CC ]; then
+		if [ -x "$tools/bin/${HOST_SYSTEM}-gcc" ]; then
 			_ "Cross compiler  : \${HOST_SYSTEM}-gcc"
 		else
 			colorize 36 $(_ "C compiler is missing: \${HOST_SYSTEM}-gcc")
diff -r d39012c42de3 -r 6b9ff2df085e cooker
--- a/cooker	Sat Apr 26 11:00:36 2014 +0200
+++ b/cooker	Wed Apr 30 00:34:48 2014 +0200
@@ -470,23 +470,18 @@
 
 		# Handle cross compilation. Create arch packages DB and remove pkgs
 		# not cooked for this arch from the commits list.
-		case "$ARCH" in
-			arm)
-				arch_db | log_commits
-				for pkg in $(cat $commits)
-				do
-					if [ ! -f "$wok/$pkg/arch.$ARCH" ]; then
-						echo "Cooker arch : skip $pkg (not included in: $ARCH)" | \
-							log_commits
-						sed -i "/^${pkg}$/"d $commits
-					fi
-				done ;;
-			i486)
-				echo "Cooker arch : $ARCH (default)" | log_commits ;;
-			*)
-				echo "Cooker arch : $ARCH" | log_commits ;;
-		esac
-
+		arch_db
+		for pkg in $(cat $commits)
+		do
+			if [ ! -f "$wok/$pkg/arch.$ARCH" ]; then
+				echo "Cooker arch : skip $pkg (not included in: $ARCH)" | \
+					log_commits
+				sed -i "/^${pkg}$/"d $commits
+			else
+				echo "Cooker arch : $ARCH" | log_commits
+			fi
+		done
+		
 		# Stats
 		pkgs=$(cat $commits | wc -l)
 		echo "Packages to cook: $pkgs" | log
diff -r d39012c42de3 -r 6b9ff2df085e web/cooker.cgi
--- a/web/cooker.cgi	Sat Apr 26 11:00:36 2014 +0200
+++ b/web/cooker.cgi	Wed Apr 30 00:34:48 2014 +0200
@@ -301,11 +301,7 @@
 		fi
 		# Main page with summary. Count only package include in ARCH,
 		# use 'cooker arch' to manually create arch.$ARCH files.
-		# We may have arm only packages, use arch.i486 ?
-		case "$ARCH" in
-			arm|x86_64) inwok=$(ls $WOK/*/arch.$ARCH | wc -l) ;;
-			*) inwok=$(ls $WOK | wc -l) ;;
-		esac
+		inwok=$(ls $WOK | wc -l)
 		cooked=$(ls $PKGS/*.tazpkg | wc -l)
 		unbuilt=$(($inwok - $cooked))
 		pct=0