From a1faac1d371e538a27ee7d74a3e704761638b00a Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 22 Apr 2010 19:00:25 -0500
Subject: [PATCH] lucid tweaks combined

---
 mk_mmc.sh                                     |  5 +----
 .../beagle-copy-flash-kernel-override.diff    | 13 ------------
 scripts/lucid-copy-etc-e2fsck.conf.diff       | 12 -----------
 scripts/lucid-copy-modules.diff               | 12 -----------
 ...nd-copy-new-scr.diff => lucid-tweaks.diff} | 21 +++++++++++++------
 5 files changed, 16 insertions(+), 47 deletions(-)
 delete mode 100644 scripts/beagle-copy-flash-kernel-override.diff
 delete mode 100644 scripts/lucid-copy-etc-e2fsck.conf.diff
 delete mode 100644 scripts/lucid-copy-modules.diff
 rename scripts/{beagle-erase-nand-and-copy-new-scr.diff => lucid-tweaks.diff} (62%)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index c7e9916..da419c9 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -115,10 +115,7 @@ fi
  if test "-$DIST-" = "-lucid-"
  then
    sudo cp -v ${DIR}/scripts/flash-kernel.conf ${DIR}/initrd-tree/etc/flash-kernel.conf
-   sudo patch -p1 -s < ${DIR}/scripts/beagle-copy-flash-kernel-override.diff
-   sudo patch -p1 -s < ${DIR}/scripts/beagle-erase-nand-and-copy-new-scr.diff
-   sudo patch -p1 -s < ${DIR}/scripts/lucid-copy-etc-e2fsck.conf.diff
-   sudo patch -p1 -s < ${DIR}/scripts/lucid-copy-modules.diff
+   sudo patch -p1 -s < ${DIR}/scripts/lucid-tweaks.diff
    sudo dpkg -x ${DIR}/dl/mtd-utils_20090606-1_armel.deb ${DIR}/initrd-tree
  fi
 
diff --git a/scripts/beagle-copy-flash-kernel-override.diff b/scripts/beagle-copy-flash-kernel-override.diff
deleted file mode 100644
index c987b10..0000000
--- a/scripts/beagle-copy-flash-kernel-override.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/chroot-setup.sh b/lib/chroot-setup.sh
-index 61bc6ae..629f541 100644
---- a/lib/chroot-setup.sh
-+++ b/lib/chroot-setup.sh
-@@ -110,6 +110,8 @@ EOF
- 	APT_LISTCHANGES_FRONTEND=none
- 	export APT_LISTCHANGES_FRONTEND
- 
-+	cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf
-+
- 	return 0
- }
- 
diff --git a/scripts/lucid-copy-etc-e2fsck.conf.diff b/scripts/lucid-copy-etc-e2fsck.conf.diff
deleted file mode 100644
index e409a34..0000000
--- a/scripts/lucid-copy-etc-e2fsck.conf.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/chroot-setup.sh b/lib/chroot-setup.sh
-index c5fbc37..8cc0ea4 100644
---- a/lib/chroot-setup.sh
-+++ b/lib/chroot-setup.sh
-@@ -111,6 +111,7 @@ EOF
- 	export APT_LISTCHANGES_FRONTEND
- 
- 	cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf
-+	cp /etc/e2fsck.conf /target/etc/e2fsck.conf
- 
- 	return 0
- }
diff --git a/scripts/lucid-copy-modules.diff b/scripts/lucid-copy-modules.diff
deleted file mode 100644
index 55edd46..0000000
--- a/scripts/lucid-copy-modules.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/chroot-setup.sh b/lib/chroot-setup.sh
-index 5351a01..58fa8f7 100644
---- a/lib/chroot-setup.sh
-+++ b/lib/chroot-setup.sh
-@@ -135,6 +135,7 @@ chroot_cleanup () {
- 		cp /tmp/mmc/normal.scr /tmp/mmc/boot.scr
- 		cp /tmp/mmc/uInitrd /tmp/mmc/uInitrd.net
- 		cp /tmp/mmc/uInitrd.final /tmp/mmc/uInitrd
-+		cp -r /lib/modules/`uname -r`/ /target/lib/modules/
- 		rm -f /etc/rcn.conf
- 		umount /tmp/mmc
- 	fi
diff --git a/scripts/beagle-erase-nand-and-copy-new-scr.diff b/scripts/lucid-tweaks.diff
similarity index 62%
rename from scripts/beagle-erase-nand-and-copy-new-scr.diff
rename to scripts/lucid-tweaks.diff
index 2b3b8f6..b020e45 100644
--- a/scripts/beagle-erase-nand-and-copy-new-scr.diff
+++ b/scripts/lucid-tweaks.diff
@@ -1,27 +1,36 @@
 diff --git a/lib/chroot-setup.sh b/lib/chroot-setup.sh
-index 629f541..c5fbc37 100644
+index 61bc6ae..5c7778a 100644
 --- a/lib/chroot-setup.sh
 +++ b/lib/chroot-setup.sh
-@@ -122,6 +122,23 @@ chroot_cleanup () {
+@@ -110,6 +110,9 @@ EOF
+ 	APT_LISTCHANGES_FRONTEND=none
+ 	export APT_LISTCHANGES_FRONTEND
+ 
++	cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf
++	cp /etc/e2fsck.conf /target/etc/e2fsck.conf
++
+ 	return 0
+ }
+ 
+@@ -120,6 +123,22 @@ chroot_cleanup () {
  		mv /target/sbin/initctl.REAL /target/sbin/initctl
  	fi
  
 +	if [ -e /target/boot/initrd.img ]; then
-+		/usr/sbin/flash_eraseall /dev/mtd2 
++		/usr/sbin/flash_eraseall /dev/mtd2
 +	fi
 +
-+	
 +	if [ -e /etc/rcn.conf ]; then
-+		mkdir -p /tmp/mmc 	
++		mkdir -p /tmp/mmc
 +		mount /dev/mmcblk0p1 /tmp/mmc
 +		cp /tmp/mmc/boot.scr /tmp/mmc/netinstall.scr
 +		cp /tmp/mmc/normal.scr /tmp/mmc/boot.scr
 +		cp /tmp/mmc/uInitrd /tmp/mmc/uInitrd.net
 +		cp /tmp/mmc/uInitrd.final /tmp/mmc/uInitrd
++		cp -r /lib/modules/`uname -r`/ /target/lib/modules/
 +		rm -f /etc/rcn.conf
 +		umount /tmp/mmc
 +	fi
-+	
 +
  	# Undo the mounts done by the packages during installation.
  	# Reverse sorting to umount the deepest mount points first.