[d-i-commits] r32037 - in trunk/packages/base-installer: debian kernel kernel/tests/powerpc

[Colin Watson]

Author: cjwatson
Date: 2005-11-14 14:23:59 +0000 (Mon, 14 Nov 2005)
New Revision: 32037

Modified:
   trunk/packages/base-installer/debian/changelog
   trunk/packages/base-installer/kernel/powerpc.sh
   trunk/packages/base-installer/kernel/tests/powerpc/chrp_ibm.test
Log:
* Fix code to avoid -smp variants on powerpc64.

Modified: trunk/packages/base-installer/debian/changelog
===================================================================
--- trunk/packages/base-installer/debian/changelog	2005-11-14 14:17:33 UTC (rev 32036)
+++ trunk/packages/base-installer/debian/changelog	2005-11-14 14:23:59 UTC (rev 32037)
@@ -46,6 +46,9 @@
   [ Sven Luther ]
   * Adapted to chrp_rs6k -> chrp_ibm migration.
 
+  [ Colin Watson ]
+  * Fix code to avoid -smp variants on powerpc64.
+
  -- Sven Luther <luther at debian.org>  Mon, 14 Nov 2005 14:09:20 +0000
 
 base-installer (1.35) unstable; urgency=low

Modified: trunk/packages/base-installer/kernel/powerpc.sh
===================================================================
--- trunk/packages/base-installer/kernel/powerpc.sh	2005-11-14 14:17:33 UTC (rev 32036)
+++ trunk/packages/base-installer/kernel/powerpc.sh	2005-11-14 14:23:59 UTC (rev 32037)
@@ -36,7 +36,7 @@
 	apusversion=2.4.27
 
 	CPUS="$(grep -ci ^processor "$CPUINFO")" || CPUS=1
-	if [ "$CPUS" ] && [ "$CPUS" -gt 1 ] && [ "$family" != "powerpc64" ]; then
+	if [ "$CPUS" ] && [ "$CPUS" -gt 1 ] && [ "$1" != "powerpc64" ]; then
 		SMP=-smp
 	else
 		SMP=

Modified: trunk/packages/base-installer/kernel/tests/powerpc/chrp_ibm.test
===================================================================
--- trunk/packages/base-installer/kernel/tests/powerpc/chrp_ibm.test	2005-11-14 14:17:33 UTC (rev 32036)
+++ trunk/packages/base-installer/kernel/tests/powerpc/chrp_ibm.test	2005-11-14 14:23:59 UTC (rev 32037)
@@ -3,7 +3,6 @@
 majors 2.6
 flavour powerpc64
 kernel-2.6 \
-  linux-image-2.6-powerpc64-smp \
   linux-image-2.6-powerpc64
 usable \
   linux-image-2.6-powerpc64-smp \