r4372 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: . debian

[Sven Luther]

Author: luther
Date: 2005-10-10 13:49:40 +0000 (Mon, 10 Oct 2005)
New Revision: 4372

Modified:
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/mkvmlinuz.sgml
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
Log:
Well, now that i understand the objcopy vs strip issue better,
i know how to do the right thing on apus and miboot.
This was probably what broke the miboot floppies for sarge :/


Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
===================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog	2005-10-10 13:40:46 UTC (rev 4371)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog	2005-10-10 13:49:40 UTC (rev 4372)
@@ -1,7 +1,6 @@
-mkvmlinuz (15) unstable; urgency=low
+mkvmlinuz (15) unstable; urgency=high
 
-  * Added support for generating a vmlinuz on apus.
-  * Fixed miboot floppy generation also.
+  * Generates a striped compressed vmlinuz on apus and miboot.
 
  -- Sven Luther <luther at dbeian.org>  Mon, 10 Oct 2005 10:01:33 +0200
 

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/mkvmlinuz.sgml
===================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/mkvmlinuz.sgml	2005-10-10 13:40:46 UTC (rev 4371)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/mkvmlinuz.sgml	2005-10-10 13:49:40 UTC (rev 4372)
@@ -50,7 +50,6 @@
       <arg><option>-i <replaceable>initrd</replaceable></option></arg>
       <arg><option>-d <replaceable>objdir</replaceable></option></arg>
       <arg><option>-r <replaceable>release</replaceable></option></arg>
-      <arg><option>-t</option></arg>
       <arg><option>-n</option></arg>
       <arg><option>-z</option></arg>
       <arg><option>-u</option></arg>
@@ -213,14 +212,6 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-	<term><option>-t</option></term>
-	<listitem>
-	  <para>Use strip instead of objcopy -O binary to reduce the size
-	  of the kernel. Objcopy produce slightly smaller executables, but
-	  i suppose it also removes more stuff.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
 	<term><option>-n</option></term>
 	<listitem>
 	  <para>Do not attempt to find an initrd image file if none

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
===================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	2005-10-10 13:40:46 UTC (rev 4371)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	2005-10-10 13:49:40 UTC (rev 4372)
@@ -10,7 +10,6 @@
     echo ' -i <initrd>  - path to initrd image file'
     echo ' -d <objdir>  - path to directory with additional object files'
     echo ' -r <release> - kernel release number'
-    echo ' -t           - use strip instead of objcopy -O binary on the kernel'
     echo ' -n           - do not use an initrd'
     echo ' -z           - assume the initrd image file is already compressed'
     echo ' -u           - assume the initrd image file is not compressed'
@@ -40,7 +39,6 @@
 	d) objdir=$OPTARG ;;
 	r) release=$OPTARG ;;
 	a) arch=$OPTARG ;;
-	t) strip="Yes" ;;
 	n) noinitrd="Yes" ;;
 	z) compressed="Yes" ;;
 	u) compressed="No" ;;
@@ -51,15 +49,12 @@
 
 # Let's provide some subarch dependent defaults
 case $arch in
-    apus)
-    	# Apus needs stripping and don't use builtin initrd.
-    	strip="Yes"
+    apus|miboot)
+    	# miboot and apus don't use builtin initrds,
+	# and need to stay elf kernels, as we don't use a wrapper.
+    	elf="Yes"
     	noinitrd="Yes"
     	;;
-    miboot)
-    	# miboot doesn't use builtin initrd. Maybe stripping would be nice too ?
-    	noinitrd="Yes"
-    	;;
 esac
 
 # use non-option arguments as release version and kernel image file if needed
@@ -227,7 +222,7 @@
 
 # create the compressed kernel image file
 test -z "$verbose" || echo === Creating compressed kernel image vmlinux.gz...
-if test -n "$strip"; then
+if test -n "$elf"; then
     do_cmd $STRIP $kernel -o $work/vmlinux
 else
     do_cmd $OBJCOPY -O binary $kernel $work/vmlinux
@@ -322,12 +317,9 @@
 	do_cmd $OBJCOPY $OBJCOPY_ARGS $vmlinuz $vmlinuz.tmp
 	do_cmd $MKPREP -pbp $vmlinuz.tmp $vmlinuz
 	;;
-    miboot,2.6*)
+    miboot,2.6*|apus,2.6*)
         do_cmd $MV $vmlinuz.tmp $vmlinuz
 	;;
-    apus,2.6*)
-        do_cmd $MV $vmlinuz.tmp $vmlinuz
-	;;
     *)
 	echo Sorry, I do not know how to handle PowerPC sub-architecture $arch in version $release.
 esac