From 689d761d7e8b1b13accf44b04f65f23bf05ced4a Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Mon, 1 Feb 2010 21:03:18 +0100
Subject: ecj: fix maxheap size jamvm is compiled with 512m only

---
 recipes/ecj/files/ecj.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'recipes')

diff --git a/recipes/ecj/files/ecj.in b/recipes/ecj/files/ecj.in
index 2cff2593d5..2099991cef 100755
--- a/recipes/ecj/files/ecj.in
+++ b/recipes/ecj/files/ecj.in
@@ -1 +1 @@
-${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}
+${RUNTIME} -Xmx512m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}
-- 
cgit v1.2.3


From a510e0fda22815d3e2478ba4cdcd1cb9aee1181d Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Mon, 1 Feb 2010 22:49:36 +0100
Subject: classpath-native: the exit_hook.patch don't work anymore disable
 wrapper-tools for now

---
 recipes/classpath/classpath-native.inc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'recipes')

diff --git a/recipes/classpath/classpath-native.inc b/recipes/classpath/classpath-native.inc
index 35a2485619..a2e19fdb14 100644
--- a/recipes/classpath/classpath-native.inc
+++ b/recipes/classpath/classpath-native.inc
@@ -35,7 +35,6 @@ EXTRA_OECONF = "\
   --enable-tools \
   --includedir=${STAGING_INCDIR}/classpath \
   --with-vm=java \
-  --enable-tool-wrappers \
   "
 
 do_stage() {
-- 
cgit v1.2.3


From 2c625e137f85e47c33e2f8d00933899fa15f8786 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 1 Feb 2010 13:38:45 -0800
Subject: uclibc-nptl: Update to latest top of upstream branch.

* Drop upstream merged patches.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...ch-On-ARM-and-MIPS-pass-DNOT_IN_libc-1-DI.patch | 40 ------------------
 ...__libc_resp-__libc_errno-and-__libc_h_err.patch | 49 ----------------------
 recipes/uclibc/uclibc_nptl.bb                      |  4 +-
 3 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 recipes/uclibc/uclibc-nptl/Makefile.arch-On-ARM-and-MIPS-pass-DNOT_IN_libc-1-DI.patch
 delete mode 100644 recipes/uclibc/uclibc-nptl/errno-hide-__libc_resp-__libc_errno-and-__libc_h_err.patch

(limited to 'recipes')

diff --git a/recipes/uclibc/uclibc-nptl/Makefile.arch-On-ARM-and-MIPS-pass-DNOT_IN_libc-1-DI.patch b/recipes/uclibc/uclibc-nptl/Makefile.arch-On-ARM-and-MIPS-pass-DNOT_IN_libc-1-DI.patch
deleted file mode 100644
index 383050e6e8..0000000000
--- a/recipes/uclibc/uclibc-nptl/Makefile.arch-On-ARM-and-MIPS-pass-DNOT_IN_libc-1-DI.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 46d7539bb38c9811a65c9953e81369c4d070ee8b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jan 2010 15:17:09 -0800
-Subject: [PATCH] Makefile.arch: On ARM and MIPS pass -DNOT_IN_libc=1 -DIS_IN_libpthread=1
-
-* This will prevent it using internal __libc* symbols in pthread which
-  should be hidden for libc only use.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- .../nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch |    1 +
- .../sysdeps/unix/sysv/linux/mips/Makefile.arch     |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-Index: git/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
-===================================================================
---- git.orig/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch	2010-01-26 20:38:45.000000000 -0800
-+++ git/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch	2010-01-26 21:13:54.215450487 -0800
-@@ -16,7 +16,9 @@ ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y)
- CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__
- endif
- CFLAGS-pthread_once.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
-+CFLAGS-pt-__syscall_rt_sigaction.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
- CFLAGS-lowlevellock.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
-+CFLAGS-pt-__syscall_error.c =  -DNOT_IN_libc=1 -DIS_IN_libpthread=1
- 
- ASFLAGS-pt-vfork.S = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 -marm
- # We always compile it in arm mode because of SAVE_PID macro
-Index: git/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch
-===================================================================
---- git.orig/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch	2010-01-26 20:38:45.000000000 -0800
-+++ git/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch	2010-01-26 20:41:19.455424645 -0800
-@@ -15,6 +15,7 @@ ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y)
- CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__
- endif
- CFLAGS-pthread_once.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
-+CFLAGS-pt-__syscall_rt_sigaction.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
- 
- ASFLAGS-pt-vfork.S = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
- 
diff --git a/recipes/uclibc/uclibc-nptl/errno-hide-__libc_resp-__libc_errno-and-__libc_h_err.patch b/recipes/uclibc/uclibc-nptl/errno-hide-__libc_resp-__libc_errno-and-__libc_h_err.patch
deleted file mode 100644
index 2c83b5720f..0000000000
--- a/recipes/uclibc/uclibc-nptl/errno-hide-__libc_resp-__libc_errno-and-__libc_h_err.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b1ab3c351b8715e1228ec4b9d602c04296d758ea Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jan 2010 15:11:05 -0800
-Subject: [PATCH] errno: hide __libc_resp, __libc_errno, and __libc_h_errno
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libc/inet/resolv.c          |    2 +-
- libc/misc/internals/errno.c |    5 ++---
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
-index 4087f8d..ee1323e 100644
---- a/libc/inet/resolv.c
-+++ b/libc/inet/resolv.c
-@@ -3018,7 +3018,7 @@ __thread struct __res_state *__resp = &_res;
-  *        relocations.
-  */
- extern __thread struct __res_state *__libc_resp
--       __attribute__ ((alias ("__resp")));
-+       __attribute__ ((alias ("__resp"))) attribute_hidden;
- # else
- #  undef __resp
- struct __res_state *__resp = &_res;
-diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c
-index e1b5d7e..11d19ee 100644
---- a/libc/misc/internals/errno.c
-+++ b/libc/misc/internals/errno.c
-@@ -4,15 +4,14 @@
- __thread int errno;
- __thread int h_errno;
- 
--extern __thread int __libc_errno __attribute__ ((alias ("errno")));
--extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno")));
-+extern __thread int __libc_errno __attribute__ ((alias ("errno"))) attribute_hidden;
-+extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))) attribute_hidden;
- #define h_errno __libc_h_errno
- 
- #else
- #include "internal_errno.h"
- int errno = 0;
- int h_errno = 0;
--
- #ifdef __UCLIBC_HAS_THREADS__
- libc_hidden_def(errno)
- weak_alias(errno, _errno)
--- 
-1.6.3.3
-
diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
index df0962aa62..c9d9e3b0a7 100644
--- a/recipes/uclibc/uclibc_nptl.bb
+++ b/recipes/uclibc/uclibc_nptl.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-SRCREV="b7b81eb5484d1a37d8672e7be2aa4462df5d0aaf"
+SRCREV="f50a678f473e44c405e51af988a57daf88ea2f27"
 PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
@@ -34,8 +34,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \
 	file://uclibc-arm-ftruncate64.patch;patch=1 \
 	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
 	file://uclibc_arm_remove_duplicate_sysdep_defs.patch;patch=1 \
-	file://errno-hide-__libc_resp-__libc_errno-and-__libc_h_err.patch;patch=1 \
-	file://Makefile.arch-On-ARM-and-MIPS-pass-DNOT_IN_libc-1-DI.patch;patch=1 \
 	"
 
 S = "${WORKDIR}/git"
-- 
cgit v1.2.3


From 700ab5ea01d7bc15d6704640a14006e5663dc3c0 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 1 Feb 2010 19:51:27 +0100
Subject: mplayer-common: fix FILES

* ${sysconfdir} starts with /, so now we had /usr//etc/mplayer in
  install call and FILES, but it doesn't work in FILES variable
* /usr${sysconfdir} works but it's ugly, feel free to revert to original
  version with /usr/etc/mplayer

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/mplayer/mplayer-common.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'recipes')

diff --git a/recipes/mplayer/mplayer-common.bb b/recipes/mplayer/mplayer-common.bb
index 99bc54de5d..d1ea923d47 100644
--- a/recipes/mplayer/mplayer-common.bb
+++ b/recipes/mplayer/mplayer-common.bb
@@ -10,11 +10,11 @@ SRC_URI = "file://mplayer.conf"
 
 # Yes, really /usr/etc!!!
 do_install() {
-	install -d "${D}/usr/${sysconfdir}/mplayer"
+	install -d "${D}/usr${sysconfdir}/mplayer"
 
-	install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr/${sysconfdir}/mplayer"
+	install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr${sysconfdir}/mplayer"
 }
 
-FILES_${PN} = "/usr/${sysconfdir}/mplayer"
+FILES_${PN} = "/usr${sysconfdir}/mplayer"
 PACKAGE_ARCH = "all"
 
-- 
cgit v1.2.3


From b7802933626b9bae65f06888ce1ba6f008f60d0c Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Tue, 2 Feb 2010 00:44:08 +0100
Subject: linux-leviathan: defconfig: enable devtmpfs

---
 recipes/linux/linux-leviathan/defconfig | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'recipes')

diff --git a/recipes/linux/linux-leviathan/defconfig b/recipes/linux/linux-leviathan/defconfig
index 94e453527e..18c69a21af 100644
--- a/recipes/linux/linux-leviathan/defconfig
+++ b/recipes/linux/linux-leviathan/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Sun Jan 31 22:07:17 2010
+# Mon Feb  1 21:37:48 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -107,7 +107,7 @@ CONFIG_HAVE_KRETPROBES=y
 #
 # GCOV-based kernel profiling
 #
-# CONFIG_SLOW_WORK is not set
+CONFIG_SLOW_WORK=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -556,7 +556,8 @@ CONFIG_RFKILL_INPUT=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH=""
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -997,14 +998,14 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+CONFIG_FONT_6x11=y
 # CONFIG_FONT_7x14 is not set
-CONFIG_FONT_PEARL_8x8=y
-CONFIG_FONT_ACORN_8x8=y
-CONFIG_FONT_MINI_4x6=y
-CONFIG_FONT_SUN8x16=y
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
 # CONFIG_LOGO is not set
-- 
cgit v1.2.3


From ad31cefddc85e805305af5763a07f3495cb38bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20R=C3=BCb?= <christian.rueb@gmx.net>
Date: Mon, 1 Feb 2010 17:33:39 +0000
Subject: stopwatch: Add version 1.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* use tarball not git for source
* preferred version is not git

Signed-off-by: Christian Rüb <christian.rueb@gmx.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/stopwatch/stopwatch_1.4.0.bb | 33 +++++++++++++++++++++++++++++++++
 recipes/stopwatch/stopwatch_git.bb   |  4 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 recipes/stopwatch/stopwatch_1.4.0.bb

(limited to 'recipes')

diff --git a/recipes/stopwatch/stopwatch_1.4.0.bb b/recipes/stopwatch/stopwatch_1.4.0.bb
new file mode 100644
index 0000000000..91a19486b6
--- /dev/null
+++ b/recipes/stopwatch/stopwatch_1.4.0.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Simple Qt based stop watch"
+AUTHOR = "Christof Musik"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+HOMEPAGE = "http://git.senfdax.de"
+LICENSE = "GPL QPL"
+PR = "r0"
+
+inherit qt4x11
+
+SRC_URI = "http://openmoko.senfdax.de/sources/${PN}-${PV}.tar.gz;name=archive"
+
+SRC_URI[archive.md5sum] = "6cc756ea7a8fb94352eb2842d170f16c"
+SRC_URI[archive.sha256sum] = "ef4fdbb3ab44e950a56c55e38dd5ffc449f736fb5d99d2befe5bbfc715bcb919"
+
+do_configure() {
+    ${OE_QMAKE_QMAKE}
+}
+
+do_compile() {
+    oe_runmake
+}
+
+do_install() {
+    install -d ${D}/${bindir}
+    install -m 0755 ${S}/stopwatch ${D}/${bindir}
+    install -d ${D}/${datadir}/applications
+    install ${S}/desktop/stopwatch.desktop ${D}/${datadir}/applications/
+    install -d ${D}/${datadir}/pixmaps
+    install ${S}/desktop/stopwatch.png ${D}/${datadir}/pixmaps/
+    install -d ${D}/${datadir}/${PN}
+    install ${S}/desktop/om.style ${D}/${datadir}/${PN}/
+}
diff --git a/recipes/stopwatch/stopwatch_git.bb b/recipes/stopwatch/stopwatch_git.bb
index f0d40da54b..0732f56ef0 100644
--- a/recipes/stopwatch/stopwatch_git.bb
+++ b/recipes/stopwatch/stopwatch_git.bb
@@ -4,13 +4,13 @@ SECTION = "x11/applications"
 PRIORITY = "optional"
 HOMEPAGE = "http://git.senfdax.de"
 LICENSE = "GPL QPL"
-DEPENDS = "qt4-x11-free"
+DEFAULT_PREFERRENCE = "-1"
 PV = "1.3.1+gitr${SRCREV}"
 PR = "r0"
 
 inherit qt4x11
 
-SRC_URI = "git://git.senfdax.de/git/stopwatch;protocol=http;tag=master;branch=master"
+SRC_URI = "git://git.senfdax.de/git/stopwatch;protocol=http"
 S = "${WORKDIR}/git/"
 
 do_configure() {
-- 
cgit v1.2.3


From e4cff7cf93d6a8e2902395233ccff287afedc5b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20R=C3=BCb?= <christian.rueb@gmx.net>
Date: Mon, 1 Feb 2010 17:51:08 +0000
Subject: qgpslog: New recipe for Qt based GPS track logger
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Qt4 based
* uses FSO dbus calls and signals

Signed-off-by: Christian Rüb <christian.rueb@gmx.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/qgpslog/qgpslog_0.2.0.bb | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 recipes/qgpslog/qgpslog_0.2.0.bb

(limited to 'recipes')

diff --git a/recipes/qgpslog/qgpslog_0.2.0.bb b/recipes/qgpslog/qgpslog_0.2.0.bb
new file mode 100644
index 0000000000..4635e51e73
--- /dev/null
+++ b/recipes/qgpslog/qgpslog_0.2.0.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "QGPSLog"
+AUTHOR = "Christian Rüb"
+HOMEPAGE = "http://git.senfdax.de/?p=qgpslog;a=summary"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+LICENSE = "GPL QPL PD"
+DEPENDS = "librsvg-native"
+PR = "r0"
+
+SRC_URI = "http://openmoko.senfdax.de/sources/${PN}-${PV}.tar.gz;name=archive"
+
+SRC_URI[archive.md5sum] = "26254f2dafc31260f65a8457ff7eada5"
+SRC_URI[archive.sha256sum] = "3f7ef5e1b59f3d75c064d184ff0f91b149c2abfb7e996f70c8f39da8d96383e9"
+
+
+inherit qt4x11
+
+do_configure() {
+    ${OE_QMAKE_QMAKE}
+}
+
+do_compile() {
+    oe_runmake
+    oe_runmake -C desktop
+}
+
+do_install() {
+    install -d ${D}/${datadir}/pixmaps
+    install ${S}/desktop/${PN}.png ${D}/${datadir}/pixmaps/
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/qgpslog ${D}${bindir}
+    install -d ${D}/${datadir}/${PN}
+    install ${S}/styles/shr.style ${D}/${datadir}/${PN}/
+    install -d ${D}/${datadir}/applications
+    install ${S}/desktop/${PN}.desktop ${D}/${datadir}/applications/
+}
-- 
cgit v1.2.3


From 4e53714f98af49d169a310de6fb007b5ed257137 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 2 Feb 2010 00:33:26 +0100
Subject: task-shr-feed: add qgpslog

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/tasks/task-shr-feed.bb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'recipes')

diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 2deb9775ee..64c802f23a 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -267,6 +267,7 @@ RDEPENDS_${PN} += "\
 		wpa-gui \
 		gabriel \
 		stopwatch \
+		qgpslog \
 		rtmom \
 		ventura \
 		emtooth \
-- 
cgit v1.2.3


From 3aea9738dd51d048344fe20c363cdf6bc21d233d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20R=C3=BCb?= <christian.rueb@gmx.net>
Date: Sun, 24 Jan 2010 21:16:26 +0000
Subject: litephone: add new recipe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Qt4 based phone application for FSO based phones

Signed-off-by: Christian Rüb <christian.rueb@gmx.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/litephone/files/litephone.desktop |  9 +++++++++
 recipes/litephone/litephone.inc           | 18 ++++++++++++++++++
 recipes/litephone/litephone_git.bb        | 26 ++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 recipes/litephone/files/litephone.desktop
 create mode 100644 recipes/litephone/litephone.inc
 create mode 100644 recipes/litephone/litephone_git.bb

(limited to 'recipes')

diff --git a/recipes/litephone/files/litephone.desktop b/recipes/litephone/files/litephone.desktop
new file mode 100644
index 0000000000..f58bc58da7
--- /dev/null
+++ b/recipes/litephone/files/litephone.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Litephone
+Comment=Ligthweight Qt telephony app
+Exec=litephone
+Icon=litephone-mobile
+Terminal=false
+Type=Application
+Categories=Applications;
+StartupNotify=true
diff --git a/recipes/litephone/litephone.inc b/recipes/litephone/litephone.inc
new file mode 100644
index 0000000000..e2ca8ca62c
--- /dev/null
+++ b/recipes/litephone/litephone.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "Ligthweight Qt telephony app"
+AUTHOR = "Michal Brzozowski"
+HOMEPAGE = "http://www.litephone.org"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+RRECOMMENDS = "fsodeviced fsogsmd fsousaged frameworkd"
+INC_PR = "r0"
+
+inherit qt4x11
+
+do_configure() {
+    ${OE_QMAKE_QMAKE} QMAKE_LRELEASE=lrelease4
+}
+
+do_compile() {
+    oe_runmake
+}
diff --git a/recipes/litephone/litephone_git.bb b/recipes/litephone/litephone_git.bb
new file mode 100644
index 0000000000..e209a1c0ca
--- /dev/null
+++ b/recipes/litephone/litephone_git.bb
@@ -0,0 +1,26 @@
+require litephone.inc
+
+SRCREV = "4c9f16d9acc6cd18fc3f647b7e4f44a2d3bdd7b6"
+PV = "0.1+gitr${SRCREV}"
+PR = "${INC_PR}.0"
+
+SRC_URI = "git://git.senfdax.de/git/litephone;protocol=http \
+           file://files/litephone.desktop"
+
+S = "${WORKDIR}/git/"
+
+do_install() {
+    install -d ${D}/${datadir}/pixmaps
+    install -m 644 ${S}/pics/blue/Mobile.png ${D}/${datadir}/pixmaps/litephone-mobile.png
+    install -d ${D}/${bindir}
+    install -m 0755 ${S}/litephone ${D}/${bindir}
+    install -d ${D}/etc/litephone
+    install ${S}/style_sheet.conf ${D}/etc/litephone/
+    install -d ${D}/${datadir}/litephone/translations
+    install ${S}/translations/*.qm ${D}/${datadir}/litephone/translations/
+    install -d ${D}/${datadir}/applications
+    install ${WORKDIR}/files/litephone.desktop ${D}/${datadir}/applications/
+}
+
+FILES_${PN}-locale-pl-pl += "/usr/share/litephone/translations/litephone_pl.qm"
+PACKAGES =+ "${PN}-locale-pl-pl"
-- 
cgit v1.2.3


From f1e2a7884357cdc164f27f7414a6bc088e06e2d2 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 2 Feb 2010 00:53:36 +0100
Subject: task-shr-feed: add litephone

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/tasks/task-shr-feed.bb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'recipes')

diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 64c802f23a..da992888d1 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -268,6 +268,7 @@ RDEPENDS_${PN} += "\
 		gabriel \
 		stopwatch \
 		qgpslog \
+		litephone \
 		rtmom \
 		ventura \
 		emtooth \
-- 
cgit v1.2.3


From fb7f42bf127885c12668f53de30fbbfd661c1117 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 1 Feb 2010 18:53:29 -0800
Subject: uclibc_git: Bump SRCREV to latest upstream.

* Delete patches that are merged upstream.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../uclibc/uclibc-git/hide-__libc-symbols.patch    | 35 ----------------------
 recipes/uclibc/uclibc_git.bb                       |  3 +-
 2 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 recipes/uclibc/uclibc-git/hide-__libc-symbols.patch

(limited to 'recipes')

diff --git a/recipes/uclibc/uclibc-git/hide-__libc-symbols.patch b/recipes/uclibc/uclibc-git/hide-__libc-symbols.patch
deleted file mode 100644
index 1d79e54d9d..0000000000
--- a/recipes/uclibc/uclibc-git/hide-__libc-symbols.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: git/libc/inet/resolv.c
-===================================================================
---- git.orig/libc/inet/resolv.c	2010-01-25 13:35:30.395472730 -0800
-+++ git/libc/inet/resolv.c	2010-01-25 13:40:18.727455693 -0800
-@@ -3016,7 +3016,7 @@ __thread struct __res_state *__resp = &_
-  *        relocations.
-  */
- extern __thread struct __res_state *__libc_resp
--       __attribute__ ((alias ("__resp")));
-+       __attribute__ ((alias ("__resp"))) attribute_hidden;
- # else
- #  undef __resp
- struct __res_state *__resp = &_res;
-Index: git/libc/misc/internals/errno.c
-===================================================================
---- git.orig/libc/misc/internals/errno.c	2010-01-25 13:35:30.411454765 -0800
-+++ git/libc/misc/internals/errno.c	2010-01-25 13:40:18.727455693 -0800
-@@ -4,15 +4,14 @@
- __thread int errno;
- __thread int h_errno;
- 
--extern __thread int __libc_errno __attribute__ ((alias ("errno")));
--extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno")));
-+extern __thread int __libc_errno __attribute__ ((alias ("errno"))) attribute_hidden;
-+extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))) attribute_hidden;
- #define h_errno __libc_h_errno
- 
- #else
- #include "internal_errno.h"
- int errno = 0;
- int h_errno = 0;
--
- #ifdef __UCLIBC_HAS_THREADS__
- libc_hidden_def(errno)
- weak_alias(errno, _errno)
diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb
index f251b32362..5f44466d47 100644
--- a/recipes/uclibc/uclibc_git.bb
+++ b/recipes/uclibc/uclibc_git.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-SRCREV="37e26d6e19558d9f149722e513cb29c4374b8d8d"
+SRCREV="22de495da40d7649eb28fdfc70ce1d5f3b6572ea"
 PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
@@ -33,6 +33,5 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
 	file://uclibc-arm-ftruncate64.patch;patch=1 \
 	file://uclibc_enable_log2_test.patch;patch=1 \
 	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
-	file://hide-__libc-symbols.patch;patch=1 \
 	"
 S = "${WORKDIR}/git"
-- 
cgit v1.2.3


From 01d1a1ffd67f176630ed1d8d8ae21417a1cf2b09 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 1 Feb 2010 18:54:21 +0100
Subject: freesmartphone: bump SRCREVs to HEAD, drop configs and use configs
 provided with source

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Michael 'Mickey' Lauer <mickey@vanille-media.de>
---
 recipes/freesmartphone/cornucopia.inc              |  2 +-
 recipes/freesmartphone/fsodatad/fsodatad.conf      | 19 -----
 recipes/freesmartphone/fsodatad_git.bb             | 10 ---
 recipes/freesmartphone/fsodeviced/fsodeviced.conf  | 83 --------------------
 .../fsodeviced/om-gta02/fsodeviced.conf            | 88 ----------------------
 recipes/freesmartphone/fsodeviced_git.bb           | 14 +---
 recipes/freesmartphone/fsogsmd/fsogsmd.conf        | 57 --------------
 recipes/freesmartphone/fsogsmd_git.bb              | 10 ---
 .../freesmartphone/fsonetworkd/fsonetworkd.conf    | 19 -----
 recipes/freesmartphone/fsonetworkd_git.bb          | 10 ---
 recipes/freesmartphone/fsotdld/fsotdld.conf        | 43 -----------
 recipes/freesmartphone/fsotdld_git.bb              | 10 ---
 recipes/freesmartphone/fsousaged/fsousaged.conf    | 32 --------
 .../fsousaged/om-gta02/fsousaged.conf              | 32 --------
 recipes/freesmartphone/fsousaged_git.bb            | 10 ---
 15 files changed, 2 insertions(+), 437 deletions(-)
 delete mode 100644 recipes/freesmartphone/fsodatad/fsodatad.conf
 delete mode 100644 recipes/freesmartphone/fsodeviced/fsodeviced.conf
 delete mode 100644 recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf
 delete mode 100644 recipes/freesmartphone/fsogsmd/fsogsmd.conf
 delete mode 100644 recipes/freesmartphone/fsonetworkd/fsonetworkd.conf
 delete mode 100644 recipes/freesmartphone/fsotdld/fsotdld.conf
 delete mode 100644 recipes/freesmartphone/fsousaged/fsousaged.conf
 delete mode 100644 recipes/freesmartphone/fsousaged/om-gta02/fsousaged.conf

(limited to 'recipes')

diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc
index bfc461edbc..4962263a10 100644
--- a/recipes/freesmartphone/cornucopia.inc
+++ b/recipes/freesmartphone/cornucopia.inc
@@ -5,7 +5,7 @@ SECTION = "devel"
 DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee"
 DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}"
 PV = "invalid, please override"
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master"
 S = "${WORKDIR}/git/${PN}"
diff --git a/recipes/freesmartphone/fsodatad/fsodatad.conf b/recipes/freesmartphone/fsodatad/fsodatad.conf
deleted file mode 100644
index 85919cf6aa..0000000000
--- a/recipes/freesmartphone/fsodatad/fsodatad.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#######################################################################################
-# FSO Data Daemon Configuration File -- for SYSTEM INTEGRATORS only
-########################################################################################
-[logging]
-# Log level: DEBUG, INFO (default), WARNING, ERROR
-# Override via environment as FSO_LOG_LEVEL
-log_level = INFO
-# Where to log to: none (default), stderr, stderr:colors, file, syslog
-# Override via environment as FSO_LOG_TO
-log_to = file
-# Log Destination (valid only for log_to = file)
-# Override via environment as FSO_LOG_DESTINATION
-log_destination = /var/log/fsodatad.log
-
-[fsodata]
-# No settings yet
-
-[fsodata.world]
-# No settings yet
diff --git a/recipes/freesmartphone/fsodatad_git.bb b/recipes/freesmartphone/fsodatad_git.bb
index 95f50ee5da..f591066b92 100644
--- a/recipes/freesmartphone/fsodatad_git.bb
+++ b/recipes/freesmartphone/fsodatad_git.bb
@@ -4,13 +4,3 @@ PR = "${INC_PR}.2"
 PV = "0.0.0+gitr${SRCREV}"
 
 DEPENDS += "libxml2 mobile-broadband-provider-info"
-
-SRC_URI += "file://fsodatad.conf"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/freesmartphone/
-	install -m 0644 ${WORKDIR}/fsodatad.conf ${D}${sysconfdir}/freesmartphone/
-}
-
-FILES_${PN} += "${sysconfdir}/freesmartphone/fsodatad.conf"
-CONFFILES_${PN} += "${sysconfdir}/freesmartphone/fsodatad.conf"
diff --git a/recipes/freesmartphone/fsodeviced/fsodeviced.conf b/recipes/freesmartphone/fsodeviced/fsodeviced.conf
deleted file mode 100644
index de04ecee80..0000000000
--- a/recipes/freesmartphone/fsodeviced/fsodeviced.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-#######################################################################################
-# FSO Device Daemon Configuration File -- for SYSTEM INTEGRATORS only
-########################################################################################
-[logging]
-# Log level: DEBUG, INFO (default), WARNING, ERROR
-# Override via environment as FSO_LOG_LEVEL
-log_level = DEBUG
-# Where to log to: none (default), stderr, stderr:colors, file, syslog
-# Override via environment as FSO_LOG_TO
-log_to = stderr:colors
-# Log Destination (valid only for log_to = file)
-# Override via environment as FSO_LOG_DESTINATION
-log_destination = /var/log/fsodeviced.log
-
-[fsodevice]
-# No settings yet
-
-[fsodevice.accelerometer]
-# Which accelerometer variant plugin to use: none (default), lis302
-device_type = lis302
-
-[fsodevice.accelerometer_lis302]
-# Which input node to read from
-inputnode = /input/event2
-# How many samples to process, when in use
-sample_rate = 100
-# Threshhold to program, when in use
-threshold = 100
-# Scale to program, when in use
-full_scale = 2.3
-
-[fsodevice.player_alsa]
-# No settings yet
-
-[fsodevice.player_canberra]
-# No settings yet
-
-[fsodevice.player_gstreamer]
-# No settings yet
-
-[fsodevice.alsa_audio]
-# Which Audio Player variant plugin to use: none (default), alsa, canberra, gstreamer
-player_type = alsa
-
-[fsodevice.kernel26_display]
-# No settings yet
-
-[fsodevice.kernel26_leds]
-# No settings yet
-
-[fsodevice.kernel26_powersupply]
-# No settings yet
-
-[fsodevice.kernel26_rfkill]
-# No settings yet
-
-[fsodevice.kernel26_rtc]
-# No settings yet
-
-[fsodevice.kernel_info]
-# No settings yet
-
-[fsodevice.kernel_input]
-# Which input objects to ignore (by product id substring)
-#ignore_by_id = Microsoft;Macintosh
-# Which input objects to ignore (by physical path substring)
-#ignore_by_path = usb
-# Which buttons/switches to report.
-# Format: <name>,<type>,<keycode>,<report hold events as well>
-#report1 = AUX,key,169,1
-#report4 = HEADSET,switch,2,0
-
-[fsodevice.kernel_idle]
-# Which input objects to ignore (by product id substring)
-#ignore_by_id = Microsoft;Macintosh
-# Which input objects to ignore (by physical path substring)
-#ignore_by_path = usb
-
-# Enable this on openmoko devices
-#[fsodevice.openmoko_powercontrol]
-
-# Enable this on thinkpad devices
-#[fsodevice.thinkpad_powercontrol]
diff --git a/recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf b/recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf
deleted file mode 100644
index 79ba87338b..0000000000
--- a/recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf
+++ /dev/null
@@ -1,88 +0,0 @@
-#######################################################################################
-# FSO Device Daemon Configuration File -- for SYSTEM INTEGRATORS only
-########################################################################################
-[logging]
-# Log level: DEBUG, INFO (default), WARNING, ERROR
-# Override via environment as FSO_LOG_LEVEL
-log_level = INFO
-# Where to log to: none (default), stderr, stderr:colors, file, syslog
-# Override via environment as FSO_LOG_TO
-log_to = file
-# Log Destination (valid only for log_to = file)
-# Override via environment as FSO_LOG_DESTINATION
-log_destination = /var/log/fsodeviced.log
-
-[fsodevice]
-# No settings yet
-
-[fsodevice.accelerometer_lis302]
-# Which input node to read from
-inputnode = /input/event2
-# How many samples to process, when in use
-sample_rate = 100
-# Threshhold to program, when in use
-threshold = 100
-# Scale to program, when in use
-full_scale = 2.3
-
-[fsodevice.accelerometer]
-# Which accelerometer variant plugin to use: none (default), lis302
-device_type = lis302
-
-[fsodevice.player_alsa]
-# No settings yet
-
-[fsodevice.player_canberra]
-# No settings yet
-
-[fsodevice.player_gstreamer]
-# No settings yet
-
-[fsodevice.alsa_audio]
-# Which Audio Player variant plugin to use: none (default), alsa, canberra, gstreamer
-player_type = alsa
-
-[fsodevice.kernel26_display]
-# No settings yet
-
-[fsodevice.kernel26_leds]
-# No settings yet
-
-[fsodevice.kernel26_powersupply]
-# No settings yet
-
-#[fsodevice.kernel26_rfkill]
-# No settings yet
-
-[fsodevice.kernel26_rtc]
-# No settings yet
-
-[fsodevice.kernel_info]
-# No settings yet
-
-[fsodevice.kernel_input]
-# Which input objects to ignore (by product id substring)
-ignore_by_id = lis302
-# Which input objects to ignore (by physical path substring)
-#ignore_by_path = usb
-# Which buttons/switches to report.
-# Format: <name>,<type>,<keycode>,<report hold events as well>
-report4 = HEADSET,switch,2,0
-report1 = AUX,key,169,1
-report3 = USB,key,356,0
-report2 = POWER,key,116,1
-
-[fsodevice.kernel_idle]
-# Which input objects to ignore (by product id substring)
-ignore_by_id = lis302
-# Which input objects to ignore (by physical path substring)
-#ignore_by_path = usb
-idle = 5
-idle_dim = 15
-idle_prelock = 9
-idle_lock = 1
-suspend = 30
-
-# Enable this on openmoko devices
-[fsodevice.openmoko_powercontrol]
-
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index ed9308e918..39433eec1e 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -18,21 +18,9 @@ inherit update-rc.d
 INITSCRIPT_NAME = "fsodeviced"
 INITSCRIPT_PARAMS = "defaults 27"
 
-SRC_URI += "file://fsodeviced file://fsodeviced.conf"
+SRC_URI += "file://fsodeviced"
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${WORKDIR}/fsodeviced ${D}${sysconfdir}/init.d/
-	install -d ${D}${sysconfdir}/freesmartphone/
-	install -m 0644 ${WORKDIR}/fsodeviced.conf ${D}${sysconfdir}/freesmartphone/
 }
-
-FILES_${PN} += "\
-  ${sysconfdir}/init.d/fsodeviced \
-  ${sysconfdir}/freesmartphone \
-"
-
-CONFFILES_${PN} += "\
-  ${sysconfdir}/freesmartphone/fsodeviced.conf \
-"
-
diff --git a/recipes/freesmartphone/fsogsmd/fsogsmd.conf b/recipes/freesmartphone/fsogsmd/fsogsmd.conf
deleted file mode 100644
index 0da34cff4d..0000000000
--- a/recipes/freesmartphone/fsogsmd/fsogsmd.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-#######################################################################################
-# FSO GSM Daemon Configuration File -- for SYSTEM INTEGRATORS only
-########################################################################################
-[logging]
-# Log level: DEBUG, INFO (default), WARNING, ERROR
-# Override via environment as FSO_LOG_LEVEL
-log_level = INFO
-# Where to log to: none (default), stderr, stderr:colors, file, syslog
-# Override via environment as FSO_LOG_TO
-log_to = file
-# Log Destination (valid only for log_to = file)
-# Override via environment as FSO_LOG_DESTINATION
-log_destination = /var/log/fsogsmd.log
-
-[fsogsm]
-# Combined modem access string, prefered over individual configs below
-modem_access = serial:/dev/ttyUSB0:115200
-
-# Which modem to use: singleline, ti_calypso, freescale_neptune, cinterion_mc75, qualcomm_msm
-modem_type = singleline
-# Which transport channel: serial, pty
-modem_transport = serial
-# Which port to communicate with: <serial port> or <filename>
-modem_port = /dev/ttyUSB0
-# Which speed to use for the transport/port
-modem_speed = 115200
-
-# Global modem init sequence; this is the first sequence that gets sent to the modem after power cycling
-modem_init = E0V1;+CMEE=1;+CRC=1;+CSCS="UCS2"
-
-# Following configuration options are in the form channel_<state>_<name>, with state being one of
-# "init", "unlocked", "registered", "suspend", "resume", and name being the channel name (modem specific)
-# Whether these strings override, append, or are honored at all depends on the actual modem plugin
-# Example usage for one channel named 'main':
-channel_init_main = +CSNS=0;+CMGF=0;+CLIP=1
-channel_unlocked_main = +SIM_NOW_UNLOCKED;+CSDH=1;+COLP=1;+CCWA=1;+CNMI=2,1,2,2,1
-channel_registered_main = +NET_NOW_REGISTERED
-channel_suspend_main = +PREPARE_FOR_SUSPEND
-channel_resume_main = +RECOVER_AFTER_RESUME
-
-# Where to store SMS: <path> (default=/tmp/fsogsmd/sms/)
-sms_storage_dir = /tmp/fsogsmd/sms/
-
-[fsogsm.modem_singleline]
-# No settings yet
-
-[fsogsm.modem_cinterion_mc75]
-# No settings yet
-
-[fsogsm.modem_ti_calypso]
-# No settings yet
-
-[fsogsm.modem_qualcomm_msm]
-# No settings yet
-
-[fsogsm.dbus_service]
-# No settings yet
diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb
index f6adeeb2c3..8056f4bca8 100644
--- a/recipes/freesmartphone/fsogsmd_git.bb
+++ b/recipes/freesmartphone/fsogsmd_git.bb
@@ -5,17 +5,7 @@ PV = "0.2.0+gitr${SRCREV}"
 
 DEPENDS += "libfsoresource libgsm0710mux"
 
-SRC_URI += "file://fsogsmd.conf"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/freesmartphone/
-	install -m 0644 ${WORKDIR}/fsogsmd.conf ${D}${sysconfdir}/freesmartphone/
-}
-
 do_install_append_shr() {
 	# remove .service file to disable fsogsmd autostart
 	rm -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.ogsmd.service
 }
-
-FILES_${PN} += "${sysconfdir}/freesmartphone/fsogsmd.conf"
-CONFFILES_${PN} += "${sysconfdir}/freesmartphone/fsogsmd.conf"
diff --git a/recipes/freesmartphone/fsonetworkd/fsonetworkd.conf b/recipes/freesmartphone/fsonetworkd/fsonetworkd.conf
deleted file mode 100644
index d8e5cee971..0000000000
--- a/recipes/freesmartphone/fsonetworkd/fsonetworkd.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#######################################################################################
-# FSO Network Daemon Configuration File -- for SYSTEM INTEGRATORS only
-########################################################################################
-[logging]
-# Log level: DEBUG, INFO (default), WARNING, ERROR
-# Override via environment as FSO_LOG_LEVEL
-log_level = INFO
-# Where to log to: none (default), stderr, stderr:colors, file, syslog
-# Override via environment as FSO_LOG_TO
-log_to = file
-# Log Destination (valid only for log_to = file)
-# Override via environment as FSO_LOG_DESTINATION
-log_destination = /var/log/fsonetworkd.log
-
-[fsonetwork]
-# No settings yet
-
-[fsonetwork.sharing]
-# No settings yet
diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb
index c0b8696bdf..551245aef9 100644
--- a/recipes/freesmartphone/fsonetworkd_git.bb
+++ b/recipes/freesmartphone/fsonetworkd_git.bb
@@ -2,13 +2,3 @@ require cornucopia.inc
 inherit fso-plugin
 PV = "0.1.0.0+gitr${SRCREV}"
 PR = "${INC_PR}.2"
-
-SRC_URI += "file://fsonetworkd.conf"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/freesmartphone/
-	install -m 0644 ${WORKDIR}/fsonetworkd.conf ${D}${sysconfdir}/freesmartphone/
-}
-
-FILES_${PN} += "${sysconfdir}/freesmartphone/fsonetworkd.conf"
-CONFFILES_${PN} += "${sysconfdir}/freesmartphone/fsonetworkd.conf"
diff --git a/recipes/freesmartphone/fsotdld/fsotdld.conf b/recipes/freesmartphone/fsotdld/fsotdld.conf
deleted file mode 100644
index 07e91b0ff8..0000000000
--- a/recipes/freesmartphone/fsotdld/fsotdld.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#######################################################################################
-# FSO Time Date Location Daemon Configuration File -- for SYSTEM INTEGRATORS only
-########################################################################################
-[logging]
-# Log level: DEBUG, INFO (default), WARNING, ERROR
-# Override via environment as FSO_LOG_LEVEL
-log_level = INFO
-# Where to log to: none (default), stderr, stderr:colors, file, syslog
-# Override via environment as FSO_LOG_TO
-log_to = file
-# Log Destination (valid only for log_to = file)
-# Override via environment as FSO_LOG_DESTINATION
-log_destination = /var/log/fsotdld.log
-
-[fsotdl]
-gps_receiver_transport = serial
-gps_receiver_port = /dev/rfcomm0
-gps_receiver_speed = 9600
-
-[fsotdl.alarm]
-# No settings yet
-
-[fsotdl.source_ntp]
-# Which server to use; default is 'pool.ntp.org'
-server = time.windows.com
-
-[fsotdl.source_gsm]
-# No settings yet
-
-[fsotdl.provider_gps_nmea]
-# No settings yet
-
-[fsotdl.provider_gps]
-provider_type = nmea
-
-[fsotdl.sync_time]
-# Which sources to use; what is available depends on the loaded modules
-sources = ntp;gsm
-# Which current timezone file to use; default is /etc/timezone
-timezone_file = /etc/timezone
-# Path to zoneinfo files, default is /usr/share/zoneinfo
-zoneinfo_dir = /usr/share/zoneinfo
-
diff --git a/recipes/freesmartphone/fsotdld_git.bb b/recipes/freesmartphone/fsotdld_git.bb
index e6b64c312e..6ad8d47af9 100644
--- a/recipes/freesmartphone/fsotdld_git.bb
+++ b/recipes/freesmartphone/fsotdld_git.bb
@@ -4,13 +4,3 @@ PR = "${INC_PR}.2"
 PV = "0.0.0+gitr${SRCREV}"
 
 DEPENDS += "libfsotransport libfsoresource"
-
-SRC_URI += "file://fsotdld.conf"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/freesmartphone/
-	install -m 0644 ${WORKDIR}/fsotdld.conf ${D}${sysconfdir}/freesmartphone/
-}
-
-FILES_${PN} += "${sysconfdir}/freesmartphone/fsotdld.conf"
-CONFFILES_${PN} += "${sysconfdir}/freesmartphone/fsotdld.conf"
diff --git a/recipes/freesmartphone/fsousaged/fsousaged.conf b/recipes/freesmartphone/fsousaged/fsousaged.conf
deleted file mode 100644
index 542bc7562f..0000000000
--- a/recipes/freesmartphone/fsousaged/fsousaged.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-#######################################################################################
-# FSO Usage Daemon Configuration File -- for SYSTEM INTEGRATORS only
-########################################################################################
-[logging]
-# Log level: DEBUG, INFO (default), WARNING, ERROR
-# Override via environment as FSO_LOG_LEVEL
-log_level = INFO
-# Where to log to: none (default), stderr, stderr:colors, file, syslog
-# Override via environment as FSO_LOG_TO
-log_to = file
-# Log Destination (valid only for log_to = file)
-# Override via environment as FSO_LOG_DESTINATION
-log_destination = /var/log/fsousaged.log
-
-[fsousage]
-# Which low level suspend/resume variant to use: none (default), kernel26, openmoko
-lowlevel_type = kernel26
-# FOR DEBUGGING ONLY: Do not suspend, but instead sleep a couple of seconds
-debug_do_not_suspend = 0
-# FOR DEBUGGING ONLY: Enable every registered resource on startup
-debug_enable_on_startup = 0
-# FOR DEBUGGING ONLY: Whether resource activation should be synchronized with the registration lifecycle: always (default), startup, shutdown, never
-sync_resources_with_lifecycle = always
-
-[fsousage.lowlevel_kernel26]
-# No settings yet
-
-[fsousage.lowlevel_openmoko]
-# No settings yet
-
-[fsousage.dbus_service]
-# No settings yet
diff --git a/recipes/freesmartphone/fsousaged/om-gta02/fsousaged.conf b/recipes/freesmartphone/fsousaged/om-gta02/fsousaged.conf
deleted file mode 100644
index 1e5761330e..0000000000
--- a/recipes/freesmartphone/fsousaged/om-gta02/fsousaged.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-#######################################################################################
-# FSO Usage Daemon Configuration File -- for SYSTEM INTEGRATORS only
-########################################################################################
-[logging]
-# Log level: DEBUG, INFO (default), WARNING, ERROR
-# Override via environment as FSO_LOG_LEVEL
-log_level = INFO
-# Where to log to: none (default), stderr, stderr:colors, file, syslog
-# Override via environment as FSO_LOG_TO
-log_to = file
-# Log Destination (valid only for log_to = file)
-# Override via environment as FSO_LOG_DESTINATION
-log_destination = /var/log/fsousaged.log
-
-[fsousage]
-# Which low level suspend/resume variant to use: none (default), kernel26, openmoko
-lowlevel_type = openmoko
-# FOR DEBUGGING ONLY: Do not suspend, but instead sleep a couple of seconds
-debug_do_not_suspend = 0
-# FOR DEBUGGING ONLY: Enable every registered resource on startup
-debug_enable_on_startup = 0
-# FOR DEBUGGING ONLY: Whether resource activation should be synchronized with the registration lifecycle: always (default), startup, shutdown, never
-sync_resources_with_lifecycle = always
-
-[fsousage.lowlevel_kernel26]
-# No settings yet
-
-[fsousage.lowlevel_openmoko]
-# No settings yet
-
-[fsousage.dbus_service]
-# No settings yet
diff --git a/recipes/freesmartphone/fsousaged_git.bb b/recipes/freesmartphone/fsousaged_git.bb
index 649b9e44a8..2bbbae87b6 100644
--- a/recipes/freesmartphone/fsousaged_git.bb
+++ b/recipes/freesmartphone/fsousaged_git.bb
@@ -2,13 +2,3 @@ require cornucopia.inc
 inherit fso-plugin
 PV = "0.9.0.1+gitr${SRCREV}"
 PR = "${INC_PR}.2"
-
-SRC_URI += "file://fsousaged.conf"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/freesmartphone/
-	install -m 0644 ${WORKDIR}/fsousaged.conf ${D}${sysconfdir}/freesmartphone/
-}
-
-FILES_${PN} += "${sysconfdir}/freesmartphone/fsousaged.conf"
-CONFFILES_${PN} += "${sysconfdir}/freesmartphone/fsousaged.conf"
-- 
cgit v1.2.3


From 6678c25d1c94a31825d93b29697b2904c73ae72d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 Feb 2010 15:55:49 +0100
Subject: xserver-common: fix angstrom RDEPENDS for 1.25 and fix ts for
 angstrom in 1.32

---
 recipes/xserver-common/xserver-common_1.25.bb | 4 ++--
 recipes/xserver-common/xserver-common_1.32.bb | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'recipes')

diff --git a/recipes/xserver-common/xserver-common_1.25.bb b/recipes/xserver-common/xserver-common_1.25.bb
index 40ec4affa0..e56d84a4be 100644
--- a/recipes/xserver-common/xserver-common_1.25.bb
+++ b/recipes/xserver-common/xserver-common_1.25.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r4"
+PR = "r5"
 
 PACKAGE_ARCH = "all"
 
@@ -17,7 +17,7 @@ SRC_URI_append = " file://setDPI.sh \
 "
 
 SRC_URI_append_angstrom = " file://xtscal-fix.patch;patch=1 "
-RDEPENDS_append_angstrom = " tslib-calibrate "
+RDEPENDS_${PN}_append_angstrom = " tslib-calibrate "
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/recipes/xserver-common/xserver-common_1.32.bb b/recipes/xserver-common/xserver-common_1.32.bb
index 63368649c1..2ed416c830 100644
--- a/recipes/xserver-common/xserver-common_1.32.bb
+++ b/recipes/xserver-common/xserver-common_1.32.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r0"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 DEFAULT_PREFERENCE = "-1"
@@ -13,6 +13,9 @@ inherit gpe
 SRC_URI_append = " file://setDPI.sh \
                    file://89xdgautostart.sh"
 
+SRC_URI_append_angstrom = " file://xtscal-fix.patch;patch=1 "
+RDEPENDS_${PN}_append_angstrom = " tslib-calibrate "
+
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
 	install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart"
-- 
cgit v1.2.3


From 16f19a54654a75a373658969ec1bc54abb8df28e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 Feb 2010 17:19:09 +0100
Subject: python-pygtk: add 2.16.0

* checksum was already in
---
 recipes/python/python-pygtk_2.16.0.bb | 58 +++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 recipes/python/python-pygtk_2.16.0.bb

(limited to 'recipes')

diff --git a/recipes/python/python-pygtk_2.16.0.bb b/recipes/python/python-pygtk_2.16.0.bb
new file mode 100644
index 0000000000..e2b0602b47
--- /dev/null
+++ b/recipes/python/python-pygtk_2.16.0.bb
@@ -0,0 +1,58 @@
+DESCRIPTION = "Python GTK+ 2.10.x Bindings"
+SECTION = "devel/python"
+# needs gtk+ 2.10.x
+DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
+RDEPENDS = "python-shell python-pycairo python-pygobject"
+PROVIDES = "python-pygtk2"
+SRCNAME = "pygtk"
+LICENSE = "LGPL"
+PR = "r1"
+
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2;name=pygtk \
+           file://fix-gtkunixprint.patch;patch=1 \
+           file://acinclude.m4"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+EXTRA_OECONF = "\
+  --disable-docs \
+  --with-python-includes=${STAGING_INCDIR}/../ \
+"
+
+inherit autotools pkgconfig distutils-base
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+	sed -i \
+		-e s:'`$PKG_CONFIG --variable defsdir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/defs\":g \
+		-e s:'`$PKG_CONFIG --variable=pygtkincludedir pygobject-2.0`':\"${STAGING_INCDIR}/pygtk-2.0\":g \
+		-e s:'`$PKG_CONFIG --variable=datadir pygobject-2.0`':\"${STAGING_DATADIR}\":g \
+		-e s:'`$PKG_CONFIG --variable codegendir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \
+		-e s:'`$PKG_CONFIG --variable=fixxref pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/xsl/fixxref.py\":g \
+		${S}/configure.ac
+	sed -i 's:tests docs:tests:' Makefile.am
+}
+
+# dirty fix #1: remove dependency on python-pygobject-dev
+do_install_append() {
+	find ${D} -name "*.la"|xargs rm -f
+	rm -f ${D}/${bindir}/pygtk-codegen-2.0
+	rm -rf ${D}/${libdir}/pkgconfig
+}
+
+# dirty fix #2: fix build system paths leaking in
+require fix-path.inc
+
+PACKAGES =+ "${PN}-demo"
+FILES_${PN}-demo = "\
+  ${bindir}/pygtk-demo \
+  ${libdir}/pygtk \
+"
+RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang"
+
+# todo: revamp packaging, package demo seperatly
+FILES_${PN}-dev += "\
+  ${libdir}/pygtk/2.0 \
+  ${bindir}/pygtk-* \
+  ${datadir}/pygtk/2.0"
+
-- 
cgit v1.2.3


From 69b5564a454dfb04c5152721123999c4fff7dd31 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 Feb 2010 17:41:06 +0100
Subject: totem 2.28.5: enable python support for e.g. youtube plugin

---
 recipes/totem/totem_2.28.5.bb | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'recipes')

diff --git a/recipes/totem/totem_2.28.5.bb b/recipes/totem/totem_2.28.5.bb
index e62a02e3bd..0bc61b7d1b 100644
--- a/recipes/totem/totem_2.28.5.bb
+++ b/recipes/totem/totem_2.28.5.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "A GTK2 based media player"
 HOMEPAGE = "http://www.gnome.org/projects/totem/"
 LICENSE = "GPL"
 
-PR = "r1"
+PR = "r4"
 
 DEPENDS = " nautilus tracker gnome-doc-utils libunique libgdata totem-pl-parser gtk+ dbus bluez-libs libglade gconf libxml2 gst-ffmpeg gst-plugins-bad  gst-plugins-base" 
 RDEPENDS_${PN} += "iso-codes"
@@ -21,7 +21,7 @@ RRECOMMENDS_${PN} += "gst-plugin-playbin \
 		      gst-plugin-alsa \
 		      gst-plugin-avi \
 		      gst-plugin-ffmpegcolorspace \
-		      gst-plugin-flvdemux \
+		      gst-plugin-flv \
 		      gst-plugin-nuvdemux \
 		      gst-plugin-videoscale \
 		      gst-plugin-a52dec \
@@ -29,25 +29,36 @@ RRECOMMENDS_${PN} += "gst-plugin-playbin \
 		      gst-plugin-ossaudio \
 		      gst-plugin-pulse \
 		      gst-plugin-autodetect \
-		      totem-plugin-youtube totem-plugin-thumbnail totem-plugin-dbus totem-plugin-screensaver"
+		      totem-plugin-thumbnail totem-plugin-dbus "
 
 inherit gnome
 
 SRC_URI += "file://gst-detect.diff;patch=1"
 
 EXTRA_OECONF=" --enable-shared \
+           --disable-static \
            --disable-schemas-install \
 	       --disable-iso-codes \
 	       --disable-debug \
            --enable-browser-plugins \
 	       --disable-run-in-source-tree \
 	       --disable-vala \
-	       --with-dbus \
+	       --enable-python \
+           --with-dbus \
 	       "
 
 do_configure_prepend() {
-	sed -i -e s:help::g ${S}/Makefile.am
-	sed -i -e s:PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION":PYTHON_CFLAGS="-I${STAGING_INCDIR}/python$PYTHON_VERSION":g ${S}/configure.in
+    sed -i -e s:help::g ${S}/Makefile.am
+    sed -i \
+        -e s:'`$PKG_CONFIG --variable defsdir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/defs\":g \
+        -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \
+        -e s:'`$PKG_CONFIG --variable=pygtkincludedir pygobject-2.0`':\"${STAGING_INCDIR}/pygtk-2.0\":g \
+        -e s:'`$PKG_CONFIG --variable=datadir pygobject-2.0`':\"${STAGING_DATADIR}\":g \
+        -e s:'`$PKG_CONFIG --variable codegendir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \
+        -e s:'`$PKG_CONFIG --variable=codegendir pygtk-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \
+        -e s:'`$PKG_CONFIG --variable=fixxref pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/xsl/fixxref.py\":g \
+        -e 's:PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION":PYTHON_CFLAGS="-I${STAGING_INCDIR}/python$PYTHON_VERSION":g' \
+        ${S}/configure.in
 }
 
 PACKAGES_DYNAMIC += " totem-plugin-* "
@@ -61,6 +72,10 @@ python populate_packages_prepend () {
 FILES_${PN} = "${bindir}/* ${sysconfdir} ${libdir}/lib*.so.* ${libexecdir} ${datadir}/icons ${datadir}/totem ${datadir}/applications \
 "
 
+RDEPENDS_totem-plugin-iplayer_append = "python-pygtk"
+RDEPENDS_totem-plugin-youtube_append = "python-pygtk"
+
+
 PACKAGES =+ "totem-nautilus-extension totem-browser-plugin-dbg totem-browser-plugin"
 
 FILES_${PN}-dbg += "${libdir}/totem/plugins/*/.debug"
-- 
cgit v1.2.3


From 4536c5f63fee68fd8354b8ec4f5b050f1861960d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 Feb 2010 21:51:18 +0100
Subject: gnome-bluetooth git: move to 2.28.6

---
 recipes/gnome/gnome-bluetooth_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'recipes')

diff --git a/recipes/gnome/gnome-bluetooth_git.bb b/recipes/gnome/gnome-bluetooth_git.bb
index 8d33cf51cb..29bd3ea4f6 100644
--- a/recipes/gnome/gnome-bluetooth_git.bb
+++ b/recipes/gnome/gnome-bluetooth_git.bb
@@ -11,8 +11,8 @@ SRC_URI = "git://git.gnome.org/gnome-bluetooth;branch=gnome-2-28;protocol=git \
 
 S = "${WORKDIR}/git"
 
-SRCREV = "0622ea93f4e42d1599f2467e6bef5dca49cd99fd"
-PV = "2.28.1"
+SRCREV = "2d23ec20fa8f8299e93beea849bc8670aa2c7c69"
+PV = "2.28.6"
 PR = "r0"
 PR_append = "+gitr${SRCREV}"
 
-- 
cgit v1.2.3


From 36c24b198eb63ac22a6182697514c5ca5250a068 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 Feb 2010 15:05:15 +0100
Subject: u-boot git: sync omap3-touchbook patches with AI repo

---
 recipes/u-boot/files/omap3-touchbook/fw_env.config |  2 +-
 recipes/u-boot/u-boot-git/ai-logo.patch            | 12 ++++----
 .../u-boot-git/omap3-touchbook/new-pinmux.patch    | 35 ++++++++++------------
 recipes/u-boot/u-boot-git/spi4.patch               | 18 +++++------
 recipes/u-boot/u-boot_git.bb                       |  2 +-
 5 files changed, 32 insertions(+), 37 deletions(-)

(limited to 'recipes')

diff --git a/recipes/u-boot/files/omap3-touchbook/fw_env.config b/recipes/u-boot/files/omap3-touchbook/fw_env.config
index 4063144d36..a7bfec1ebb 100644
--- a/recipes/u-boot/files/omap3-touchbook/fw_env.config
+++ b/recipes/u-boot/files/omap3-touchbook/fw_env.config
@@ -3,4 +3,4 @@
 # environment sector is assumed present.
 
 # MTD device name	Device offset	Env. size	Flash sector size
-/dev/mtd2		0x0000		0x20000		0x40000
+/dev/mtd2		0x0000		0x20000		0x20000
diff --git a/recipes/u-boot/u-boot-git/ai-logo.patch b/recipes/u-boot/u-boot-git/ai-logo.patch
index 0a8087fc9c..b41ab54a05 100644
--- a/recipes/u-boot/u-boot-git/ai-logo.patch
+++ b/recipes/u-boot/u-boot-git/ai-logo.patch
@@ -21,7 +21,7 @@ diff -Nur a/board/omap3/beagle/beagle.c b/board/omap3/beagle/beagle.c
 +
 +	/* Fill up to the logo */
 +	for (i = 0; i < 2 * (LOGO_SCREEN_WIDTH * ((LOGO_SCREEN_HEIGHT/2) - (height/2))); i += 2) {
-+		*((unsigned short *)(0x80500000 + i)) = LOGO_FILL_COLOUR;
++		*((unsigned short *)(0x85000000 + i)) = LOGO_FILL_COLOUR;
 +	}
 +	offset += i;
 +
@@ -29,10 +29,10 @@ diff -Nur a/board/omap3/beagle/beagle.c b/board/omap3/beagle/beagle.c
 +	for (i = 0; i < height; i++) {
 +		for (k = 0; k < LOGO_SCREEN_WIDTH; k++) {
 +			if(k < (LOGO_SCREEN_WIDTH / 2 - width / 2) || k >= (LOGO_SCREEN_WIDTH / 2 + width / 2))
-+				*((unsigned short *)(0x80500000 + offset + 2*k)) = LOGO_FILL_COLOUR;
++				*((unsigned short *)(0x85000000 + offset + 2*k)) = LOGO_FILL_COLOUR;
 +			else {
 +				HEADER_PIXEL(header_data, pixel);
-+				*((unsigned short *)(0x80500000 + offset + 2*k)) =
++				*((unsigned short *)(0x85000000 + offset + 2*k)) =
 +					((((pixel[0])&0xf8) << 8) |
 +					 (((pixel[1])&0xfc) << 3) |
 +					 (((pixel[2])&0xf8) >> 3));
@@ -44,7 +44,7 @@ diff -Nur a/board/omap3/beagle/beagle.c b/board/omap3/beagle/beagle.c
 +
 +	/* Fill the rest */
 +	for (i = 0; i < 2 * (LOGO_SCREEN_WIDTH * ((LOGO_SCREEN_HEIGHT/2) - (height/2))); i += 2) {
-+		*((unsigned short *)(0x80500000 + offset + i)) = LOGO_FILL_COLOUR;
++		*((unsigned short *)(0x85000000 + offset + i)) = LOGO_FILL_COLOUR;
 +	}	
 +
 +	*((uint *) 0x48310034) = 0xfefffedf;
@@ -123,8 +123,8 @@ diff -Nur a/board/omap3/beagle/beagle.c b/board/omap3/beagle/beagle.c
 +	*((uint *) 0x48050470) = 0x00010007;
 +	*((uint *) 0x48050478) = 0x00ef027f;
 +	*((uint *) 0x4805047c) = 0x02ff03ff;
-+	*((uint *) 0x48050480) = 0x80500000;
-+	*((uint *) 0x48050484) = 0x80500000;
++	*((uint *) 0x48050480) = 0x85000000;
++	*((uint *) 0x48050484) = 0x85000000;
 +	*((uint *) 0x48050488) = 0x00000000;
 +	*((uint *) 0x4805048c) = 0x02ff03ff;
 +	*((uint *) 0x480504a0) = 0x0000008d;
diff --git a/recipes/u-boot/u-boot-git/omap3-touchbook/new-pinmux.patch b/recipes/u-boot/u-boot-git/omap3-touchbook/new-pinmux.patch
index 1c8fa16598..3e6af50565 100644
--- a/recipes/u-boot/u-boot-git/omap3-touchbook/new-pinmux.patch
+++ b/recipes/u-boot/u-boot-git/omap3-touchbook/new-pinmux.patch
@@ -29,26 +29,21 @@ index 00b15cb..36eae5c 100644
   /*Bluetooth*/\
   MUX_VAL(CP(MCBSP3_DX),		(IEN  | PTD | DIS | M1)) /*UART2_CTS*/\
   MUX_VAL(CP(MCBSP3_DR),		(IDIS | PTD | DIS | M1)) /*UART2_RTS*/\
-@@ -229,13 +229,13 @@ const omap3_sysinfo sysinfo = {
-  MUX_VAL(CP(MCBSP4_DR),		(IEN  | PTD | DIS | M1)) /*SSI1_FLAG_RX*/\
-  MUX_VAL(CP(MCBSP4_DX),		(IEN  | PTD | DIS | M1)) /*SSI1_RDY_RX*/\
-  MUX_VAL(CP(MCBSP4_FSX),	(IEN  | PTD | DIS | M1)) /*SSI1_WAKE*/\
-- MUX_VAL(CP(MCBSP1_CLKR),	(IDIS | PTD | DIS | M4)) /*GPIO_156*/\
-- MUX_VAL(CP(MCBSP1_FSR),	(IDIS | PTU | EN  | M4)) /*GPIO_157*/\
-- MUX_VAL(CP(MCBSP1_DX),		(IDIS | PTD | DIS | M4)) /*GPIO_158*/\
-- MUX_VAL(CP(MCBSP1_DR),		(IDIS | PTD | DIS | M4)) /*GPIO_159*/\
-+ MUX_VAL(CP(MCBSP1_CLKR),	(IEN  | PTU | EN  | M1)) /*MCSPI4_CLK*/\
-+ MUX_VAL(CP(MCBSP1_FSR),	(IEN  | PTU | EN  | M4)) /*GPIO_157*/\
-+ MUX_VAL(CP(MCBSP1_DX),		(IEN  | PTD | EN  | M1)) /*MCSPI4_SIMO*/\
-+ MUX_VAL(CP(MCBSP1_DR),		(IEN  | PTD | DIS | M1)) /*MCSPI4_SOMI*/\
-  MUX_VAL(CP(MCBSP_CLKS),	(IEN  | PTU | DIS | M0)) /*McBSP_CLKS*/\
-- MUX_VAL(CP(MCBSP1_FSX),	(IDIS | PTD | DIS | M4)) /*GPIO_161*/\
-- MUX_VAL(CP(MCBSP1_CLKX),	(IDIS | PTD | DIS | M4)) /*GPIO_162*/\
-+ MUX_VAL(CP(MCBSP1_FSX),	(IEN  | PTD | EN  | M1)) /*MCSPI4_CS0*/\
-+ MUX_VAL(CP(MCBSP1_CLKX),	(IEN  | PTD | DIS | M4)) /*GPIO_162*/\
-  /*Serial Interface*/\
-  MUX_VAL(CP(UART3_CTS_RCTX),	(IEN  | PTD | EN  | M0)) /*UART3_CTS_RCTX*/\
-  MUX_VAL(CP(UART3_RTS_SD),	(IDIS | PTD | DIS | M0)) /*UART3_RTS_SD */\
+@@ -229,10 +229,10 @@ const omap3_sysinfo sysinfo = {
+  MUX_VAL(CP(UART1_RTS),		(IDIS | PTD | DIS | M4)) /*GPIO_149*/ \
+  MUX_VAL(CP(UART1_CTS),		(IDIS | PTD | DIS | M4)) /*GPIO_150*/ \
+  MUX_VAL(CP(UART1_RX),		(IEN  | PTD | DIS | M0)) /*UART1_RX*/\
+- MUX_VAL(CP(MCBSP4_CLKX),	(IEN  | PTD | DIS | M1)) /*SSI1_DAT_RX*/\
+- MUX_VAL(CP(MCBSP4_DR),		(IEN  | PTD | DIS | M1)) /*SSI1_FLAG_RX*/\
+- MUX_VAL(CP(MCBSP4_DX),		(IEN  | PTD | DIS | M1)) /*SSI1_RDY_RX*/\
+- MUX_VAL(CP(MCBSP4_FSX),	(IEN  | PTD | DIS | M1)) /*SSI1_WAKE*/\
++ MUX_VAL(CP(MCBSP4_CLKX),	(IEN | PTU | EN  | M4)) /*GPIO_152*/\
++ MUX_VAL(CP(MCBSP4_DR),		(IEN | PTU | EN  | M4)) /*GPIO_153*/\
++ MUX_VAL(CP(MCBSP4_DX),		(IEN | PTU | EN  | M4)) /*GPIO_154*/\
++ MUX_VAL(CP(MCBSP4_FSX),	(IEN | PTU | EN  | M4)) /*GPIO_155*/\
+  MUX_VAL(CP(MCBSP1_CLKR),	(IDIS | PTD | DIS | M4)) /*GPIO_156*/\
+  MUX_VAL(CP(MCBSP1_FSR),	(IDIS | PTU | EN  | M4)) /*GPIO_157*/\
+  MUX_VAL(CP(MCBSP1_DX),		(IDIS | PTD | DIS | M4)) /*GPIO_158*/\
 @@ -255,8 +255,8 @@ const omap3_sysinfo sysinfo = {
   MUX_VAL(CP(HSUSB0_DATA7),	(IEN  | PTD | DIS | M0)) /*HSUSB0_DATA7*/\
   MUX_VAL(CP(I2C1_SCL),		(IEN  | PTU | EN  | M0)) /*I2C1_SCL*/\
diff --git a/recipes/u-boot/u-boot-git/spi4.patch b/recipes/u-boot/u-boot-git/spi4.patch
index bf35964a99..bd284b2ec0 100644
--- a/recipes/u-boot/u-boot-git/spi4.patch
+++ b/recipes/u-boot/u-boot-git/spi4.patch
@@ -1,20 +1,20 @@
 --- a/board/omap3/beagle/beagle.h	2009-02-19 13:30:50.000000000 -0800
 +++ b/board/omap3/beagle/beagle.h	2009-02-19 13:12:16.000000000 -0800
 @@ -229,13 +229,13 @@
-  MUX_VAL(CP(MCBSP4_DR),		(IEN  | PTD | DIS | M1)) /*SSI1_FLAG_RX*/\
-  MUX_VAL(CP(MCBSP4_DX),		(IEN  | PTD | DIS | M1)) /*SSI1_RDY_RX*/\
-  MUX_VAL(CP(MCBSP4_FSX),	(IEN  | PTD | DIS | M1)) /*SSI1_WAKE*/\
-- MUX_VAL(CP(MCBSP1_CLKR),	(IEN  | PTU | EN  | M1)) /*MCSPI4_CLK*/\
-- MUX_VAL(CP(MCBSP1_FSR),	(IEN  | PTU | EN  | M4)) /*GPIO_157*/\
-- MUX_VAL(CP(MCBSP1_DX),		(IEN  | PTD | EN  | M1)) /*MCSPI4_SIMO*/\
-- MUX_VAL(CP(MCBSP1_DR),		(IEN  | PTD | DIS | M1)) /*MCSPI4_SOMI*/\
+  MUX_VAL(CP(MCBSP4_DR),		(IEN | PTU | EN  | M4)) /*GPIO_153*/\
+  MUX_VAL(CP(MCBSP4_DX),		(IEN | PTU | EN  | M4)) /*GPIO_154*/\
+  MUX_VAL(CP(MCBSP4_FSX),	(IEN | PTU | EN  | M4)) /*GPIO_155*/\
+- MUX_VAL(CP(MCBSP1_CLKR),	(IDIS | PTD | DIS | M4)) /*GPIO_156*/\
+- MUX_VAL(CP(MCBSP1_FSR),	(IDIS | PTU | EN  | M4)) /*GPIO_157*/\
+- MUX_VAL(CP(MCBSP1_DX),		(IDIS | PTD | DIS | M4)) /*GPIO_158*/\
+- MUX_VAL(CP(MCBSP1_DR),		(IDIS | PTD | DIS | M4)) /*GPIO_159*/\
 + MUX_VAL(CP(MCBSP1_CLKR),	(IEN | PTU | DIS | M1)) /*MCSPI4_CLK*/\
 + MUX_VAL(CP(MCBSP1_FSR),	(IEN | PTU | EN  | M4)) /*GPIO_157*/\
 + MUX_VAL(CP(MCBSP1_DX),		(IEN | PTU | DIS | M1)) /*MCSPI4_SIMO*/\
 + MUX_VAL(CP(MCBSP1_DR),		(IEN | PTU | EN | M1)) /*MCSPI4_SOMI*/\
   MUX_VAL(CP(MCBSP_CLKS),	(IEN  | PTU | DIS | M0)) /*McBSP_CLKS*/\
-- MUX_VAL(CP(MCBSP1_FSX),	(IEN  | PTD | EN  | M1)) /*MCSPI4_CS0*/\
-- MUX_VAL(CP(MCBSP1_CLKX),	(IEN  | PTD | DIS | M4)) /*GPIO_162*/\
+- MUX_VAL(CP(MCBSP1_FSX),	(IDIS | PTD | DIS | M4)) /*GPIO_161*/\
+- MUX_VAL(CP(MCBSP1_CLKX),	(IDIS | PTD | DIS | M4)) /*GPIO_162*/\
 + MUX_VAL(CP(MCBSP1_FSX),	(IEN | PTU | EN | M1)) /*MCSPI4_CS0*/\
 + MUX_VAL(CP(MCBSP1_CLKX),	(IEN | PTU | EN | M4)) /*GPIO_162*/\
   /*Serial Interface*/\
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index 8f21e7f484..6273e044da 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-PR ="r37"
+PR ="r38"
 
 FILESPATHPKG =. "u-boot-git:"
 
-- 
cgit v1.2.3


From 86a69a7aa513ab7b2a53f6f6589646952b1e7ebb Mon Sep 17 00:00:00 2001
From: Steffen Sledz <sledz@dresearch.de>
Date: Tue, 2 Feb 2010 17:00:30 +0100
Subject: u-boot-2009.03: nor flash layout changed for hipox machine

Signed-off-by: Mario Schuknecht <m.schuknecht@dresearch.de>
Acked-by: Steffen Sledz <sledz@dresearch.de>
---
 .../u-boot/u-boot-2009.03/hipox/04-hipox-env.patch | 24 ++++++++++++++++++++++
 recipes/u-boot/u-boot_2009.03.bb                   |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 recipes/u-boot/u-boot-2009.03/hipox/04-hipox-env.patch

(limited to 'recipes')

diff --git a/recipes/u-boot/u-boot-2009.03/hipox/04-hipox-env.patch b/recipes/u-boot/u-boot-2009.03/hipox/04-hipox-env.patch
new file mode 100644
index 0000000000..57394cb9a0
--- /dev/null
+++ b/recipes/u-boot/u-boot-2009.03/hipox/04-hipox-env.patch
@@ -0,0 +1,24 @@
+--- u-boot-2009.03.orig/include/configs/hipox.h	2010-02-02 10:26:50.000000000 +0000
++++ u-boot-2009.03/include/configs/hipox.h	2010-02-02 12:03:59.000000000 +0000
+@@ -424,8 +424,19 @@
+ #define CONFIG_ENV_SIZE        CONFIG_ENV_SECT_SIZE
+ /* Second parameter block for backup environment */
+ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
+-/* Main environment occupies first parameter block */
+-#define CONFIG_ENV_ADDR        ((CONFIG_SYS_FLASH_BASE)+(NUM_FLASH_MAIN_BLOCKS)*(FLASH_MAIN_BLOCK_SIZE))
++/** Main environment occupies parameter block at offset 32k, 
++ *  there are two 8k blocks in both flashs. 
++ *
++ * Flash AT49BV163DT:
++ *  -      0 - 1F0000: 31 block 64k (10000)
++ *  - 1F0000 - 200000:  8 block  8k ( 2000)
++ *  Flash A29L160ATG:
++ *  -      0 - 1F0000: 31 block 64k (10000)
++ *  - 1F0000 - 1F8000:  1 block 32k ( 8000)
++ *  - 1F8000 - 1FC000:  2 block  8k ( 2000)
++ *  - 1FC000 - 200000:  1 block 16k ( 4000)
++ */
++#define CONFIG_ENV_ADDR        ((CONFIG_SYS_FLASH_BASE)+(NUM_FLASH_MAIN_BLOCKS)*(FLASH_MAIN_BLOCK_SIZE) + (4 * (CONFIG_ENV_SECT_SIZE)))
+ /* Backup environment occupies second parameter block */
+ #define CONFIG_ENV_ADDR_REDUND ((CONFIG_ENV_ADDR)+(CONFIG_ENV_SECT_SIZE))
+ #endif
diff --git a/recipes/u-boot/u-boot_2009.03.bb b/recipes/u-boot/u-boot_2009.03.bb
index a70fa6acc7..c3e9326da0 100644
--- a/recipes/u-boot/u-boot_2009.03.bb
+++ b/recipes/u-boot/u-boot_2009.03.bb
@@ -10,6 +10,7 @@ SRC_URI_append_hipox = "file://00-hipox.patch;patch=1 \
 	file://01-hipox-fix-gmac-reset.patch;patch=1 \
 	file://02-hipox-enable-mmu.patch;patch=1 \
 	file://03-hipox-direct-switch.patch;patch=1 \
+	file://04-hipox-env.patch;patch=1 \
 "
 
 TARGET_LDFLAGS = ""
-- 
cgit v1.2.3