[oe-commits] org.oe.dev merge of '168c993c49f268b8a0f366d8ffd63a961512f7fe'

[koen commit]

merge of '168c993c49f268b8a0f366d8ffd63a961512f7fe'
     and 'ed2f6968f3a6025abbe5062431c947ea2d34b5aa'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: bbdfc2ae531fa10b4cf41954f80ebc075062e66d
ViewMTN: http://monotone.openembedded.org/revision/info/bbdfc2ae531fa10b4cf41954f80ebc075062e66d
Files:
1
packages/openmoko2/moko-gtk-engine.bb
packages/openmoko2/moko-gtk-engine_svn.bb
packages/gsm/files/default
packages/gsm/libgsmd_svn.bb
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -r168c993c49f268b8a0f366d8ffd63a961512f7fe -rbbdfc2ae531fa10b4cf41954f80ebc075062e66d
#
# 
# 
# rename "packages/openmoko2/moko-gtk-engine.bb"
#     to "packages/openmoko2/moko-gtk-engine_svn.bb"
# 


#
# mt diff -red2f6968f3a6025abbe5062431c947ea2d34b5aa -rbbdfc2ae531fa10b4cf41954f80ebc075062e66d
#
# 
# 
# patch "packages/gsm/files/default"
#  from [4f5482852a023458bb03627f6e4033dc88afaba6]
#    to [fff8f5a5e6aa3b4c82a98e13da7f097b7ee15b91]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [95a7bfe572d92c507ef654591ee28812da08ed59]
#    to [8fae0d7334ab46af3afa0e6fadd8b9b7e7441a06]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [2f8ec02e7147e7aad394dad1204d210e52626bc8]
#    to [496842695053a5e4f7cd66d4e569a3903302e8ae]
# 
============================================================
--- packages/gsm/files/default	4f5482852a023458bb03627f6e4033dc88afaba6
+++ packages/gsm/files/default	fff8f5a5e6aa3b4c82a98e13da7f097b7ee15b91
@@ -26,7 +26,7 @@ case `cpuinfo_id` in
 		GSM_DEV="/dev/ttyS0"
 		;;
         "Motorola Ezx Platform")
-                GSMD_OPTS="-s 115200 -F"
+                GSMD_OPTS="-s 115200 -F -v ti"
                 GSM_DEV="/dev/mux0"
                 ;;
 	*)
============================================================
--- packages/gsm/libgsmd_svn.bb	95a7bfe572d92c507ef654591ee28812da08ed59
+++ packages/gsm/libgsmd_svn.bb	8fae0d7334ab46af3afa0e6fadd8b9b7e7441a06
@@ -1,10 +1,10 @@ PV = "0.1+svnr${SRCREV}"
 DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
 HOMEPAGE = "http://www.openmoko.org"
 LICENSE = "GPL LGPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.1+svnr${SRCREV}"
-PR = "r28"
+PR = "r29"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://024_sms-text-in-bracket.patch;patch=1;minrev=2957 \
============================================================
--- packages/openmoko2/openmoko-session2.bb	2f8ec02e7147e7aad394dad1204d210e52626bc8
+++ packages/openmoko2/openmoko-session2.bb	496842695053a5e4f7cd66d4e569a3903302e8ae
@@ -1,19 +1,20 @@ RCONFLICTS = "openmoko-session"
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r32"
+PR = "r33"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
 
 do_install() {
-	cp -R ${S}/etc ${D}/etc
-	rm -fR ${D}/etc/.svn
-	rm -fR ${D}/etc/matchbox/.svn
-	chmod -R 755 ${D}/etc
+        install -d ${D}${sysconfdir}
+	cp -R ${S}/etc/* ${D}${sysconfdir}
+	rm -fR ${D}${sysconfdir}/.svn
+	rm -fR ${D}${sysconfdir}/matchbox/.svn
+	chmod -R 755 ${D}${sysconfdir}/
 }
 
 pkg_postinst_openmoko-session2 () {
@@ -31,3 +32,6 @@ PACKAGE_ARCH = "all"
 }
 
 PACKAGE_ARCH = "all"
+
+CONFFILES_${PN} = "${sysconfdir}/matchbox/session"
+