[oe-commits] org.oe.dev merge of '9719a8ead20aff09d9b8f2d80aff72670abba7c1'

[xora commit]

merge of '9719a8ead20aff09d9b8f2d80aff72670abba7c1'
     and 'a15433a82ceaa76923d681389ae649e7489220a8'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: e930cc8c870552eea45fd56db9c1b737a0982b2e
ViewMTN: http://monotone.openembedded.org/revision/info/e930cc8c870552eea45fd56db9c1b737a0982b2e
Files:
1
packages/fbset/fbset-modes.bb
conf/bitbake.conf
packages/openmoko2/openmoko-dates2_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-today2_svn.bb
Diffs:

#
# mt diff -r9719a8ead20aff09d9b8f2d80aff72670abba7c1 -re930cc8c870552eea45fd56db9c1b737a0982b2e
#
# 
# 
# patch "packages/fbset/fbset-modes.bb"
#  from [2457f644de75bfb1dd5accd49d33c36e31d7fbf5]
#    to [50db8ae01bc06cd518f3f85c80bc1d7dd81c0cb7]
# 
============================================================
--- packages/fbset/fbset-modes.bb	2457f644de75bfb1dd5accd49d33c36e31d7fbf5
+++ packages/fbset/fbset-modes.bb	50db8ae01bc06cd518f3f85c80bc1d7dd81c0cb7
@@ -1,18 +1,13 @@ PV = "0.1.0"
 DESCRIPTION = "Default display timings and resolutions for fbset"
 PV = "0.1.0"
-PR = "r0"
+PR = "r1"
 
-ALLOW_EMPTY = "1"
+SRC_URI = "file://fb.modes"
 
-SRC_URI_append_fic-gta01 = " \
-    file://fb.modes"
-
 do_install() {
     install -d ${D}${sysconfdir}
     install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir}
 }
 
-FILES_${PN} = "${sysconfdir}/fb.modes"
-PACKAGE_ARCH_${PN} = "all"
-PACKAGE_ARCH_fbset-modes = "${MACHINE}"
+PACKAGE_ARCH = "all"
 


#
# mt diff -ra15433a82ceaa76923d681389ae649e7489220a8 -re930cc8c870552eea45fd56db9c1b737a0982b2e
#
# 
# 
# patch "conf/bitbake.conf"
#  from [f410a6b3af115612f2bd104814d1035583d3518a]
#    to [7223700020e755692ec209b6de23efdf0d5960cd]
# 
# patch "packages/openmoko2/openmoko-dates2_svn.bb"
#  from [7abc97a523f717985d280fba2c7fd30cd7402605]
#    to [51a011a2d4123c8db6d9eb2d169e13715651d2dd]
# 
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
#  from [8bf49f597b50d24a957ebe9e6f05404637ab6560]
#    to [0d9b673125099a19dc66faba6b28c9b8b9d3b631]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [1c897158060ef7883a4ea320c60d6475025ff4ef]
#    to [3142d9c5ee2a406f3f61b199443a3828c7acc136]
# 
# patch "packages/openmoko2/openmoko-today2_svn.bb"
#  from [f2ad7fa44fe0572781fdaf052a2dcaa318940c3a]
#    to [bd706d0d3c24536774a11a9bbb330211c78759e8]
# 
============================================================
--- conf/bitbake.conf	f410a6b3af115612f2bd104814d1035583d3518a
+++ conf/bitbake.conf	7223700020e755692ec209b6de23efdf0d5960cd
@@ -460,9 +460,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 # when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
 #
 # This works for  functions as well, they are really just environment variables.
-#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
-# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
+# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
 OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+# Alternative OVERRIDES definition without "fail fast", usually only for native building and Scratchbox toolchains.
+#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}"
 
 ##################################################################
 # Include the rest of the config files.
============================================================
--- packages/openmoko2/openmoko-dates2_svn.bb	7abc97a523f717985d280fba2c7fd30cd7402605
+++ packages/openmoko2/openmoko-dates2_svn.bb	51a011a2d4123c8db6d9eb2d169e13715651d2dd
@@ -1,6 +1,6 @@ SECTION = "openmoko/pim"
 DESCRIPTION = "The OpenMoko Calendar"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus"
+DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
 RDEPENDS = "libedata-cal"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session	8bf49f597b50d24a957ebe9e6f05404637ab6560
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session	0d9b673125099a19dc66faba6b28c9b8b9d3b631
@@ -7,6 +7,6 @@ matchbox-panel-2 --start-applets systray
 matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
 
 matchbox-panel-2 --start-applets systray,startup \
-  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar &
+  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,keyboard --titlebar &
 
 exec neod
============================================================
--- packages/openmoko2/openmoko-session2.bb	1c897158060ef7883a4ea320c60d6475025ff4ef
+++ packages/openmoko2/openmoko-session2.bb	3142d9c5ee2a406f3f61b199443a3828c7acc136
@@ -1,16 +1,16 @@ 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 = "r34"
+PR = "r35"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
 
 do_install() {
-        install -d ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}
 	cp -R ${S}/etc/* ${D}${sysconfdir}
 	rm -fR ${D}${sysconfdir}/.svn
 	rm -fR ${D}${sysconfdir}/matchbox/.svn
@@ -28,7 +28,7 @@ gconftool-2 --config-source=xml::$D${sys
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
-
+# gstreamer audio settings
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
 
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb	f2ad7fa44fe0572781fdaf052a2dcaa318940c3a
+++ packages/openmoko2/openmoko-today2_svn.bb	bd706d0d3c24536774a11a9bbb330211c78759e8
@@ -1,8 +1,8 @@ SECTION = "openmoko/pim"
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
-DEPENDS = "openmoko-dates2 libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
+DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2 gtk-icon-cache