From 74f43656a25639eac79ee7d7e373dfc8c0d92126 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 30 Mar 2007 17:48:05 +0000
Subject: opie.bbclass, palmtop.bbclass: Set FILES_* in palmtop.bbclass, so
 even opie bootstrap libraries use them. Also, to not neat-pick which files go
 into FILES_${PN}, just change default order of packages.

---
 classes/opie.bbclass    | 4 ----
 classes/palmtop.bbclass | 7 ++++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index 92cde5487b..915de890cf 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -19,10 +19,6 @@ OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}"
 
 DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}"
 
-FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
-                     ${palmtopdir}/bin/.debug \
-                     ${palmtopdir}/plugins/*/.debug "
-
 # to be consistent, put all targets into workdir
 # NOTE: leave one space at the end, other files are expecting that
 EXTRA_QMAKEVARS_POST += "DESTDIR=${S} "
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index b4bd21ab25..39b9bd2b60 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -17,4 +17,9 @@ EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "ye
 EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 
-FILES_${PN} = "${palmtopdir}"
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
+FILES_${PN} = " ${palmtopdir} "
+FILES_${PN}-dev += " ${palmtopdir}/lib/lib*.so "
+FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
+                     ${palmtopdir}/bin/.debug \
+                     ${palmtopdir}/plugins/*/.debug "
-- 
cgit v1.2.3


From d94cd14b70790a834f87ad0f72c7e9e6020b8da9 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 30 Mar 2007 17:52:49 +0000
Subject: libopie2: Fix packaging of dev/dbg.

---
 packages/libopie/libopie2.inc      | 18 +++++++++---------
 packages/libopie/libopie2_1.2.2.bb |  2 +-
 packages/libopie/libopie2_cvs.bb   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 1e0d4f1b9a..17cc4be40d 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -78,22 +78,22 @@ do_install() {
 	done
 }
 
-PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2"
+PACKAGES_prepend = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 "
 
 DESCRIPTION_libopiecore2 = "Opie Development Platform 1.x Core Library"
-FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
+FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so.*"
 DESCRIPTION_libopiedb2 = "Opie Development Platform 1.x Database Library"
-FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
+FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so.*"
 DESCRIPTION_libopiemm2 = "Opie Development Platform 1.x Multimedia Library"
-FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
+FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so.*"
 DESCRIPTION_libopienet2 = "Opie Development Platform 1.x Network Library"
-FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
+FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so.*"
 DESCRIPTION_libopiepim2 = "Opie Development Platform 1.x PIM Library"
-FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
+FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so.*"
 DESCRIPTION_libopieui2 = "Opie Development Platform 1.x User Interface Library"
-FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
+FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so.*"
 DESCRIPTION_libopiesecurity2 = "Opie Development Platform 1.x Security Library"
-FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
+FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so.*"
 DESCRIPTION_libopiebluez2 = "Opie Development Platform 1.x Bluetooth Library"
-FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so*"
+FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so.*"
 
diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb
index 1bef43c329..8409e4c523 100644
--- a/packages/libopie/libopie2_1.2.2.bb
+++ b/packages/libopie/libopie2_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 4a3d3c28c5..39376a84fc 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PV = "1.2.2+cvs${SRCDATE}"
-PR = "r6"
+PR = "r7"
 
 DEFAULT_PREFERENCE = "-1"
 
-- 
cgit v1.2.3


From 7b297dc027dab0a74b755934e00a697abaf9b6ad Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 30 Mar 2007 18:04:53 +0000
Subject: slugos-init: Add support for handing boot control over to altboot.

---
 packages/slugos-init/files/turnup        | 13 ++++++++++++-
 packages/slugos-init/slugos-init_0.10.bb |  5 ++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup
index 556d942e26..119d84f2c8 100644
--- a/packages/slugos-init/files/turnup
+++ b/packages/slugos-init/files/turnup
@@ -372,6 +372,8 @@ boot_rootfs() {
 	nfs)	shift 2;;
 	flash)	;;
 	ram)	;;
+	altboot)
+		;;
 	*)	echo "turnup: boot_rootfs($type, $ffs, $device): unknown type" >&2
 		return 1;;
 	esac
@@ -405,6 +407,11 @@ boot_rootfs() {
 			echo "turnup: boot_rootfs: failed to write $ffs/linuxrc.new" >&2
 			return 1
 		};;
+	altboot)
+		ln -s "boot/altboot" "$ffs"/linuxrc.new || {
+			echo "turnup: boot_rootfs: failed to create $ffs/linuxrc.new" >&2
+			return 1
+		};;
 	*)	{	echo '#!/bin/sh'
 #			echo 'modprobe ehci-hcd'
 #			echo 'modprobe ohci-hcd'
@@ -572,7 +579,7 @@ boot_reset() {
 	local ffs typ status
 
 	case "$1" in
-	flash|ram)type="$1"
+	flash|ram|altboot)type="$1"
 		shift;;
 	*)	echo "turnup: boot_reset($1): invalid type" >&2
 		return 1;;
@@ -799,6 +806,8 @@ nfs)	shift
 	nfs "$@";;
 flash)	boot_reset flash;;
 ram)	boot_reset ram;;
+altboot)
+	boot_reset altboot;;
 preserve)
 	shift
 	sysconf save "$@";;
@@ -841,6 +850,8 @@ usage: turnup command [options]
   ram
     Boot (once) into a ramdisk, subsequent boots will be to
     the flash file system.
+  altboot
+    Hand over boot control to the altboot utility.
   preserve
     Save the system configuration to the SysConf partition, you
     will need to create the SysConf partition from the boot loader
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 56f3c7242a..90ad6f4cee 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r80"
+PR = "r81"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
@@ -102,6 +102,9 @@ do_install() {
 		install -m 0755 boot/$p ${D}/boot
 	done
 
+	# Support for altboot
+	ln -s /sbin/init.altboot ${D}/boot/altboot
+
 	# Configuration files
 	install -m 0644 conffiles ${D}${sysconfdir}/default
 
-- 
cgit v1.2.3


From 49464dcea63bcd4fc2599216b71e78617912f16e Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 30 Mar 2007 18:25:11 +0000
Subject: slugos-init: Remove special altboot support - turnup flash is all
 that is required.

---
 packages/slugos-init/files/turnup        | 13 +------------
 packages/slugos-init/slugos-init_0.10.bb |  5 +----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup
index 119d84f2c8..556d942e26 100644
--- a/packages/slugos-init/files/turnup
+++ b/packages/slugos-init/files/turnup
@@ -372,8 +372,6 @@ boot_rootfs() {
 	nfs)	shift 2;;
 	flash)	;;
 	ram)	;;
-	altboot)
-		;;
 	*)	echo "turnup: boot_rootfs($type, $ffs, $device): unknown type" >&2
 		return 1;;
 	esac
@@ -407,11 +405,6 @@ boot_rootfs() {
 			echo "turnup: boot_rootfs: failed to write $ffs/linuxrc.new" >&2
 			return 1
 		};;
-	altboot)
-		ln -s "boot/altboot" "$ffs"/linuxrc.new || {
-			echo "turnup: boot_rootfs: failed to create $ffs/linuxrc.new" >&2
-			return 1
-		};;
 	*)	{	echo '#!/bin/sh'
 #			echo 'modprobe ehci-hcd'
 #			echo 'modprobe ohci-hcd'
@@ -579,7 +572,7 @@ boot_reset() {
 	local ffs typ status
 
 	case "$1" in
-	flash|ram|altboot)type="$1"
+	flash|ram)type="$1"
 		shift;;
 	*)	echo "turnup: boot_reset($1): invalid type" >&2
 		return 1;;
@@ -806,8 +799,6 @@ nfs)	shift
 	nfs "$@";;
 flash)	boot_reset flash;;
 ram)	boot_reset ram;;
-altboot)
-	boot_reset altboot;;
 preserve)
 	shift
 	sysconf save "$@";;
@@ -850,8 +841,6 @@ usage: turnup command [options]
   ram
     Boot (once) into a ramdisk, subsequent boots will be to
     the flash file system.
-  altboot
-    Hand over boot control to the altboot utility.
   preserve
     Save the system configuration to the SysConf partition, you
     will need to create the SysConf partition from the boot loader
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 90ad6f4cee..8f8c68d7b7 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r81"
+PR = "r82"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
@@ -102,9 +102,6 @@ do_install() {
 		install -m 0755 boot/$p ${D}/boot
 	done
 
-	# Support for altboot
-	ln -s /sbin/init.altboot ${D}/boot/altboot
-
 	# Configuration files
 	install -m 0644 conffiles ${D}${sysconfdir}/default
 
-- 
cgit v1.2.3


From 5ed24bd44de3235edcb3ef2704d70de610fc1878 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 30 Mar 2007 18:30:00 +0000
Subject: task-openmoko: remove some more matchbox-panel-1 stuff

---
 packages/tasks/task-openmoko.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index ece303d62a..7f8b03ce33 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
 
-PR = "r32"
+PR = "r33"
 
 PACKAGES = "\
   task-openmoko-linux \
@@ -145,11 +145,8 @@ RDEPENDS_task-openmoko-demo = "\
   matchbox-stroke \
   matchbox-config-gtk \
   matchbox-panel-2-applets \
-  matchbox-panel-hacks \
   matchbox-themes-extra \
   matchbox-themes-gtk \
-  matchbox-applet-inputmanager \
-  matchbox-applet-startup-monitor \
   openmoko-panel-battery \
   openmoko-panel-clock \
   openmoko-panel-demo \
-- 
cgit v1.2.3


From 9388d01bc7e5d1eea87480df05d35c10018b0886 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Fri, 30 Mar 2007 22:07:58 +0000
Subject: altboot_wip.bb: Drop altboot_wip.bb

---
 packages/altboot/altboot_wip.bb | 99 -----------------------------------------
 1 file changed, 99 deletions(-)
 delete mode 100644 packages/altboot/altboot_wip.bb

diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb
deleted file mode 100644
index 37a8b5f9dd..0000000000
--- a/packages/altboot/altboot_wip.bb
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: altboot_1.0.5-rc2.bb
-# Date: 21-Feb-06
-
-DESCRIPTION = "The altboot bootmanager"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "GPL" 
-
-######################################################################################
-
-RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
-RRECOMMENDS_${PN}_append_akita = " kexec-tools"
-RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
-RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
-
-RDEPENDS_${PN} = "${PN}-conf"
-RDEPENDS_${PN}-conf = "${PN}"
-
-######################################################################################
-
-WIP_DATE = "20070323"
-
-PV = "1.1.1+wip-${WIP_DATE}"
-PR = "r0"
-
-######################################################################################
-
-PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
-
-PACKAGE_ARCH_${PN} = "all"
-PACKAGE_ARCH_${PN}-doc = "all"
-PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}"
-
-SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn"
-
-S = "${WORKDIR}/${TAG}/"
-
-######################################################################################
-
-FILES_${PN}-conf = "/etc/altboot*cfg"
-
-######################################################################################
-
-do_install() {
-	install -d ${D}/sbin
-	install -d ${D}/etc/altboot-menu
-	install -d ${D}/etc/altboot-menu/Advanced
-	install -d ${D}/etc/altboot.rc
-	install -d ${D}/usr/share/doc/altboot
-	install -d ${D}/usr/share/sounds
-	install -d ${D}/etc/skel/altboot
-
-	if test -d ${S}/${MACHINE}
-	then
-		install -m 0644 ${S}/${MACHINE}/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}/altbootctl.conf ${D}/etc
-	install -m 0755 ${S}/init.altboot ${D}/sbin
-	install -m 0755 ${S}/altbootctl ${D}/sbin
-
-	install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
-
-	install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-
-	install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
-}
-
-######################################################################################
-
-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}() {
-	update-alternatives --install /sbin/init init /sbin/init.altboot 55
-}
-
-######################################################################################
-
-pkg_postrm_${PN}() {
-	update-alternatives --remove init /sbin/init.altboot
-}
-
-- 
cgit v1.2.3


From 39886a956b7f240f604b2f71cfaea294276f40b9 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Fri, 30 Mar 2007 22:41:18 +0000
Subject: altboot: Add first installable version for nslu2

---
 packages/altboot/altboot_1.1.1+wip-20070331.bb | 121 +++++++++++++++++++++++++
 packages/altboot/altboot_svn.bb                |  37 ++++++--
 2 files changed, 151 insertions(+), 7 deletions(-)
 create mode 100644 packages/altboot/altboot_1.1.1+wip-20070331.bb

diff --git a/packages/altboot/altboot_1.1.1+wip-20070331.bb b/packages/altboot/altboot_1.1.1+wip-20070331.bb
new file mode 100644
index 0000000000..e9754b8dbe
--- /dev/null
+++ b/packages/altboot/altboot_1.1.1+wip-20070331.bb
@@ -0,0 +1,121 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: altboot_1.0.5-rc2.bb
+# Date: 21-Feb-06
+
+DESCRIPTION = "The altboot bootmanager"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+LICENSE = "GPL" 
+
+######################################################################################
+
+RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
+RRECOMMENDS_${PN}_append_akita = " kexec-tools"
+RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
+RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
+
+RDEPENDS_${PN} = "${PN}-conf"
+RDEPENDS_${PN}-conf = "${PN}"
+
+######################################################################################
+
+SRCDATE="20070331"
+PV = "1.1.1+wip-${SRCDATE}"
+PR = "r0"
+
+######################################################################################
+
+PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
+
+PACKAGE_ARCH_${PN} = "${MACHINE}"
+PACKAGE_ARCH_${PN}-doc = "all"
+PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
+
+SRC_URI = "svn://hentges.net/altboot;module=trunk;proto=svn"
+
+S = "${WORKDIR}/trunk/"
+
+######################################################################################
+
+FILES_${PN}-conf = "/etc/altboot*cfg"
+
+######################################################################################
+
+do_install() {
+	install -d ${D}/sbin
+	install -d ${D}/etc/altboot-menu
+	install -d ${D}/etc/altboot-menu/Advanced
+	install -d ${D}/etc/altboot.rc
+	install -d ${D}/usr/share/doc/altboot
+	install -d ${D}/usr/share/sounds
+
+	if test -d ${S}/${MACHINE}
+	then
+		install -m 0644 ${S}/${MACHINE}/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}/altboot-menu
+	then
+		install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
+		
+		if test -d ${S}/${MACHINE}/altboot-menu/Advanced
+		then
+			install -m 0755 ${S}/${MACHINE}/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 -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		fi
+	fi
+	
+	if test -d ${S}/${MACHINE}/altboot.rc
+	then
+		install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc
+		install -m 0644 ${S}/${MACHINE}/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_svn.bb b/packages/altboot/altboot_svn.bb
index d31c5160a2..d753273fdf 100644
--- a/packages/altboot/altboot_svn.bb
+++ b/packages/altboot/altboot_svn.bb
@@ -30,7 +30,7 @@ PR = "r0"
 
 PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
 
-PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN} = "${MACHINE}"
 PACKAGE_ARCH_${PN}-doc = "all"
 PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
@@ -51,7 +51,6 @@ do_install() {
 	install -d ${D}/etc/altboot.rc
 	install -d ${D}/usr/share/doc/altboot
 	install -d ${D}/usr/share/sounds
-	install -d ${D}/etc/skel/altboot
 
 	if test -d ${S}/${MACHINE}
 	then
@@ -62,18 +61,38 @@ do_install() {
 
 	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
 
-	install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
-
-	install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+	if test -d ${S}/${MACHINE}/altboot-menu
+	then
+		install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
+		
+		if test -d ${S}/${MACHINE}/altboot-menu/Advanced
+		then
+			install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		fi
+	else
+		install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
 
-	install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+		if test -d ${S}/altboot-menu/Advanced
+		then		
+			install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		fi
+	fi
+	
+	if test -d ${S}/${MACHINE}/altboot.rc
+	then
+		install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc
+		install -m 0644 ${S}/${MACHINE}/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
 }
 
 ######################################################################################
@@ -86,12 +105,16 @@ do_configure() {
 ######################################################################################
 
 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 v1.2.3


From d872ea5d2c9ed96e72f7cd833e80eaeb599a6cf6 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Fri, 30 Mar 2007 23:28:35 +0000
Subject: altboot: Do no use SRCDATE for snapshots, use SVN revision instead

---
 packages/altboot/altboot_1.1.1+wip-20070331.bb | 121 -------------------------
 packages/altboot/altboot_1.1.1+wip-SVNR25.bb   | 120 ++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 121 deletions(-)
 delete mode 100644 packages/altboot/altboot_1.1.1+wip-20070331.bb
 create mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR25.bb

diff --git a/packages/altboot/altboot_1.1.1+wip-20070331.bb b/packages/altboot/altboot_1.1.1+wip-20070331.bb
deleted file mode 100644
index e9754b8dbe..0000000000
--- a/packages/altboot/altboot_1.1.1+wip-20070331.bb
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: altboot_1.0.5-rc2.bb
-# Date: 21-Feb-06
-
-DESCRIPTION = "The altboot bootmanager"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "GPL" 
-
-######################################################################################
-
-RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
-RRECOMMENDS_${PN}_append_akita = " kexec-tools"
-RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
-RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
-
-RDEPENDS_${PN} = "${PN}-conf"
-RDEPENDS_${PN}-conf = "${PN}"
-
-######################################################################################
-
-SRCDATE="20070331"
-PV = "1.1.1+wip-${SRCDATE}"
-PR = "r0"
-
-######################################################################################
-
-PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
-
-PACKAGE_ARCH_${PN} = "${MACHINE}"
-PACKAGE_ARCH_${PN}-doc = "all"
-PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
-
-SRC_URI = "svn://hentges.net/altboot;module=trunk;proto=svn"
-
-S = "${WORKDIR}/trunk/"
-
-######################################################################################
-
-FILES_${PN}-conf = "/etc/altboot*cfg"
-
-######################################################################################
-
-do_install() {
-	install -d ${D}/sbin
-	install -d ${D}/etc/altboot-menu
-	install -d ${D}/etc/altboot-menu/Advanced
-	install -d ${D}/etc/altboot.rc
-	install -d ${D}/usr/share/doc/altboot
-	install -d ${D}/usr/share/sounds
-
-	if test -d ${S}/${MACHINE}
-	then
-		install -m 0644 ${S}/${MACHINE}/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}/altboot-menu
-	then
-		install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
-		
-		if test -d ${S}/${MACHINE}/altboot-menu/Advanced
-		then
-			install -m 0755 ${S}/${MACHINE}/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 -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-		fi
-	fi
-	
-	if test -d ${S}/${MACHINE}/altboot.rc
-	then
-		install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc
-		install -m 0644 ${S}/${MACHINE}/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-SVNR25.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb
new file mode 100644
index 0000000000..af15f64508
--- /dev/null
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb
@@ -0,0 +1,120 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: altboot_1.0.5-rc2.bb
+# Date: 21-Feb-06
+
+DESCRIPTION = "The altboot bootmanager"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+LICENSE = "GPL" 
+
+######################################################################################
+
+RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
+RRECOMMENDS_${PN}_append_akita = " kexec-tools"
+RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
+RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
+
+RDEPENDS_${PN} = "${PN}-conf"
+RDEPENDS_${PN}-conf = "${PN}"
+
+######################################################################################
+
+SVN_REV = "25"
+PR = "r0"
+
+######################################################################################
+
+PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
+
+PACKAGE_ARCH_${PN} = "${MACHINE}"
+PACKAGE_ARCH_${PN}-doc = "all"
+PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
+
+SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}"
+
+S = "${WORKDIR}/trunk/"
+
+######################################################################################
+
+FILES_${PN}-conf = "/etc/altboot*cfg"
+
+######################################################################################
+
+do_install() {
+	install -d ${D}/sbin
+	install -d ${D}/etc/altboot-menu
+	install -d ${D}/etc/altboot-menu/Advanced
+	install -d ${D}/etc/altboot.rc
+	install -d ${D}/usr/share/doc/altboot
+	install -d ${D}/usr/share/sounds
+
+	if test -d ${S}/${MACHINE}
+	then
+		install -m 0644 ${S}/${MACHINE}/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}/altboot-menu
+	then
+		install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
+		
+		if test -d ${S}/${MACHINE}/altboot-menu/Advanced
+		then
+			install -m 0755 ${S}/${MACHINE}/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 -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		fi
+	fi
+	
+	if test -d ${S}/${MACHINE}/altboot.rc
+	then
+		install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc
+		install -m 0644 ${S}/${MACHINE}/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 v1.2.3


From ff824b1d9d5d2aa031188263d2098b2e35f86189 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 31 Mar 2007 00:31:32 +0000
Subject: glibc 2.5: Fix common case of GNU arrogance, make ldd work on posix
 shell. * Not bumping PR, to save people trouble. Leaving for decision to OE
 maintainers.

---
 packages/glibc/glibc-2.4/ldd-unbash.patch | 11 +++++++++++
 packages/glibc/glibc_2.5.bb               |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 packages/glibc/glibc-2.4/ldd-unbash.patch

diff --git a/packages/glibc/glibc-2.4/ldd-unbash.patch b/packages/glibc/glibc-2.4/ldd-unbash.patch
new file mode 100644
index 0000000000..2fb8854b49
--- /dev/null
+++ b/packages/glibc/glibc-2.4/ldd-unbash.patch
@@ -0,0 +1,11 @@
+--- glibc-2.5/elf/ldd.bash.in.org	2006-04-30 16:06:20.000000000 +0000
++++ glibc-2.5/elf/ldd.bash.in	2007-03-30 19:18:57.000000000 +0000
+@@ -110,7 +110,7 @@
+ # environments where the executed program might not have permissions
+ # to write to the console/tty.  But only bash 3.x supports the pipefail
+ # option, and we don't bother to handle the case for older bash versions.
+-if set -o pipefail 2> /dev/null; then
++if false; then
+   try_trace() {
+     eval $add_env '"$@"' | cat
+   }
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index ee137541bb..8cd4c2ecd1 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -56,6 +56,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
 #	   file://glibc-2.4-openat-3.patch;patch=1 \
 #	   file://fixup-aeabi-syscalls.patch;patch=1 \
 	   file://zecke-sane-readelf.patch;patch=1 \
+           file://ldd-unbash.patch;patch=1 \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
-- 
cgit v1.2.3


From 2f521a7ff7daacc63bfe2b477e09888dbd544311 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 30 Mar 2007 23:29:22 +0000
Subject: altboot: Allow for multiple machines using the same source config
 directories.

---
 packages/altboot/altboot_1.1.1+wip-SVNR25.bb | 23 +++++++++++++----------
 packages/altboot/altboot_svn.bb              | 23 +++++++++++++----------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb
index af15f64508..e806604616 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR25.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb
@@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}"
 ######################################################################################
 
 SVN_REV = "25"
-PR = "r0"
+PR = "r1"
 
 ######################################################################################
 
@@ -44,6 +44,9 @@ FILES_${PN}-conf = "/etc/altboot*cfg"
 
 ######################################################################################
 
+MACHINE_DIR = "${MACHINE}"
+MACHINE_DIR_nslu2be = "nslu2le"
+
 do_install() {
 	install -d ${D}/sbin
 	install -d ${D}/etc/altboot-menu
@@ -52,9 +55,9 @@ do_install() {
 	install -d ${D}/usr/share/doc/altboot
 	install -d ${D}/usr/share/sounds
 
-	if test -d ${S}/${MACHINE}
+	if test -d ${S}/${MACHINE_DIR}
 	then
-		install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/
+		install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
 	else
 		install -m 0644 ${S}/altboot*.cfg ${D}/etc/
 	fi
@@ -68,13 +71,13 @@ do_install() {
 	
 	ln -s /sbin/init.altboot ${D}/sbin/altboot
 
-	if test -d ${S}/${MACHINE}/altboot-menu
+	if test -d ${S}/${MACHINE_DIR}/altboot-menu
 	then
-		install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
+		install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
 		
-		if test -d ${S}/${MACHINE}/altboot-menu/Advanced
+		if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
 		then
-			install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${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
@@ -85,10 +88,10 @@ do_install() {
 		fi
 	fi
 	
-	if test -d ${S}/${MACHINE}/altboot.rc
+	if test -d ${S}/${MACHINE_DIR}/altboot.rc
 	then
-		install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc
-		install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc	
+		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
diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb
index d753273fdf..18f73dd6ae 100644
--- a/packages/altboot/altboot_svn.bb
+++ b/packages/altboot/altboot_svn.bb
@@ -24,7 +24,7 @@ RDEPENDS_${PN}-conf = "${PN}"
 ######################################################################################
 
 PV = "1.1.1+wip-${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 ######################################################################################
 
@@ -44,6 +44,9 @@ FILES_${PN}-conf = "/etc/altboot*cfg"
 
 ######################################################################################
 
+MACHINE_DIR = "${MACHINE}"
+MACHINE_DIR_nslu2be = "nslu2le"
+
 do_install() {
 	install -d ${D}/sbin
 	install -d ${D}/etc/altboot-menu
@@ -52,9 +55,9 @@ do_install() {
 	install -d ${D}/usr/share/doc/altboot
 	install -d ${D}/usr/share/sounds
 
-	if test -d ${S}/${MACHINE}
+	if test -d ${S}/${MACHINE_DIR}
 	then
-		install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/
+		install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
 	else
 		install -m 0644 ${S}/altboot*.cfg ${D}/etc/
 	fi
@@ -68,13 +71,13 @@ do_install() {
 	
 	ln -s /sbin/init.altboot ${D}/sbin/altboot
 
-	if test -d ${S}/${MACHINE}/altboot-menu
+	if test -d ${S}/${MACHINE_DIR}/altboot-menu
 	then
-		install -m 0755 ${S}/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
+		install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
 		
-		if test -d ${S}/${MACHINE}/altboot-menu/Advanced
+		if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
 		then
-			install -m 0755 ${S}/${MACHINE}/altboot-menu/Advanced/*-* ${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
@@ -85,10 +88,10 @@ do_install() {
 		fi
 	fi
 	
-	if test -d ${S}/${MACHINE}/altboot.rc
+	if test -d ${S}/${MACHINE_DIR}/altboot.rc
 	then
-		install -m 0755 ${S}/${MACHINE}/altboot.rc/*.sh ${D}/etc/altboot.rc
-		install -m 0644 ${S}/${MACHINE}/altboot.rc/*.txt ${D}/etc/altboot.rc	
+		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
-- 
cgit v1.2.3


From 67a237498058d3265957ae84f60c18de7e9e1076 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 31 Mar 2007 09:41:11 +0000
Subject: openmoko-messages: add patch from Marcin to make it build again (OM
 bug #333)

---
 packages/openmoko-apps/files/.mtn2git_empty        |  0
 .../openmoko-apps/files/unbreak-messages.patch     | 29 ++++++++++++++++++++++
 packages/openmoko-apps/openmoko-messages_svn.bb    |  3 ++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 packages/openmoko-apps/files/.mtn2git_empty
 create mode 100644 packages/openmoko-apps/files/unbreak-messages.patch

diff --git a/packages/openmoko-apps/files/.mtn2git_empty b/packages/openmoko-apps/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/openmoko-apps/files/unbreak-messages.patch b/packages/openmoko-apps/files/unbreak-messages.patch
new file mode 100644
index 0000000000..c8d3413c0b
--- /dev/null
+++ b/packages/openmoko-apps/files/unbreak-messages.patch
@@ -0,0 +1,29 @@
+Index: sms-membership-window.c
+===================================================================
+--- sms-membership-window.c	(wersja 1565)
++++ openmoko-messages/src/sms-membership-window.c	(kopia robocza)
+@@ -36,9 +36,6 @@
+ #define SMS_MEMBERSHIP_WINDOW_GET_PRIVATE(o)   (G_TYPE_INSTANCE_GET_PRIVATE ((o), SMS_TYPE_MEMBERSHIP_WINDOW, SmsMembershipWindowPrivate))
+ 
+ typedef struct _SmsMembershipWindowPrivate SmsMembershipWindowPrivate;
+-typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
+-    GtkTreeIter *iter,
+-    gpointer data);
+ 
+ struct _SmsMembershipWindowPrivate
+   {
+Index: main.c
+===================================================================
+--- main.c	(wersja 1565)
++++ openmoko-messages/src/main.c	(kopia robocza)
+@@ -41,10 +41,6 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-typedef gboolean (*GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
+-    GtkTreeIter *iter,
+-    gpointer data);
+-
+ gboolean init_dbus (MessengerData* d)
+ {
+   DBusError error;
diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb
index 4411b860a1..1547c49d9a 100644
--- a/packages/openmoko-apps/openmoko-messages_svn.bb
+++ b/packages/openmoko-apps/openmoko-messages_svn.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "The OpenMoko Messaging Application"
 SECTION = "openmoko/applications"
 
 PV = "0.0.1+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko
 
+SRC_URI += "file://unbreak-messages.patch;patch=1"
-- 
cgit v1.2.3


From b4a61530aa20a81020170c73936fe2c6b19df5b0 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 31 Mar 2007 11:39:16 +0000
Subject: libsexy: add bugfix release 0.1.11

---
 packages/libsexy/libsexy_0.1.11.bb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 packages/libsexy/libsexy_0.1.11.bb

diff --git a/packages/libsexy/libsexy_0.1.11.bb b/packages/libsexy/libsexy_0.1.11.bb
new file mode 100644
index 0000000000..042ea757e9
--- /dev/null
+++ b/packages/libsexy/libsexy_0.1.11.bb
@@ -0,0 +1,2 @@
+require libsexy.inc
+PR = "r0"
-- 
cgit v1.2.3


From acc990526106b6ed000907c6dc0d3605679c71c5 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 31 Mar 2007 13:58:49 +0000
Subject: angstrom-2007.1.conf: bump hx4700 and magician kernel version to
 2.6.20-hh5

---
 conf/distro/angstrom-2007.1.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 37d2f1b9df..9322bb97d8 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -88,6 +88,8 @@ FEED_URIS += " \
 #PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
 PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13"
 PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13"
+PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh5"
+PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh5"
 
 PREFERRED_VERSION_file = "4.18"
 PREFERRED_VERSION_file_native = "4.18"
-- 
cgit v1.2.3


From 2c6b0e8608bfcfc1f97f9c6aee5b4c88296c20b2 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 31 Mar 2007 14:53:21 +0000
Subject: xproto-native: add 7.0.10 (X11R7.2)

---
 packages/xorg-proto/xproto-native_7.0.10.bb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 packages/xorg-proto/xproto-native_7.0.10.bb

diff --git a/packages/xorg-proto/xproto-native_7.0.10.bb b/packages/xorg-proto/xproto-native_7.0.10.bb
new file mode 100644
index 0000000000..12a58b5a0a
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_7.0.10.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+PE = "1"
+
+SRC_URI = "${XORG_MIRROR}/individual/proto/xproto-${PV}.tar.bz2"
+S = "${WORKDIR}/xproto-${PV}"
+
+inherit native autotools pkgconfig
-- 
cgit v1.2.3


From 0a9ddb4c6b3f4fe6a13cb01a92f0abf152ad5919 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 31 Mar 2007 14:56:54 +0000
Subject: xdpyinfo: add 1.0.2 (X11R7.2)

---
 packages/xorg-app/xdpyinfo_1.0.2.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 packages/xorg-app/xdpyinfo_1.0.2.bb

diff --git a/packages/xorg-app/xdpyinfo_1.0.2.bb b/packages/xorg-app/xdpyinfo_1.0.2.bb
new file mode 100644
index 0000000000..62825e5a0f
--- /dev/null
+++ b/packages/xorg-app/xdpyinfo_1.0.2.bb
@@ -0,0 +1,11 @@
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "X display information utility"
+LICENSE = "MIT"
+
+DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+EXTRA_OECONF = "--disable-xkb"
-- 
cgit v1.2.3


From f4a53b765a6801f836586b5ee662b5f9392dcfab Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sat, 31 Mar 2007 15:57:22 +0000
Subject: classes/patch.bbclass: Make sure to raise func_failed on any
 exception from within Import     non existing patches raised a IOError by the
 md5sum method which was not     catched at all and lead bitbake to exit due
 an unhandled exception. This     is bad for all autobuilders.

---
 classes/patch.bbclass | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 0a7b94cffc..07d18470f7 100644
--- a/classes/patch.bbclass
+++ b/classes/patch.bbclass
@@ -3,10 +3,20 @@
 def patch_init(d):
 	import os, sys
 
+	class NotFoundError(Exception):
+		def __init__(self, path):
+			self.path = path
+		def __str__(self):
+			return "Error: %s not found." % self.path
+
 	def md5sum(fname):
 		import md5, sys
 
-		f = file(fname, 'rb')
+		try:
+			f = file(fname, 'rb')
+		except IOError:
+			raise NotFoundError(fname)
+
 		m = md5.new()
 		while True:
 			d = f.read(8096)
@@ -24,11 +34,6 @@ def patch_init(d):
 		def __str__(self):
 			return "Command Error: exit status: %d  Output:\n%s" % (self.status, self.output)
 
-	class NotFoundError(Exception):
-		def __init__(self, path):
-			self.path = path
-		def __str__(self):
-			return "Error: %s not found." % self.path
 
 	def runcmd(args, dir = None):
 		import commands
@@ -482,7 +487,7 @@ python patch_do_patch() {
 		bb.note("Applying patch '%s'" % pname)
 		try:
 			patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True)
-		except NotFoundError:
+		except:
 			import sys
 			raise bb.build.FuncFailed(str(sys.exc_value))
 		resolver.Resolve()
-- 
cgit v1.2.3