merge of '235d3c4d9fbc3aee4e352851f04eb4fa2da4a68f'

     and '2d2fba06a82095954bfbae27ea7e7024c3604521'

14 files changed, 242 insertions, 14 deletions

diff --git a/packages/free42/.mtn2git_empty b/packages/free42/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/free42/.mtn2git_empty
diff --git a/packages/free42/files/.mtn2git_empty b/packages/free42/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/free42/files/.mtn2git_empty
diff --git a/packages/free42/files/free42-bcd-gtk-only.patch b/packages/free42/files/free42-bcd-gtk-only.patch
new file mode 100644
index 0000000000..571785f36f
--- /dev/null
+++ b/packages/free42/files/free42-bcd-gtk-only.patch
@@ -0,0 +1,100 @@
+--- free42-orig/gtk/Makefile	2007-01-06 09:37:55.000000000 -0800
++++ free42gtk/gtk/Makefile	2007-09-02 23:54:34.000000000 -0700
+@@ -35,20 +35,14 @@
+ 	core_math2.o core_phloat.o core_sto_rcl.o core_tables.o \
+ 	core_variables.o
+ 
+-ifdef BCD_MATH
+ CXXFLAGS += -DBCD_MATH
+ SRCS += bcdfloat.cc bcd.cc bcdmath.cc
+ OBJS += bcdfloat.o bcd.o bcdmath.o
+ EXE = free42dec
+-else
+-EXE = free42bin
+-endif
+ 
+ $(EXE): $(OBJS)
+ 	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
+ 
+-$(SRCS): symlinks
+-
+ .cc.o:
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+ 
+@@ -64,74 +58,18 @@
+ keymap.cc: keymap2cc keymap.txt
+ 	./keymap2cc
+ 
+-symlinks:
+-	ln -s ../common/free42.h
+-	ln -s ../common/core_commands1.cc
+-	ln -s ../common/core_commands1.h
+-	ln -s ../common/core_commands2.cc
+-	ln -s ../common/core_commands2.h
+-	ln -s ../common/core_commands3.cc
+-	ln -s ../common/core_commands3.h
+-	ln -s ../common/core_commands4.cc
+-	ln -s ../common/core_commands4.h
+-	ln -s ../common/core_commands5.cc
+-	ln -s ../common/core_commands5.h
+-	ln -s ../common/core_commands6.cc
+-	ln -s ../common/core_commands6.h
+-	ln -s ../common/core_display.cc
+-	ln -s ../common/core_display.h
+-	ln -s ../common/core_globals.cc
+-	ln -s ../common/core_globals.h
+-	ln -s ../common/core_helpers.cc
+-	ln -s ../common/core_helpers.h
+-	ln -s ../common/core_keydown.cc
+-	ln -s ../common/core_keydown.h
+-	ln -s ../common/core_linalg1.cc
+-	ln -s ../common/core_linalg1.h
+-	ln -s ../common/core_linalg2.cc
+-	ln -s ../common/core_linalg2.h
+-	ln -s ../common/core_math1.cc
+-	ln -s ../common/core_math1.h
+-	ln -s ../common/core_math2.cc
+-	ln -s ../common/core_math2.h
+-	ln -s ../common/core_main.cc
+-	ln -s ../common/core_main.h
+-	ln -s ../common/core_phloat.cc
+-	ln -s ../common/core_phloat.h
+-	ln -s ../common/core_sto_rcl.cc
+-	ln -s ../common/core_sto_rcl.h
+-	ln -s ../common/core_tables.cc
+-	ln -s ../common/core_tables.h
+-	ln -s ../common/core_variables.cc
+-	ln -s ../common/core_variables.h
+-	ln -s ../common/shell.h
+-	ln -s ../common/shell_loadimage.cc
+-	ln -s ../common/shell_loadimage.h
+-	ln -s ../common/shell_spool.cc
+-	ln -s ../common/shell_spool.h
+-	ln -s ../common/skin2cc.cc
+-	ln -s ../common/skin2cc.conf
+-	ln -s ../common/keymap2cc.cc
+-	ln -s ../common/bcd.cc
+-	ln -s ../common/bcd.h
+-	ln -s ../common/bcdfloat.cc
+-	ln -s ../common/bcdfloat.h
+-	ln -s ../common/bcdmath.cc
+-	ln -s ../common/bcdmath.h
+-	touch symlinks
+-
+ clean: FORCE
+ 	rm -f `find . -type l` \
+ 		skin2cc skin2cc.exe skins.cc \
+ 		keymap2cc keymap2cc.exe keymap.cc \
+-		*.o *.d *.i *.ii *.s symlinks core.*
++		*.o *.d *.i *.ii *.s core.*
+ 
+ cleaner: FORCE
+ 	rm -f `find . -type l` \
+ 		free42bin free42bin.exe free42dec free42dec.exe \
+ 		skin2cc skin2cc.exe skins.cc \
+ 		keymap2cc keymap2cc.exe keymap.cc \
+-		*.o *.d *.i *.ii *.s symlinks core.*
++		*.o *.d *.i *.ii *.s core.*
+ 
+ FORCE:
+ 
diff --git a/packages/free42/files/free42-dont-declare-sincos.patch b/packages/free42/files/free42-dont-declare-sincos.patch
new file mode 100644
index 0000000000..8ba10face4
--- /dev/null
+++ b/packages/free42/files/free42-dont-declare-sincos.patch
@@ -0,0 +1,11 @@
+--- free42-orig/common/free42.h	2007-01-06 09:37:50.000000000 -0800
++++ free42gtk/common/free42.h	2007-09-03 22:39:14.000000000 -0700
+@@ -150,7 +150,7 @@
+  * provided by MathLib.
+  */
+ #ifndef PALMOS
+-extern "C" void sincos(double x, double *sinx, double *cosx) HELPERS_SECT;
++
+ #endif
+ //#define NO_SINCOS 1
+ 
diff --git a/packages/free42/files/free42-vga-skin.patch b/packages/free42/files/free42-vga-skin.patch
new file mode 100644
index 0000000000..628a233514
--- /dev/null
+++ b/packages/free42/files/free42-vga-skin.patch
@@ -0,0 +1,12 @@
+--- free42-orig/common/skin2cc.conf	2006-03-22 11:33:35.000000000 -0800
++++ free42gtk/common/skin2cc.conf	2007-09-02 23:52:27.000000000 -0700
+@@ -1,4 +1,4 @@
+-skins/Standard
+-Standard
+-skins/Ehrling42sl
+-Realistic
++skins/Ehrling42ssv
++Portrait
++skins/42ct
++Landscape
+
diff --git a/packages/free42/files/free42dec.desktop b/packages/free42/files/free42dec.desktop
new file mode 100644
index 0000000000..4d08c453ab
--- /dev/null
+++ b/packages/free42/files/free42dec.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Free42
+Comment=RPN Calculator
+Exec=free42dec
+Icon=free42.xpm
+StartupNotify=true
+SingleInstance=true
+Terminal=false
+Type=Application
+Categories=Application
diff --git a/packages/free42/free42-vga_1.4.36.bb b/packages/free42/free42-vga_1.4.36.bb
new file mode 100644
index 0000000000..3f64f99c6a
--- /dev/null
+++ b/packages/free42/free42-vga_1.4.36.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "Free42 RPN Calculator"
+SECTION = "openmoko/applications"
+DEPENDS = "gtk+"
+PV = "1.4.36"
+PR = "r1"
+
+SRC_URI = "http://home.planet.nl/~demun000/thomas_projects/free42/free42.tgz \
+           http://sense.net/zc/free42/42c_skins.tgz \
+           file://free42-bcd-gtk-only.patch;patch=1 \
+           file://free42-vga-skin.patch;patch=1 \
+           file://free42-dont-declare-sincos.patch;patch=1 \
+           file://free42dec.desktop"
+
+S = "${WORKDIR}/free42"
+
+TARGET_CXXFLAGS_append = " -fsigned-char"
+TARGET_CXXFLAGS_append += "-DVERSION=\\"${PV}\\" -DBCD_MATH"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/gtk-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_LIBDIR}/gtk-2.0/include"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/cairo"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/glib-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/pango-1.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/atk-1.0"
+
+do_compile() {
+        cp -fv ${S}/common/* ${S}/gtk
+        cp -fv ${S}/ppcskins/Ehrling42ssv.* ${S}/skins/ 
+        cp ${WORKDIR}/42ct.* ${S}/skins/
+        cd ${S}/gtk/
+        ${BUILD_CXX} -o skin2cc skin2cc.cc ${BUILD_CXXFLAGS}
+        ${BUILD_CXX} -o keymap2cc keymap2cc.cc ${BUILD_CXXFLAGS}
+        oe_runmake
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 ${S}/gtk/free42dec ${D}${bindir}/free42dec
+        install -d ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/free42dec.desktop ${D}${datadir}/applications/
+        install -d ${D}${datadir}/pixmaps
+        install -m 0644 ${S}/gtk/icon.xpm ${D}${datadir}/pixmaps/free42.xpm
+}
+
+
diff --git a/packages/linux/linux-2.6.21/gumstix-verdex/defconfig b/packages/linux/linux-2.6.21/gumstix-verdex/defconfig
index d49d7a1021..9107cd0d7c 100644
--- a/packages/linux/linux-2.6.21/gumstix-verdex/defconfig
+++ b/packages/linux/linux-2.6.21/gumstix-verdex/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21
-# Thu Aug 23 09:30:49 2007
+# Thu Sep 13 14:49:02 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -63,11 +63,11 @@ CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 # CONFIG_EPOLL is not set
-# CONFIG_SHMEM is not set
+CONFIG_SHMEM=y
 CONFIG_SLAB=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 CONFIG_RT_MUTEXES=y
-CONFIG_TINY_SHMEM=y
+# CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
 
@@ -199,7 +199,7 @@ CONFIG_PCMCIA_PXA2XX=m
 CONFIG_NO_IDLE_HZ=y
 CONFIG_HZ=100
 CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -235,6 +235,8 @@ CONFIG_KEXEC=y
 #
 # At least one emulation must be selected
 #
+# CONFIG_FPE_NWFPE is not set
+# CONFIG_FPE_FASTFPE is not set
 
 #
 # Userspace binary formats
@@ -1161,10 +1163,7 @@ CONFIG_FONT_6x11=y
 #
 # Logo configuration
 #
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 
 #
 # Sound
diff --git a/packages/linux/linux-omap.inc b/packages/linux/linux-omap.inc
index 6bc1363737..83f134b878 100644
--- a/packages/linux/linux-omap.inc
+++ b/packages/linux/linux-omap.inc
@@ -1,7 +1,9 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for OMAP processors"
 LICENSE = "GPL"
-DEPENDS = ${@['u-boot','u-boot-omap2430sdp'][bb.data.getVar('MACHINE',d,1) == 'omap2430sdp']}
+#DEPENDS = ${@['u-boot','u-boot-omap2430sdp'][bb.data.getVar('MACHINE',d,1) == 'omap2430sdp']}
+
+DEPENDS = uboot-utils
 
 inherit kernel
 
diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb
index 2144dd28a1..0848bcd71a 100644
--- a/packages/linux/linux_2.6.21.bb
+++ b/packages/linux/linux_2.6.21.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1"
 DEFAULT_PREFERENCE_gumstix-connex = "1"
 DEFAULT_PREFERENCE_gumstix-verdex = "1"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig \
@@ -35,7 +35,6 @@ GUMSTIX_PATCHES = "\
        file://arch-config.patch;patch=1 \
        file://board-init.patch;patch=1 \
        file://compact-flash.patch;patch=1 \
-       file://defconfig.patch;patch=1 \
        file://flash.patch;patch=1 \
        file://pxa2xx_udc.patch;patch=1 \
        file://bkpxa-pxa-cpu.patch;patch=1 \
@@ -63,7 +62,6 @@ GUMSTIX_PATCHES = "\
        file://mmc-card-detect.patch;patch=1 \
        file://misalignment-handling.patch;patch=1 \
        file://compile-fix-pxa_cpufreq.patch;patch=1 \
-       file://ramfs-mode-support.patch;patch=1 \
        file://pxafb-definition.patch;patch=1 \
        file://270-usb-gadget-udc.patch;patch=1 \
        file://gumstix-pxa270-usb-host.patch;patch=1 \
diff --git a/packages/starling/starling_0.2.bb b/packages/starling/starling_0.2.bb
index 6080491cb2..32cd1b9025 100644
--- a/packages/starling/starling_0.2.bb
+++ b/packages/starling/starling_0.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Starling audio player for GPE"
 SECTION = "gpe/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
+DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad sqlite libsoup gnutls"
 
 RDEPENDS = "esd \
         gst-plugin-audioconvert \
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 41c63f7dff..bc4a4ff967 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
 
 inherit task
 
@@ -10,6 +10,7 @@ RDEPENDS_task-openmoko-feed = "\
   bluez-hcidump \
   eet evas ecore embryo epsilon edje efreet emotion epdf \
   exhibit edje-viewer \
+  free42-vga \
   gpe-filemanager gpe-gallery gpe-timesheet gpe-todo \
   ipkg-link ipkg-utils \
   joe \
diff --git a/packages/uclibc/bfin-uclibc_svn.bb b/packages/uclibc/bfin-uclibc_svn.bb
new file mode 100644
index 0000000000..fdb1329968
--- /dev/null
+++ b/packages/uclibc/bfin-uclibc_svn.bb
@@ -0,0 +1,34 @@
+# UCLIBC_BASE should be the latest released revision of uclibc (that way
+# the config files will typically be correct!)  uclibc-cvs takes precedence
+# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date
+# try removing it
+#
+# UCLIBC_BASE can be set in a distro file, but whether this works depends
+# on whether the base patches apply to the selected (SRCDATE) svn release.
+#
+UCLIBC_BASE ?= "0.9.29"
+PR = "r0"
+PV = "${UCLIBC_BASE}+svnr${SRCREV}"
+
+require uclibc.inc
+
+PROVIDES_append_bfin = " virtual/${TARGET_PREFIX}libc-for-gcc "
+
+#recent versions uclibc require real kernel headers
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_HOST = "bfin.*-uclinux"
+
+#as stated above, uclibc needs real kernel-headers
+#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
+KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
+
+SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=uClibc "
+SRC_URI += "file://uClibc.machine file://uClibc.distro"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+
+S = "${WORKDIR}/uClibc"
+
+LEAD_SONAME = "libc.so"
+
diff --git a/packages/uclibc/elf2flt_svn.bb b/packages/uclibc/elf2flt_svn.bb
new file mode 100644
index 0000000000..ef142baf06
--- /dev/null
+++ b/packages/uclibc/elf2flt_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Elf2flt is a wrapper around the linker for uclinux platforms"
+DEPENDS = "binutils-cross"
+
+PV = "0.0+svnr${SRCREV}"
+
+inherit autotools cross
+
+SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+EXTRA_OECONF = " --with-libbfd=${CROSS_DIR}/${TARGET_SYS}/lib/libbfd.a \
+                 --with-libiberty=${CROSS_DIR}/${TARGET_SYS}/lib/libiberty.a \
+                 --with-bfd-include-dir=${CROSS_DIR}/${TARGET_SYS}/include \
+               "