From 33e0bcff6c0d5d4c71985acad2f5a695ff677d67 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 12 Mar 2008 10:30:15 +0000
Subject: BACKPORT: altboot, collie fix applied changes from
 9c282203892de9ceaa9b6fb94ca7e20914536e17              through
 c4d9a3436b6b5626505d88d0ed299c5e20d25227 applied changes from
 9d49069aa898848e0d9e809ccb033c0e93c8b6fc              through
 4d3fe649ba5cd8d8a2492eb428e3d03d91d873a2
 c4d9a3436b6b5626505d88d0ed299c5e20d25227 altboot: Update to SVNR79 (add
 proper modules for collies SD support
 4d3fe649ba5cd8d8a2492eb428e3d03d91d873a2 altboot: Apply fix from oebug #2647

---
 BACKPORTS.txt                                |  2 +
 packages/altboot/altboot_1.1.1+wip-SVNR78.bb | 76 ----------------------------
 packages/altboot/altboot_1.1.1+wip-SVNR80.bb | 76 ++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 76 deletions(-)
 delete mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR78.bb
 create mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR80.bb

diff --git a/BACKPORTS.txt b/BACKPORTS.txt
index 359963d301..af62befdb5 100644
--- a/BACKPORTS.txt
+++ b/BACKPORTS.txt
@@ -199,5 +199,7 @@ c72441dc719a5903a8fdc705f309c086346249b0 alsa-state spitz + akita fixes (Stanisl
 135f1243bae7b8d2761f12a5ee4792c0fdd61cd7 findutils fix (Stanislav, Koen)
 8fdaa25fd43ec0cd83b190b8b345a620111e66b9 mplayer -OMG -noatime (Koen, PaulS)
 2c1b19f138545666f84b9b29076dcc0b6e695ed6 sepukku format change (Koen, PaulS)
+c4d9a3436b6b5626505d88d0ed299c5e20d25227 altboot collie fix (Koen, xjqian)
+4d3fe649ba5cd8d8a2492eb428e3d03d91d873a2 altboot collie fix (Koen, xjqian)
 
 
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR78.bb b/packages/altboot/altboot_1.1.1+wip-SVNR78.bb
deleted file mode 100644
index db7c10d79f..0000000000
--- a/packages/altboot/altboot_1.1.1+wip-SVNR78.bb
+++ /dev/null
@@ -1,76 +0,0 @@
-require altboot.inc
-
-PR = "r2"
-
-SVN_REV = "78"
-SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
-	  "
-
-do_install() {
-	install -d ${D}/sbin
-	install -d ${D}/etc/altboot-menu	
-	install -d ${D}/etc/altboot.rc
-	install -d ${D}/usr/share/doc/altboot
-	install -d ${D}/usr/share/sounds
-
-	if test -d ${S}/${MACHINE_DIR}
-	then
-		install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
-	else
-		install -m 0644 ${S}/altboot*.cfg ${D}/etc/
-	fi
-
-	install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
-	install -m 0644 ${S}/altboot.func ${D}/etc
-	install -m 0644 ${S}/altboot.sbin ${D}/etc
-	install -m 0644 ${S}/altbootctl.conf ${D}/etc
-	install -m 0755 ${S}/init.altboot ${D}/sbin
-	install -m 0755 ${S}/altbootctl ${D}/sbin
-	
-	ln -s /sbin/init.altboot ${D}/sbin/altboot
-
-	if test -d ${S}/${MACHINE_DIR}/altboot-menu
-	then
-		install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
-		
-		if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
-		then
-			install -d ${D}/etc/altboot-menu/Advanced
-			install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-		fi
-	else
-		install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
-
-		if test -d ${S}/altboot-menu/Advanced
-		then		
-			install -d ${D}/etc/altboot-menu/Advanced
-			install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-		fi
-	fi
-	
-	if test -d ${S}/${MACHINE_DIR}/altboot.rc
-	then
-		install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
-		install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc	
-	else
-		install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
-		install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
-	fi
-}
-
-do_configure() {
-	cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
-	mv ${S}/init.altboot_ ${S}/init.altboot
-}
-
-pkg_postinst_${PN}() {
-	test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
-	
-	update-alternatives --install /sbin/init init /sbin/init.altboot 55
-}
-
-pkg_postrm_${PN}() {
-	test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
-	
-	update-alternatives --remove init /sbin/init.altboot
-}
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR80.bb b/packages/altboot/altboot_1.1.1+wip-SVNR80.bb
new file mode 100644
index 0000000000..b333264d34
--- /dev/null
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR80.bb
@@ -0,0 +1,76 @@
+require altboot.inc
+
+PR = "r0"
+
+SVN_REV = "80"
+SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
+	  "
+
+do_install() {
+	install -d ${D}/sbin
+	install -d ${D}/etc/altboot-menu	
+	install -d ${D}/etc/altboot.rc
+	install -d ${D}/usr/share/doc/altboot
+	install -d ${D}/usr/share/sounds
+
+	if test -d ${S}/${MACHINE_DIR}
+	then
+		install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
+	else
+		install -m 0644 ${S}/altboot*.cfg ${D}/etc/
+	fi
+
+	install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
+	install -m 0644 ${S}/altboot.func ${D}/etc
+	install -m 0644 ${S}/altboot.sbin ${D}/etc
+	install -m 0644 ${S}/altbootctl.conf ${D}/etc
+	install -m 0755 ${S}/init.altboot ${D}/sbin
+	install -m 0755 ${S}/altbootctl ${D}/sbin
+	
+	ln -s /sbin/init.altboot ${D}/sbin/altboot
+
+	if test -d ${S}/${MACHINE_DIR}/altboot-menu
+	then
+		install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
+		
+		if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
+		then
+			install -d ${D}/etc/altboot-menu/Advanced
+			install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		fi
+	else
+		install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
+
+		if test -d ${S}/altboot-menu/Advanced
+		then		
+			install -d ${D}/etc/altboot-menu/Advanced
+			install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		fi
+	fi
+	
+	if test -d ${S}/${MACHINE_DIR}/altboot.rc
+	then
+		install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
+		install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc	
+	else
+		install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+		install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+	fi
+}
+
+do_configure() {
+	cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
+	mv ${S}/init.altboot_ ${S}/init.altboot
+}
+
+pkg_postinst_${PN}() {
+	test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
+	
+	update-alternatives --install /sbin/init init /sbin/init.altboot 55
+}
+
+pkg_postrm_${PN}() {
+	test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
+	
+	update-alternatives --remove init /sbin/init.altboot
+}
-- 
cgit 1.2.3-korg