merge of 048984452e3625e7ebd5e99419f289d1ea6a9d40

     and b160064c666a513a6ec76f7fd0ddbd5ee1d7a985

54 files changed, 1031 insertions, 1437 deletions

diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 89a10705ca..67e2aef263 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -78,8 +78,8 @@ BOOTSTRAP_EXTRA_DEPENDS  += "pcmciautils ncurses nano wireless-tools console-too
 #<>
 #<>What Opie version should we use.
 #<>
-OPIE_VERSION = "1.2.3"
-include conf/distro/preferred-opie-versions.inc  
+#OPIE_VERSION = "1.2.3" // use cvsdate for now
+#include conf/distro/preferred-opie-versions.inc  
 
 #<>
 #<> We want pcmciautils, not pcmcia-cs
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index fab57cae38..e1baea775d 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -14,7 +14,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 ROOT_FLASH_SIZE = "32"
 PCMCIA_MANAGER = "pcmciautils"
 
-BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}"
+BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${H2200_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools"
 
 #ship in rootfs:
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 9ed313334b..359f8296d8 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -21,7 +21,8 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 MODUTILS = "26"	
 PCMCIA_MANAGER = "pcmciautils"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
+BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware"
 
@@ -41,7 +42,6 @@ include conf/machine/include/tune-xscale.conf
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
 #include conf/machine/include/tune-iwmmxt.conf
 
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
 
 # These modules are now compiled into the kernel:
 #HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb
index be281d72bf..f6aaddd55e 100644
--- a/packages/angstrom/angstrom-bootmanager-image.bb
+++ b/packages/angstrom/angstrom-bootmanager-image.bb
@@ -1,9 +1,16 @@
-export IMAGE_BASENAME = "Ångström Bootmanager Image"
+#Angstrom bootmanager image
+LICENSE = MIT
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+PR = "r0"
+
+DEPENDS = "task-angstrom"
+RDEPENDS = "angstrom-base-depends angstrom-bootmanager"
+
+export IMAGE_BASENAME = "bootmanager-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap angstrom-bootmanager"
+export IPKG_INSTALL = "${RDEPENDS}"
 
 inherit image_ipk
 
-DEPENDS += "task-bootstrap angstrom-bootmanager"
 
-LICENSE = "MIT"
+
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
new file mode 100644
index 0000000000..b2b5565eb6
--- /dev/null
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -0,0 +1,14 @@
+#Angstrom bootstrap image
+LICENSE = MIT
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+PR = "r0"
+
+DEPENDS = "task-angstrom"
+RDEPENDS = "angstrom-base-depends"
+
+export IMAGE_BASENAME = "bootstrap-image"
+export IMAGE_LINGUAS = ""
+export IPKG_INSTALL = "${RDEPENDS}"
+
+inherit image_ipk
+
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
new file mode 100644
index 0000000000..df7f90987e
--- /dev/null
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -0,0 +1,22 @@
+#Angstrom GPE image
+LICENSE = MIT
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+PR = "r0"
+
+export IMAGE_BASENAME = "gpe-image"
+
+DEPENDS = "task-angstrom"
+RDEPENDS = "\
+    angstrom-base-depends \
+    angstrom-x11-base-depends \
+    angsgrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    angstrom-gpe-task-pim \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+
+export IPKG_INSTALL = "${RDEPENDS}"
+
+#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
+
+inherit image_ipk
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index c7323314db..ec989659f1 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -3,7 +3,8 @@ PR = "r0"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "\
-    angstrom-X-base-depends \
+    angstrom-base-depends \
+    angstrom-x11-base-depends \
     angsgrom-gpe-task-base \
     angstrom-gpe-task-settings \
     angstrom-gpe-task-pim \
@@ -13,7 +14,22 @@ PACKAGES = "\
     angstrom-task-printing \
     angstrom-task-sectest"
 
-RDEPENDS_angstrom-X-base-depends := "\
+RDEPENDS_angstrom-base-depends = "\
+    base-files \
+    base-passwd tinylogin \ 
+    busybox \
+    udev \
+    sysvinit initscripts sysvinit-pidof \
+    netbase \
+    angstrom-version \	
+    "
+
+RRECOMMENDS_angstrom-base-depends = "\
+        ${BOOTMODULES_RRECOMMENDS} \
+	"
+
+
+RDEPENDS_angstrom-x11-base-depends := "\
     diet-x11 \
     virtual/xserver"
 
diff --git a/packages/e17/e-wm_0.16.999.027.bb b/packages/e17/e-wm_0.16.999.027.bb
index df78fbdcd0..5089ce23a4 100644
--- a/packages/e17/e-wm_0.16.999.027.bb
+++ b/packages/e17/e-wm_0.16.999.027.bb
@@ -3,20 +3,12 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e"
 LICENSE = "MIT"
 PR = "r3"
 
-inherit e
+inherit e update-alternatives
 
 SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
            file://Xsession.d/98enlightenment"
 
-#           cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926"
-#           file://disable-splash.patch;patch=1 \
-#           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \
-#           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \
-#           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \
-#           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1"
-	
-
 S = "${WORKDIR}/enlightenment-${PV}"
 
 PROFILE = "LOWRES_PDA"
@@ -35,10 +27,6 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}"
 do_compile_prepend() {
         find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
 	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
-#	mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/"
-#	mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/"
-#	mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/"
-#	mv "${WORKDIR}/themes/images/entry_focus.png" "${S}/data/themes/images/"
 }
 
 do_install_append() {
@@ -46,7 +34,7 @@ do_install_append() {
 	install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
 }
 
-#pkg_postinst() {
-#    enlightenment_remote -menu-autoscroll-margin-set 5
-#    enlightenment_remote -menu-autoscroll-cursor-margin-set 5
-#}
\ No newline at end of file
+ALTERNATIVE_PATH = "${bindir}/enlightenment"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "16"
diff --git a/packages/opie-datebook/files/.mtn2git_empty b/packages/fluxbox/fluxbox/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-datebook/files/.mtn2git_empty
+++ b/packages/fluxbox/fluxbox/.mtn2git_empty
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox/apps.gpe.akita
index 7aca442752..7aca442752 100644
--- a/packages/fluxbox/fluxbox-gpe/apps.gpe
+++ b/packages/fluxbox/fluxbox/apps.gpe.akita
diff --git a/packages/fluxbox/fluxbox/apps.gpe.default b/packages/fluxbox/fluxbox/apps.gpe.default
new file mode 100644
index 0000000000..d7a0a83f22
--- /dev/null
+++ b/packages/fluxbox/fluxbox/apps.gpe.default
@@ -0,0 +1,7 @@
+[app] (title=Panel 0)
+  [Deco]	{NONE}
+  [Sticky]	{yes}
+[end]
+[app] (title=Panel 1)
+  [Deco]	{NONE}
+[end]
diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox/fluxbox-gpe-session
index f6e03ede7e..f6e03ede7e 100644
--- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
+++ b/packages/fluxbox/fluxbox/fluxbox-gpe-session
diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session b/packages/fluxbox/fluxbox/fluxbox-gpe.session
index 16b7a2703a..16b7a2703a 100644
--- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session
+++ b/packages/fluxbox/fluxbox/fluxbox-gpe.session
diff --git a/packages/fluxbox/fluxbox-gpe/gpe-init.patch b/packages/fluxbox/fluxbox/gpe-init.patch
index c9836923d8..c9836923d8 100644
--- a/packages/fluxbox/fluxbox-gpe/gpe-init.patch
+++ b/packages/fluxbox/fluxbox/gpe-init.patch
diff --git a/packages/fluxbox/fluxbox-gpe/style.gpe-default b/packages/fluxbox/fluxbox/style.gpe-default
index f94aaf7cdd..f94aaf7cdd 100644
--- a/packages/fluxbox/fluxbox-gpe/style.gpe-default
+++ b/packages/fluxbox/fluxbox/style.gpe-default
diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
index 9cf8da0217..cf69b090c4 100644
--- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb
+++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
@@ -5,44 +5,50 @@
 # Filename: fluxbox-gpe_1.0rc.bb
 # Date: 01-Jul-06
 
-DESCRIPTION = "The Fluxbox WindowManager for use with GPE"
+DESCRIPTION = "The Fluxbox WindowManager"
 MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://fluxbox.sourceforge.net"
 LICENSE = "MIT"
-RCONFLICTS = "fluxbox"
+REALPV = "1.0rc"
+PR = "r1"
 
 ######################################################################################
 
-PR = "r3"
-S = "${WORKDIR}/fluxbox-${PV}"
+S = "${WORKDIR}/fluxbox-${REALPV}"
 
 ######################################################################################
 
-SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \
-	   file://gpe-init.patch;patch=1\
+SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \
+	   file://gpe-init.patch;patch=1 \
 	   file://apps.gpe.* \
 	   file://style.gpe-default \
 	   file://fluxbox-gpe-session \
-	   file://fluxbox-gpe.session" 
+	   file://fluxbox-gpe.session"
 
 ######################################################################################
 
-PACKAGES += "${PN}-styles"
+PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
 
 DESCRIPTION_${PN}-styles = "The default styles for fluxbox"
+DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE"
+RDEPENDS_${PN}-gpe = "${PN}"
 
 ######################################################################################
 
 FILES_${PN} = "/usr/bin \
 	       /usr/share/fluxbox/init \
 	       /usr/share/fluxbox/keys \
-	       /usr/share/fluxbox/menu \
-	       /usr/share/fluxbox/apps.gpe* \
-	       /usr/share/fluxbox/session \
-	       /usr/share/fluxbox/styles/gpe-default"
+	       /usr/share/fluxbox/menu "
+
+FILES_${PN}-gpe = "/usr/share/fluxbox/apps.gpe* \
+		   /usr/share/fluxbox/styles/gpe-default \
+		   /usr/share/fluxbox/session \
+		   /usr/bin/fluxbox-gpe-session"
 
 FILES_${PN}-styles = "/usr/share/fluxbox/styles"
 
+FILES_${PN}-doc = "/usr/share/man"
+
 ######################################################################################
 
 inherit autotools
@@ -67,11 +73,10 @@ do_install_append() {
 
 ######################################################################################
 
-pkg_postinst_${PN}() {	
-	update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15
+pkg_postinst_${PN}-gpe() { 
+       update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15
 }
 
-pkg_postrm_${PN}() {	
-	update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session
+pkg_postrm_${PN}-gpe() {   
+       update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session
 }
-
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 19e37660b2..4e3805b676 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r4"
+PR = "r5"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 93c58aca53..044383cb84 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -4,7 +4,7 @@ include gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc
index 74ad11033f..32e22e16f8 100644
--- a/packages/gcc/gcc3-build.inc
+++ b/packages/gcc/gcc3-build.inc
@@ -63,8 +63,13 @@ python __anonymous () {
     import bb, re
     if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
         bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+    elif (re.match('linux-uclibcgnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+    elif (re.match('linux-gnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+           bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
     elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
         bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
+
 }
 
 do_configure () {
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 793aa4bb76..6e332dceca 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index 62bacda147..02e984358f 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 BINV = "3.4.4"
 PV = "3.4.4+csl-arm-2005q3"
-PR = "r1"
+PR = "r2"
 
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
diff --git a/packages/opie-wellenreiter/files/.mtn2git_empty b/packages/hping/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-wellenreiter/files/.mtn2git_empty
+++ b/packages/hping/.mtn2git_empty
diff --git a/packages/hping/files/.mtn2git_empty b/packages/hping/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hping/files/.mtn2git_empty
diff --git a/packages/hping/files/hping2_configure.patch b/packages/hping/files/hping2_configure.patch
new file mode 100644
index 0000000000..90795ab0e0
--- /dev/null
+++ b/packages/hping/files/hping2_configure.patch
@@ -0,0 +1,75 @@
+Allow the byteorder and target os type to be specified via
+environment variables when running the configured shell script, don't
+try and run the resultant binary after building it, don't set various
+compiler related environment varibles - we'll let OE set those.
+
+diff -dur hping2-rc3-orig/configure hping2-rc3/configure
+--- hping2-rc3-orig/configure	2005-12-03 19:04:44.000000000 +1100
++++ hping2-rc3/configure	2005-12-03 19:05:58.000000000 +1100
+@@ -13,16 +13,19 @@
+ 	exit 0
+ fi
+ 
+-CC=${CC:=cc}
++if [ "x$BYTEORDER" = "x" ]; then
++	CC=${CC:=cc}
+ 
+-echo build byteorder.c...
+-$CC byteorder.c -o byteorder || exit 1
++	echo build byteorder.c...
++	$CC byteorder.c -o byteorder || exit 1
++
++	BYTEORDER=`./byteorder -m`
++fi
+ 
+ INSTALL_MANPATH=`echo $MANPATH|cut -f1 -d:`
+ if [ "$INSTALL_MANPATH" = "" ]; then
+ 	INSTALL_MANPATH="/usr/local/man"
+ fi
+-BYTEORDER=`./byteorder -m`
+ 
+ echo create byteorder.h...
+ cat > byteorder.h <<EOF
+@@ -38,7 +41,9 @@
+ #endif /* __BYTEORDER_H */
+ EOF
+ 
+-CONFIGOSTYPE=`uname -s | tr [a-z] [A-Z]`
++if [ "x$CONFIGOSTYPE" = "x" ]; then
++  CONFIGOSTYPE=`uname -s | tr [a-z] [A-Z]`
++fi
+ if [ ! "$CONFIGOSTYPE" ]; then
+ 	CONFIGOSTYPE=UNKNOWN
+ fi
+diff -dur hping2-rc3-orig/Makefile.in hping2-rc3/Makefile.in
+--- hping2-rc3-orig/Makefile.in	2005-12-03 19:04:44.000000000 +1100
++++ hping2-rc3/Makefile.in	2005-12-03 19:05:41.000000000 +1100
+@@ -6,17 +6,6 @@
+ # $date: Sun Jul 25 17:56:15 MET DST 1999$ 
+ # $rev: 3$ 
+ 
+-CC= gcc
+-AR=/usr/bin/ar
+-RANLIB=/usr/bin/ranlib
+-CCOPT= -O2 -Wall @PCAP_INCLUDE@
+-DEBUG= -g
+-#uncomment the following if you need libpcap based build under linux
+-#(not raccomanded)
+-COMPI