summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/insane-srcrevs.inc3
-rw-r--r--conf/distro/include/moko-autorev.inc3
-rw-r--r--conf/distro/include/sane-srcrevs.inc4
-rw-r--r--conf/distro/openmoko.conf4
-rw-r--r--packages/free42/.mtn2git_empty0
-rw-r--r--packages/free42/files/.mtn2git_empty0
-rw-r--r--packages/free42/files/free42-bcd-gtk-only.patch100
-rw-r--r--packages/free42/files/free42-dont-declare-sincos.patch11
-rw-r--r--packages/free42/files/free42-vga-skin.patch12
-rw-r--r--packages/free42/files/free42dec.desktop12
-rw-r--r--packages/free42/free42-vga_1.4.36.bb44
-rw-r--r--packages/gnome/gconf-dbus_svn.bb30
-rw-r--r--packages/gsm/files/fic-gta01/.mtn2git_empty0
-rw-r--r--packages/gsm/files/fic-gta01/gsmd51
-rw-r--r--packages/gsm/libgsmd_svn.bb2
-rw-r--r--packages/linux/linux-2.6.21/gumstix-verdex/defconfig15
-rw-r--r--packages/linux/linux-omap.inc4
-rw-r--r--packages/linux/linux_2.6.21.bb1
-rw-r--r--packages/tasks/task-openmoko-feed.bb3
19 files changed, 269 insertions, 30 deletions
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index 82540840b1..bbb62b9398 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -62,8 +62,11 @@ SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
SRCREV_pn-openmoko-today ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 5a1dc34784..3292631c43 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -36,8 +36,11 @@ SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
SRCREV_pn-openmoko-today ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d53217b82b..4180cd5a29 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -15,6 +15,7 @@ SRCREV_pn-ezxd ?= "2052"
SRCREV_pn-elf2flt="1786"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-fstests ?= "204"
+SRCREV_pn-gconf-dbus ?= "606"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-hildon-1 ?= "13708"
SRCREV_pn-libgsmd ?= "2806"
@@ -71,8 +72,11 @@ SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
SRCREV_pn-openmoko-taskmanager ?= "1663"
SRCREV_pn-openmoko-tasks ?= "320"
SRCREV_pn-openmoko-tasks2 ?= "320"
+SRCREV_pn-openmoko-terminal2 ?= "2964"
SRCREV_pn-openmoko-theme-standard ?= "2370"
SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
+SRCREV_pn-openmoko-theme-standard2 ?= "2964"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
SRCREV_pn-openmoko-today ?= "2556"
SRCREV_pn-openmoko-today2 ?= "2955"
SRCREV_pn-openmoko-today2-folders ?= "2680"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 26bcc2472c..8657b1140a 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -35,5 +35,7 @@ PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
require conf/distro/include/preferred-openmoko-versions.inc
-require conf/distro/include/moko-autorev.inc
+
+# Bleeding-edge developers should add the following line to their local.conf:
+# require conf/distro/include/moko-autorev.inc
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/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index 3647059de1..5a5e78a207 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -1,44 +1,40 @@
SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 dbus dbus-glib libxml2 popt intltool-native"
+DEPENDS = "intltool-native glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
DESCRIPTION = "Settings daemon using DBUS for communication."
LICENSE = "GPL"
PROVIDES = "gconf"
RPROVIDES_${PN} = "gconf"
RPROVIDES_${PN}-dev = "gconf-dev"
-PV = "2.16.0+svn${SRCDATE}"
-PR = "r0"
+PV = "2.16.0+svnr${SRCREV}"
+PR = "r3"
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
file://69gconfd-dbus"
-inherit pkgconfig autotools
+inherit pkgconfig autotools
S = "${WORKDIR}/trunk"
PARALLEL_MAKE = ""
-FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so \
- ${libdir}/GConf-dbus/2/*.so \
- ${libdir}/dbus-1.0 \
- ${sysconfdir} \
- ${datadir}/dbus*"
-FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug \
- ${libdir}/GConf-dbus/2/.debug ""
+FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
+FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+
+EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
do_configure_prepend() {
- touch ${S}/gtk-doc.make
+ touch gtk-doc.make
}
do_stage() {
- autotools_stage_all
+ autotools_stage_all
+ install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
}
do_install_append () {
install -d ${D}/${sysconfdir}/X11/Xsession.d
install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
- install -d ${D}/${datadir}/dbus-1.0/services/
- install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
+ install -d ${D}/${datadir}/dbus-1.0/services/
+ install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
}
-
diff --git a/packages/gsm/files/fic-gta01/.mtn2git_empty b/packages/gsm/files/fic-gta01/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gsm/files/fic-gta01/.mtn2git_empty
diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd
new file mode 100644
index 0000000000..3c3f63a4df
--- /dev/null
+++ b/packages/gsm/files/fic-gta01/gsmd
@@ -0,0 +1,51 @@
+##!/bin/sh
+#
+# gsmd This shell script starts and stops gsmd.
+#
+# chkconfig: 345 90 40
+# description: Gsmd manages access to a serial- or USB-connected GSM
+# processname: gsmd
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/gsmd ] && . /etc/default/gsmd
+
+case "$1" in
+ start)
+ stty -F "$GSM_DEV" -crtscts
+ [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
+ [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
+ [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
+ [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
+
+ echo -n "Starting GSM daemon: "
+ start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
+
+ if [ $? = 0 ]; then
+ echo "gsmd."
+ else
+ echo "(failed.)"
+ fi
+ ;;
+ stop)
+ [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
+
+ echo -n "Stopping GSM daemon: "
+ start-stop-daemon -K -x /usr/sbin/gsmd
+ stty -F "$GSM_DEV" -crtscts
+ echo "gsmd."
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ exit
+ ;;
+ *)
+ echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
+
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index b312015172..50debc0e11 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL LGPL"
SECTION = "libs/gsm"
PROVIDES += "gsmd"
PV = "0.1+svnr${SRCREV}"
-PR = "r25"
+PR = "r26"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd \
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 2bfbee8184..0848bcd71a 100644
--- a/packages/linux/linux_2.6.21.bb
+++ b/packages/linux/linux_2.6.21.bb
@@ -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 \
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 \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 21:40:27 +0000