linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: arcboot

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: arcboot
From: ths@linux-mips.org
Date: Sat, 05 Feb 2005 21:55:32 +0000
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    arcboot
Changes by:     ths@ftp.linux-mips.org  05/02/05 21:55:27

Modified files:
        debian         : changelog control 
        scripts        : arcboot 

Log message:
        Don't complain about ELF64.

diff -urN arcboot/debian/changelog arcboot/debian/changelog
--- arcboot/debian/changelog    2005/01/31 21:19:53     1.2
+++ arcboot/debian/changelog    2005/02/05 21:55:26     1.3
@@ -1,4 +1,4 @@
-arcboot (0.3.8.5) UNRELEASED; urgency=low
+arcboot (0.3.8.5) unstable; urgency=low
 
   * Add da debconf translation by Morten Brix Pedersen, thanks
     (Closes: #276691).
diff -urN arcboot/debian/control arcboot/debian/control
--- arcboot/debian/control      2004/11/29 10:39:38     1.1
+++ arcboot/debian/control      2005/02/05 21:55:26     1.2
@@ -2,28 +2,27 @@
 Section: admin
 Priority: optional
 Maintainer: Guido Guenther <agx@debian.org>
+Uploaders: Thiemo Seufer <ths@debian.org>
 Build-Depends: debhelper (>=4.1.16)
 Build-Conflicts: e2fslibs-dev
 Standards-Version: 3.6.1
 
 Package: arcboot
 Architecture: mips
-Depends: ${misc:Depends}, dvhtool, file
+Depends: dvhtool
 Description: Bootloader for SGI/MIPS IP22 and IP32 machines
  arcboot is a bootloader for SGI/MIPS IP22 and IP32 machines like the Indy,
  Indigo2 and O2. It is able to boot the Linux kernel from ext2 and ext3
- filesystems which makes putting the kernel into the volume header obsolete.
- Support for other ARCS based subarches can easily be added.
- It is currently not capable of booting IRIX or to boot from iso9660 CDROMs
- though.
+ filesystems. Support for other ARCS based subarchitectures can easily be
+ added. It is currently not capable of booting IRIX or to boot from iso9660
+ CDROMs though.
 
 Package: tip22
 Architecture: mips
-Depends: ${misc:Depends}, binutils | binutils-multiarch
-Description: Tftp boot image builder for SGI/MIPS IP22 machines
- tip22 is used to merge kernel and initrd into one bootable ecoff image. This
- image also contains a small bootloader that copies the kernel to it's
- loadaddress and appends the ramdisk. This is useful for booting via tftp or
- from a CDROM. It is currently targeted for the IP22 subarchitecture but
- support for other ARCS based subarchitectures and output formats can easily be
- added.
+Depends: binutils | binutils-multiarch, file
+Description: Tftp boot image builder for SGI/MIPS IP22 and IP32 machines
+ tip22 is used to merge kernel and initrd into one bootable image. This
+ image also contains a small loader stub that copies the kernel to its
+ load address and appends the ramdisk. This is useful for booting via tftp or
+ from a CDROM. It is currently targeted for the IP22 and IP32 subarchitectures
+ but support for other ARCS based subarchitectures can easily be added.
diff -urN arcboot/scripts/arcboot arcboot/scripts/arcboot
--- arcboot/scripts/arcboot     2004/11/29 10:39:38     1.1
+++ arcboot/scripts/arcboot     2005/02/05 21:55:27     1.2
@@ -34,7 +34,7 @@
        if [ -L $IMAGE ]; then  # if it's a symlink, follow it
                IMAGE=`dirname $IMAGE`/`readlink $IMAGE`
        fi
-       if ! ( file $IMAGE | grep ": ELF 32-bit MSB" >/dev/null 2>&1 ); then
+       if [ $(dd if=$IMAGE bs=4 count=1 2>/dev/null) != $(printf '\177ELF') ]; 
then
                echo "Warning: $IMAGE is not an ELF image. Booting it will 
fail!"
        fi
 done

<Prev in Thread] Current Thread [Next in Thread>