merge of '3dca1a73b62f0ff1be73ca1a304fd542319e323d'

     and '90c926734111bd8bb89a763b03491eb3b15b1e96'

10 files changed, 125 insertions, 29 deletions

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"
diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb
index 37a8b5f9dd..e806604616 100644
--- a/packages/altboot/altboot_wip.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR25.bb
@@ -23,24 +23,20 @@ RDEPENDS_${PN}-conf = "${PN}"
 
 ######################################################################################
 
-WIP_DATE = "20070323"
-
-PV = "1.1.1+wip-${WIP_DATE}"
-PR = "r0"
+SVN_REV = "25"
+PR = "r1"
 
 ######################################################################################
 
 PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
 
-PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN} = "${MACHINE}"
 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"
+SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}"
 
-S = "${WORKDIR}/${TAG}/"
+S = "${WORKDIR}/trunk/"
 
 ######################################################################################
 
@@ -48,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
@@ -55,27 +54,48 @@ 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}
+	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
 
 	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_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 -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
 
-	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_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
 }
 
 ######################################################################################
@@ -88,12 +108,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
 }
 
diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb
index d31c5160a2..18f73dd6ae 100644
--- a/packages/altboot/altboot_svn.bb
+++ b/packages/altboot/altboot_svn.bb
@@ -24,13 +24,13 @@ RDEPENDS_${PN}-conf = "${PN}"
 ######################################################################################
 
 PV = "1.1.1+wip-${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 ######################################################################################
 
 PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
 
-PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN} = "${MACHINE}"
 PACKAGE_ARCH_${PN}-doc = "all"
 PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
@@ -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
@@ -51,29 +54,48 @@ 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}
+	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
 
 	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_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 -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
 
-	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_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
 }
 
 ######################################################################################
@@ -86,12 +108,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
 }
 
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 \
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"
diff --git a/packages/openmoko-apps/files/.mtn2git_empty b/packages/openmoko-apps/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-apps/files/.mtn2git_empty
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"
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 56f3c7242a..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 = "r80"
+PR = "r82"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \