From cb454d253c7f2236f7e9a2fc76b21baa3a085ba3 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 23 Feb 2011 11:50:32 -0600
Subject: [PATCH] ubuntu maverick just wont leave the uImage and uInitrd alone,
 rename them..

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh                   |  4 ++--
 scripts/dvi.cmd             |  2 +-
 scripts/serial.cmd          |  2 +-
 scripts/squeeze-tweaks.diff | 10 ++++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index a53d97e..aeac902 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -468,9 +468,9 @@ sudo cp -v ${TEMPDIR}/dl/${UBOOT} ${TEMPDIR}/disk/u-boot.bin
 echo "uInitrd Installer"
 sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod ${TEMPDIR}/disk/uInitrd.net
 echo "uInitrd Normal Boot"
-sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${DIR}/dl/${DIST}/initrd.img-${KERNEL} ${TEMPDIR}/disk/uInitrd
+sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${DIR}/dl/${DIST}/initrd.img-${KERNEL} ${TEMPDIR}/disk/uInitrd.end
 echo "uImage"
-sudo mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n ${KERNEL} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage
+sudo mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n ${KERNEL} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net
 
 if [ "${SERIAL_MODE}" ] ; then
  sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/serial.cmd ${TEMPDIR}/disk/boot.scr
diff --git a/scripts/dvi.cmd b/scripts/dvi.cmd
index 4bdcfc2..9857d8e 100644
--- a/scripts/dvi.cmd
+++ b/scripts/dvi.cmd
@@ -9,7 +9,7 @@ setenv mpurate 800
 fi
 setenv dvimode 1280x720MR-16@60
 setenv vram 12MB
-setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd.net; bootm 0x80300000 0x81600000'
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage.net; fatload mmc 0:1 0x81600000 uInitrd.net; bootm 0x80300000 0x81600000'
 setenv bootargs console=tty0 root=/dev/ram0 rw vram=${vram} omapfb.mode=dvi:${dvimode} buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/serial.cmd b/scripts/serial.cmd
index 8e015b5..1e9d44f 100644
--- a/scripts/serial.cmd
+++ b/scripts/serial.cmd
@@ -7,7 +7,7 @@ if test "${beaglerev}" = "xMB"; then
 echo "Kernel is not ready for 1Ghz limiting to 800Mhz"
 setenv mpurate 800
 fi
-setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage; fatload mmc 0:1 0x81600000 uInitrd.net; bootm 0x80300000 0x81600000'
+setenv bootcmd 'mmc init; fatload mmc 0:1 0x80300000 uImage.net; fatload mmc 0:1 0x81600000 uInitrd.net; bootm 0x80300000 0x81600000'
 setenv bootargs console=ttyO2,115200n8 root=/dev/ram0 rw buddy=${buddy} mpurate=${mpurate}
 boot
 
diff --git a/scripts/squeeze-tweaks.diff b/scripts/squeeze-tweaks.diff
index c37c357..f09bfa8 100644
--- a/scripts/squeeze-tweaks.diff
+++ b/scripts/squeeze-tweaks.diff
@@ -3,18 +3,20 @@ new file mode 100755
 index 0000000..6d06fc7
 --- /dev/null
 +++ b/usr/lib/finish-install.d/08rcn-omap
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,22 @@
 +#!/bin/sh -e
 +cp /etc/e2fsck.conf /target/etc/e2fsck.conf
 +
 +if [ -e /etc/rcn.conf ]; then
 +	mkdir -p /tmp/mmc
 +	mount /dev/mmcblk0p1 /tmp/mmc
-+	rm -f /tmp/mmc/boot.scr
++	rm -f /tmp/mmc/boot.scr || true
 +	mv /tmp/mmc/user.scr /tmp/mmc/boot.scr
-+	rm -f  /tmp/mmc/uInitrd.net
++	rm -f  /tmp/mmc/uInitrd.net || true
++	mv /tmp/mmc/uInitrd.end /tmp/mmc/uInitrd
++	mv /tmp/mmc/uImage.net /tmp/mmc/uImage
 +	LD_LIBRARY_PATH=/target/lib /target/usr/bin/dpkg-deb -x /tmp/mmc/linux-image-*_1.0*_armel.deb /target/
-+	rm -f /tmp/mmc/linux-image-*_1.0*_armel.deb
++	rm -f /tmp/mmc/linux-image-*_1.0*_armel.deb || true
 +	sync
 +	umount /tmp/mmc
 +