[kernel] r6930 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: debian

[Sven Luther]

Author: luther
Date: Thu Jun 29 21:47:20 2006
New Revision: 6930

Modified:
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz

Log:
Only use the fallback object files on 2.6.16+ CHRP kernels.


Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog	Thu Jun 29 21:47:20 2006
@@ -1,7 +1,7 @@
 mkvmlinuz (23) UNRELEASED; urgency=low
 
-  * Added arch/powerpc/boot object files in /usr/lib/mkvmlinuz, so mkvmlinuz
-    will work even if the used kernel has no mkvmlinuz support.
+  * Fallback arch/powerpc/boot object files, for 2.6.16+ CHRP kernels
+    without mkvmlinuz support. 
 
  -- Sven Luther <luther at debian.org>  Thu, 29 Jun 2006 23:38:07 +0200
 

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	Thu Jun 29 21:47:20 2006
@@ -159,7 +159,7 @@
 	:
     elif objdir=/usr/lib/kernel-image-$release; test -d $objdir; then
 	:
-    elif test -n "$post_2_6_16" && ( objdir=/usr/lib/mkvmlinuz; test -d $objdir ); then
+    elif test -n "$post_2_6_16" && test "$arch" = "chrp" && ( objdir=/usr/lib/mkvmlinuz; test -d $objdir ); then
 	:
     else
 	objdir="$PWD"