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

Bug#403017: marked as done (Patch to flash-kernel for nas100d support)

Your message dated Wed, 25 Apr 2007 12:02:02 +0000
with message-id <E1HggCA-00077R-0u@ries.debian.org>
and subject line Bug#403017: fixed in flash-kernel 1.2
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message --- 
Package: flash-kernel
Version: 0.9
Tags: patch

Could you please apply the attached patch to flash-kernel?

It tightens up the grep match patterns (I got stung because I had both
"filesystem" and "filesystem2" partitions), and adds support for
flashing the Iomega NAS 100d.

With this patch, and the kernel patches I sent Martin previously, Debian
kernel 2.6.19 runs nicely on the NAS100d.  Next, I'll be looking at what
else needs to be done to support it in the installer.

This is not etch-critical, but would save me having to hand-edit this
file each time I do a test debian-installer installation.

Thanks,

-- Rod


Index: flash-kernel
===================================================================
--- flash-kernel	(revision 43316)
+++ flash-kernel	(working copy)
@@ -19,7 +19,7 @@
 }
 
 mtdblock() {
-	grep "$1" /proc/mtd | cut -d: -f 1 | sed 's/mtd/\/dev\/mtdblock/'
+	grep "\"$1\"" /proc/mtd | cut -d: -f 1 | sed 's/mtd/\/dev\/mtdblock/'
 }
 
 # See http://www.nslu2-linux.org/wiki/Info/BootFlash -- the NSLU2 uses a
@@ -128,7 +128,7 @@
 		) > "$mtdkernel" || error "failed."
 		echo "done." >&2
 		printf "Flashing initramfs: " >&2
-		size=$(grep "Ramdisk" /proc/mtd | cut -d " " -f 2)
+		size=$(grep "\"Ramdisk\"" /proc/mtd | cut -d " " -f 2)
 		size=$(printf "%d" 0x$size)
 		isize=$(wc -c $ifile | awk '{print $1}')
 		cat $ifile > $tmp
@@ -143,6 +143,30 @@
 		) > $mtdramdisk || error "failed."
 		echo "done." >&2
 	;;
+	"Iomega NAS 100d")
+		check_mtd
+		mtdramdisk=$(mtdblock filesystem)
+		if [ -z "$mtdramdisk" ]; then
+			error "Cannot find mtd partition 'filesystem'"
+		fi
+		mtdkernel=$(mtdblock kernel)
+		if [ -z "$mtdkernel" ]; then
+			error "Cannot find mtd partition 'kernel'"
+		fi
+		printf "Flashing kernel: " >&2
+		cat $kfile > "$mtdkernel" || error "failed."
+		echo "done." >&2
+		printf "Flashing initramfs: " >&2
+		size=$(grep "\"filesystem\"" /proc/mtd | cut -d " " -f 2)
+		size=$(printf "%d" 0x$size)
+		isize=$(wc -c $ifile | awk '{print $1}')
+		pad=$(expr $size - $isize)
+		(
+		        cat $ifile
+			dd if=/dev/zero bs=$pad count=1 2>/dev/null
+		) > $mtdramdisk || error "failed."
+		echo "done." >&2
+	;;
 	"Thecus N2100")
 		check_mtd
 		mtdramdisk=$(mtdblock ramdisk)
@@ -160,7 +184,7 @@
 		) > $mtdkernel || error "failed."
 		echo "done." >&2
 		printf "Flashing initramfs... " >&2
-		size=$(grep "ramdisk" /proc/mtd | cut -d " " -f 2)
+		size=$(grep "\"ramdisk\"" /proc/mtd | cut -d " " -f 2)
 		size=$(printf "%d" 0x$size)
 		isize=$(wc -c $ifile | awk '{print $1}')
 		pad=$(expr $size - $isize)

--- End Message ---
--- Begin Message --- 
Source: flash-kernel
Source-Version: 1.2

We believe that the bug you reported is fixed in the latest version of
flash-kernel, which is due to be installed in the Debian FTP archive:

flash-kernel-installer_1.2_arm.udeb
  to pool/main/f/flash-kernel/flash-kernel-installer_1.2_arm.udeb
flash-kernel_1.2.dsc
  to pool/main/f/flash-kernel/flash-kernel_1.2.dsc
flash-kernel_1.2.tar.gz
  to pool/main/f/flash-kernel/flash-kernel_1.2.tar.gz
flash-kernel_1.2_arm.deb
  to pool/main/f/flash-kernel/flash-kernel_1.2_arm.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 403017@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Martin Michlmayr <tbm@cyrius.com> (supplier of updated flash-kernel package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Wed, 25 Apr 2007 13:51:12 +0200
Source: flash-kernel
Binary: flash-kernel-installer flash-kernel
Architecture: source arm
Version: 1.2
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Martin Michlmayr <tbm@cyrius.com>
Description: 
 flash-kernel - utility to write kernel and initramfs to MTD flash
 flash-kernel-installer - Configure flash to boot the system (udeb)
Closes: 403017 411551 413373
Changes: 
 flash-kernel (1.2) unstable; urgency=low
 .
   [ Martin Michlmayr ]
   * Make the parsing code more robust so searching for "foo" won't match
     "foo2".  Thanks, Rod Whitby.
   * Print an error when the subarchitecture of the kernel doesn't match
     that of the device.  Closes: #411551.
 .
   [ Rod Whitby ]
   * Add support for Iomega NAS 100d.  Closes: #403017.
 .
   [ Gordon Farquharson ]
   * Reduce the running time of flash-kernel on the NSLU2 by almost 30
     seconds.  Closes: #413373.
 .
   [ Updated translations ]
   * Basque (eu.po) by Piarres Beobide
Files: 
 62a85b3757e15b45ba8143a427f844bf 698 utils optional flash-kernel_1.2.dsc
 64d9c5edbaebf6a3bfafe2f2a5e1b61e 23988 utils optional flash-kernel_1.2.tar.gz
 774270cb72ae7de10739b7c2e24f7f34 7284 utils optional flash-kernel_1.2_arm.deb
 2f1a6ffc109eb84b3ab091c1b573e41e 7036 debian-installer standard flash-kernel-installer_1.2_arm.udeb
Package-Type: udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGL0FiKb5dImj9VJ8RAmPQAKCYDFOIUQ2IpD4Voe823QHO+WJKOQCfWG8N
pSIBHHTlCMSgTLebh90WlzE=
=bTla
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: