[oe-commits] Martin Jansa : freesmartphone: bump cornucopia SRCREV, remove aplied patch from fsogsmd and use FSO_CORNUCOPIA_SRCREV again in mdbus2

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 09d68a75d0531254df22e5ad991b9326fd5b821a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=09d68a75d0531254df22e5ad991b9326fd5b821a

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Jul 13 09:41:02 2010 +0200

freesmartphone: bump cornucopia SRCREV, remove aplied patch from fsogsmd and use FSO_CORNUCOPIA_SRCREV again in mdbus2

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/freesmartphone/cornucopia.inc    |    2 +-
 recipes/freesmartphone/fsodeviced_git.bb |    2 --
 recipes/freesmartphone/fsogsmd_git.bb    |    3 ---
 recipes/freesmartphone/mdbus2_git.bb     |    2 +-
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc
index 8fe90d8..514eb6c 100644
--- a/recipes/freesmartphone/cornucopia.inc
+++ b/recipes/freesmartphone/cornucopia.inc
@@ -7,7 +7,7 @@ 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"
 
-FSO_CORNUCOPIA_SRCREV ?= "6a1802b0ca2f3802351833fc221ea69d099190eb"
+FSO_CORNUCOPIA_SRCREV ?= "f248cb38db9f531393391984284de96e8ff4e264"
 INC_PR = "r2"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master"
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 8197669..bc973a3 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -32,8 +32,6 @@ CONFFILES_${PN} = "${sysconfdir}/freesmartphone/conf/openmoko_gta/fsodeviced.con
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${WORKDIR}/fsodeviced ${D}${sysconfdir}/init.d/
-	rm -f ${D}${sysconfdir}/freesmartphone/conf/openmoko_gta/alsa-default
-	ln -s alsa-2.6.31 ${D}${sysconfdir}/freesmartphone/conf/openmoko_gta/alsa-default
 }
 
 pkg_preinst_${PN} () {
diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb
index 1de4533..e2cbd53 100644
--- a/recipes/freesmartphone/fsogsmd_git.bb
+++ b/recipes/freesmartphone/fsogsmd_git.bb
@@ -7,9 +7,6 @@ PE = "1"
 
 DEPENDS += "libfsoresource libgsm0710mux ppp msmcommd"
 
-SRC_URI_append_om-gta01 = " file://0001-fsogsmd-update-sysfs-node-in-config-for-openmoko_gta.patch;striplevel=2"
-SRC_URI_append_om-gta02 = " file://0001-fsogsmd-update-sysfs-node-in-config-for-openmoko_gta.patch;striplevel=2"
-
 EXTRA_OECONF_append = "\
   --enable-libgsm0710mux \
   --enable-modem-qualcomm-palm \
diff --git a/recipes/freesmartphone/mdbus2_git.bb b/recipes/freesmartphone/mdbus2_git.bb
index 5e41087..cfa6ef3 100644
--- a/recipes/freesmartphone/mdbus2_git.bb
+++ b/recipes/freesmartphone/mdbus2_git.bb
@@ -5,7 +5,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 DEPENDS = "glib-2.0 dbus dbus-glib"
-SRCREV = "c9629132869ab84c70ff58be458e138bcb0e9c58"
+SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "2.0.0+gitr${SRCPV}"
 PR = "${INC_PR}.0"
 PE = "1"