merge of '5f9ded38d3bb3f4a0369515dbb717e835f0acc61'

     and '774a9654f13013fc4f169930d4cfec26a95b97e5'

17 files changed, 131 insertions, 71 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index a733c7963c..35b0374f77 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -463,8 +463,8 @@ do_sizecheck() {
 
 addtask sizecheck before do_install after do_compile
 
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
+KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
+KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
 
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
@@ -475,22 +475,22 @@ do_deploy() {
 	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
 		if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
 			${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
-			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 			rm -f linux.bin
 		else
 			${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
 			rm -f linux.bin.gz
 			gzip -9 linux.bin
-			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 			rm -f linux.bin.gz
 		fi
-		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 	fi
 
 	cd ${DEPLOY_DIR_IMAGE}
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
 	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
-        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
+	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/contrib/mtn2git/update-script.example b/contrib/mtn2git/update-script.example
new file mode 100644
index 0000000000..3b23e19a49
--- /dev/null
+++ b/contrib/mtn2git/update-script.example
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+export PATH=/home/zecke/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
+
+cd $HOME/mtn2git-scm/oe-convert/
+
+# Update monotone
+mtn --db ../OE.mtn pull monotone.linuxtogo.org "org.openembedded.*"
+
+OLD_OE_DIR=openembedded-git.$$.$RANDOM
+
+git-clone -l openembedded-git $OLD_OE_DIR
+cp git-import-marks2 $OLD_OE_DIR/
+cp mtn2git-status.v2 $OLD_OE_DIR/
+cp mtn2git-marks     $OLD_OE_DIR/
+
+cd openembedded-git
+# Convert (this could fail as our marks are not complete...) and we hardcode the revision
+#../../mtn2git/mtn2git.py --db ../../OE.mtn --marks=../mtn2git-marks --status=../mtn2git-status.v2 2> /dev/null | git-fast-import --date-format=rfc2822 --import-marks=../git-import-marks2 --export-marks=../git-import-marks2
+../../mtn2git/mtn2git.py --db ../../OE.mtn --marks=../mtn2git-marks --status=../mtn2git-status.v2 | git-fast-import --date-format=rfc2822 --import-marks=../git-import-marks2 --export-marks=../git-import-marks2
+
+
+
+# Push all changes to the server, update the master tag as well
+for branch in dev dreambox documentation oetest oz354x packaged-staging oz354fam083 angstrom-2007.12-stable entity stable;
+do
+    git-push --force git+ssh://ABC@repo.or.cz/srv/git/org.openembedded.dev.git org.openembedded.$branch;
+done
+
+#dev is our master
+git-push --force git+ssh://ABC@repo.or.cz/srv/git/org.openembedded.dev.git org.openembedded.dev:master;
+
diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb
index ec11982ad7..eb626aba91 100644
--- a/packages/abiword/abiword-plugins_2.5.1.bb
+++ b/packages/abiword/abiword-plugins_2.5.1.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb
index d750bf539d..89a0527401 100644
--- a/packages/abiword/abiword-plugins_2.5.2.bb
+++ b/packages/abiword/abiword-plugins_2.5.2.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
diff --git a/packages/abiword/abiword-plugins_2.6.0.bb b/packages/abiword/abiword-plugins_2.6.0.bb
new file mode 100644
index 0000000000..f6cdcc56b0
--- /dev/null
+++ b/packages/abiword/abiword-plugins_2.6.0.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+           file://abiword-cxx-for-ld-fix.patch;patch=1 \
+	   "
+
+DEFAULT_PREFERENCE = "2"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+# Ugly hack to find libstdc++
+export LD="${CXX}"
+
+EXTRA_OECONF = " --without-libwmf \
+                 --without-inter7eps \
+		 --with-abiword=${WORKDIR}/abiword-${PV} \
+		 --with-boost=${STAGING_DIR_HOST} \ 
+		 --with-boost-thread=boost_thread-mt \
+               "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.6/plugins', d)
+	do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+        do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='')
+}
+
+
+PACKAGES =+ "abiword-plugin-collab-glade"
+
+FILES_abiword-plugin-collab-glade += "${datadir}"
+RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
+
+FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
+
diff --git a/packages/abiword/abiword_2.6.0.bb b/packages/abiword/abiword_2.6.0.bb
new file mode 100644
index 0000000000..e2db4a09cb
--- /dev/null
+++ b/packages/abiword/abiword_2.6.0.bb
@@ -0,0 +1,3 @@
+require abiword-2.5.inc
+
+RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/files/abiword-cxx-for-ld-fix.patch b/packages/abiword/files/abiword-cxx-for-ld-fix.patch
new file mode 100644
index 0000000000..e49b1e92e5
--- /dev/null
+++ b/packages/abiword/files/abiword-cxx-for-ld-fix.patch
@@ -0,0 +1,12 @@
+libstc++ isn't in staging anymore, so we must use g++ for linking
+
+--- /tmp/configure.ac	2008-03-31 11:39:13.130631737 +0200
++++ abiword-plugins-2.6.0/configure.ac	2008-03-31 11:39:22.754586487 +0200
+@@ -14,6 +14,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++AC_LANG_CPLUSPLUS
+ 
+ AM_INIT_AUTOMAKE
+ 
diff --git a/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty b/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty
+++ b/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty
diff --git a/packages/hostap/hostap-daemon-0.6.0/init b/packages/hostap/hostap-daemon-0.6.3/init
index 79f74b681e..79f74b681e 100644
--- a/packages/hostap/hostap-daemon-0.6.0/init
+++ b/packages/hostap/hostap-daemon-0.6.3/init
diff --git a/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff b/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
index 9534199e78..9534199e78 100644
--- a/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
+++ b/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
diff --git a/packages/hostap/hostap-daemon_0.6.0.bb b/packages/hostap/hostap-daemon_0.6.3.bb
index 37b710db19..37b710db19 100644
--- a/packages/hostap/hostap-daemon_0.6.0.bb
+++ b/packages/hostap/hostap-daemon_0.6.3.bb
diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb
index 8081f44e93..bddb16fdf0 100644
--- a/packages/linux/linux-rt_2.6.24.bb
+++ b/packages/linux/linux-rt_2.6.24.bb
@@ -4,8 +4,6 @@ require linux.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-
 PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \
@@ -24,18 +22,3 @@ SRC_URI_append_mpc8313e-rdb = "\
 #	file://mpc831x-nand.patch;patch=1 \
 #	file://mpc8313e-rdb-rtc.patch;patch=1 "
 
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
-
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
-
-addtask devicetree_image after do_deploy before do_package
-
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index ad7071c405..2757ad520d 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -18,6 +18,23 @@ CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfs
 CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
 CMDLINE_append = " ${CMDLINE_DEBUG} "
 
+# Support for binary device tree generation
+
+KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
+KERNEL_DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
+KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
+
+python __anonymous () {
+
+    import bb
+    
+    devicetree = bb.data.getVar('KERNEL_DEVICETREE', d, 1) or ''
+    if devicetree:
+    	depends = bb.data.getVar("DEPENDS", d, 1)
+    	depends = "%s dtc-native" % depends
+    	bb.data.setVar("DEPENDS", depends, d)
+}
+
 do_configure_prepend() {
         echo "" > ${S}/.config
 
@@ -106,5 +123,14 @@ do_compile_append() {
     fi
 }
 
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
+do_devicetree_image() {
+        if test -n "${KERNEL_DEVICETREE}" ; then
+            dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_DEVICETREE}
+
+            cd ${DEPLOY_DIR_IMAGE}
+            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+        fi
+}
+
+addtask devicetree_image after do_deploy before do_package
diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
index 20ee7d0508..648fe6b756 100644
--- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
@@ -64,15 +64,5 @@ python do_compulab_image() {
 	    os.symlink(img_file, link_file)
 }
 
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
-
 addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
+
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index d3989a42ef..76ebbbe917 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -6,9 +6,6 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 DEFAULT_PREFERENCE_avr32 = "1"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-DEPENDS_append_mpc8323e-rdb = " dtc-native"
-
 PR = "r12"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
@@ -52,10 +49,6 @@ SRC_URI_append_mpc8323e-rdb = "\
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
-
 FILES_kernel-image_cm-x270 = ""
 
 python do_compulab_image() {
@@ -93,16 +86,6 @@ python do_compulab_image() {
 	    os.symlink(img_file, link_file)
 }
 
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
 
 addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
 
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index c0751634a5..fa255403e9 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -10,8 +10,6 @@ DEFAULT_PREFERENCE_atngw100 = "1"
 DEFAULT_PREFERENCE_at32stk1000 = "1"
 DEFAULT_PREFERENCE_ts72xx = "1"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-
 PR = "r11"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
@@ -84,8 +82,6 @@ CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M
 
 FILES_kernel-image_gesbc-9302 = ""
 
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
 python do_compulab_image() {
 	import os
 	import os.path
@@ -122,16 +118,5 @@ python do_compulab_image() {
 }
 
 
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
-
 addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
 
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 052560dcc9..56f067cbf7 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r20"
+PR = "r21"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -22,10 +22,12 @@ do_compile() {
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
+        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
 
 	case ${MACHINE} in
 		spitz )
 			install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar
+		        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar
 			;;
         	*)
 			;;