diff options
| -rw-r--r-- | conf/bitbake.conf | 5 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-dates2_svn.bb | 2 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 6 | ||||
| -rwxr-xr-x | packages/openmoko2/openmoko-session2/etc/matchbox/session | 2 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-today2_svn.bb | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 046b107936..43e45bd87d 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -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. diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb index e0fb4c971f..4f799d452e 100644 --- a/packages/openmoko2/openmoko-dates2_svn.bb +++ b/packages/openmoko2/openmoko-dates2_svn.bb @@ -1,6 +1,6 @@ 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" diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 65cb7f1ca6..b7a159fc28 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,13 +4,13 @@ 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${sysconfdir}/gconf/gconf.xml.defaults --dire 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 diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index 558f55ee87..2f27a4cc6a 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -7,6 +7,6 @@ openmoko-dialer & 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 diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb index 7f36405eec..998d22e308 100644 --- a/packages/openmoko2/openmoko-today2_svn.bb +++ b/packages/openmoko2/openmoko-today2_svn.bb @@ -1,8 +1,8 @@ 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 |