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

[Sven Luther]

Author: luther
Date: Sat Sep 23 19:39:26 2006
New Revision: 7488

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

Log:
Adapted arch/powerpc/boot uncompressor list to 2.6.18 kernels.


Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog	Sat Sep 23 19:39:26 2006
@@ -1,3 +1,9 @@
+mkvmlinuz (24) unstable; urgency=low
+
+  * Adapted uncompressor object list to 2.6.18.
+
+ -- Sven Luther <sven at tael.powerlinux.fr>  Sat, 23 Sep 2006 21:36:49 +0200
+
 mkvmlinuz (23) unstable; urgency=low
 
   * Fallback arch/powerpc/boot object files for chrp kernels without mkvmlinuz

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	Sat Sep 23 19:39:26 2006
@@ -146,6 +146,12 @@
   post_2_6_16=
 fi
 
+if dpkg --compare-versions $release ge 2.6.18; then
+  post_2_6_18=Yes
+else
+  post_2_6_18=
+fi
+
 test -z "$verbose" || echo === Release version seems to be $release.
 
 # if no object file directory was specified, try to find one
@@ -215,7 +221,11 @@
 	dummy_kernel=$objs/mkvmlinuz-kernel-vmlinux.strip.o
 	dummy_initrd=$objs/mkvmlinuz-kernel-initrd.o
 	OBJS="$objs/crt0.o $objs/string.o $objs/prom.o $objs/stdio.o $objs/main.o $objs/div64.o"
-	OBJS="$OBJS $objs/infblock.o $objs/infcodes.o $objs/inffast.o $objs/inflate.o $objs/inftrees.o $objs/infutil.o"
+	if test "$post_2_6_18"; then
+		OBJS="$OBJS $objs/inffast.o $objs/inflate.o $objs/inftrees.o"
+	else
+		OBJS="$OBJS $objs/infblock.o $objs/infcodes.o $objs/inffast.o $objs/inflate.o $objs/inftrees.o $objs/infutil.o"
+	fi
 	;;
     apus,,*|miboot,,*|*,Yes,*)
 	;;