[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#60956: ARM is not supported (patch included)



The patch was applied, aside from the following issues:

 - kernel.sh and install.sh: Why does ARM perversely use /boot/Image*
   instead of /boot/vmlinuz* like anyone else?  Just different for the
   sake of being different?  This seems to me like something that
   ought to be fixed in the kernel-image-* packages, not changed in
   boot-floppies.

 - fdisk.c: this is a bugfix that I am not equipped to evaluate.
   Can you explain why it is needed?

-- 
.....Adam Di Carlo....adam@onShore.com.....<URL:http://www.onShore.com/>

=== cd /home/apharris/debian/boot-floppies/boot-floppies/
=== /usr/bin/cvs diff -u kernel.sh

Index: kernel.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/kernel.sh,v
retrieving revision 1.19
diff -u -u -r1.19 kernel.sh
--- kernel.sh	2000/03/08 16:41:43	1.19
+++ kernel.sh	2000/03/24 07:03:50
@@ -84,6 +84,8 @@
 	# vmlinux.coff-<version> is the kernel for OF booting
 	cp $extractdir/boot/vmlinux-* linux$revext
 	cp $extractdir/boot/vmlinux.coff-* linux$revext.coff
+elif [ "${kernel_version##*-}" = netwinder ]; then
+        cp $extractdir/boot/Image* linux$revext
 else
 	cp $extractdir/boot/vmlinuz* linux$revext
 fi
=== Exit status: 1
=== cd /home/apharris/debian/boot-floppies/boot-floppies/scripts/rescue/
=== /usr/bin/cvs diff -u install.sh

Index: install.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/scripts/rescue/install.sh,v
retrieving revision 1.17
diff -u -u -r1.17 install.sh
--- install.sh	2000/03/24 03:43:35	1.17
+++ install.sh	2000/03/24 07:03:57
@@ -22,6 +22,8 @@
 # Check for a pmac compressed kernel and copy/gunzip it.
 if [ -f linux.gz -a "$Arch" != "alpha" ]; then
 	zcat linux.gz > ${DDIR}/boot/vmlinux-${VERSION}
+elif [ "$Arch" = "arm" ]; then
+	cp linux ${DDIR}/boot/Image-${VERSION}
 else
 	cp linux ${DDIR}/boot/vmlinuz-${VERSION}
 fi
@@ -42,6 +44,9 @@
 (cd ${DDIR};
  if [ -f boot/vmlinux-${VERSION} ]; then
 	ln -s boot/vmlinux-${VERSION} vmlinux
+ elif [ -f boot/Image-${VERSION} ]; then
+        ln -s boot/Image-${VERSION} vmlinux
+	ln -s boot/Image-${VERSION} vmlinuz # needed to pass test in dbootstrap
  else
 	ln -s boot/vmlinuz-${VERSION} vmlinuz
  fi)
=== Exit status: 1
=== cd /home/apharris/debian/boot-floppies/boot-floppies/utilities/libfdisk/
=== /usr/bin/cvs diff -u fdisk.c

Index: fdisk.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/libfdisk/fdisk.c,v
retrieving revision 1.44
diff -u -u -r1.44 fdisk.c
--- fdisk.c	2000/03/15 00:15:28	1.44
+++ fdisk.c	2000/03/24 07:04:06
@@ -725,11 +725,11 @@
 #endif
     p->in_use=-1;
     p->mount_point=strdup(mnt_ent->mnt_dir);
-    if (mounted_partitions) {
+    if (mounted_partitions && p != mounted_partitions) {
     /* reverse ordered, as this is the order in which they would be
      * un-mounted. */
         p->next_in_use=mounted_partitions;
-    }
+    } else p->next_in_use = 0;
     mounted_partitions=p; 
   }
   endmntent(mtabFile);
=== Exit status: 1


Reply to: