diff options
Diffstat (limited to 'packages/openmoko2')
-rw-r--r-- | packages/openmoko2/neod_svn.bb | 4 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-common2_svn.bb | 22 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-feedreader2_svn.bb | 2 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 9 | ||||
-rwxr-xr-x | packages/openmoko2/openmoko-session2/etc/matchbox/session | 7 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-terminal2_1.0.0.bb | 5 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-today2-folders_svn.bb | 8 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-today2_svn.bb | 2 |
8 files changed, 49 insertions, 10 deletions
diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb index fd417c69f3..4d6115ae93 100644 --- a/packages/openmoko2/neod_svn.bb +++ b/packages/openmoko2/neod_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management" SECTION = "openmoko/daemons" -DEPENDS = "gtk+ pulseaudio" +DEPENDS = "gconf gtk+ pulseaudio" PV = "0.1.0+svn${SVNREV}" PR = "r0" -inherit openmoko2 +inherit openmoko2 gconf diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb new file mode 100644 index 0000000000..f54a23de18 --- /dev/null +++ b/packages/openmoko2/openmoko-common2_svn.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Common files for the OpenMoko distribution" +SECTION = "openmoko/base" +PV = "0.0+svn${SRCDATE}" +PR = "r3" + +inherit openmoko2 + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http" +S = "${WORKDIR}" + +dirs = "pixmaps" + +do_install() { + find ${WORKDIR} -name ".svn" | xargs rm -rf + install -d ${D}${datadir} + for i in ${dirs}; do + cp -fpPR ${S}/$i ${D}${datadir} + done +} + +PACKAGE_ARCH = "all" +FILES_${PN} = "${datadir}" diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb index 04b08539f2..3655f8977b 100644 --- a/packages/openmoko2/openmoko-feedreader2_svn.bb +++ b/packages/openmoko2/openmoko-feedreader2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Feed Reader" SECTION = "openmoko/apps" -DEPENDS += "libmrss check webkit" +DEPENDS += "libmrss check webkit-gtk" PV = "0.0.1+svn${SVNREV}" PR = "r0" diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 86e1485003..046f59b3d9 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,9 +1,10 @@ -DESCRIPTION = "Custom MB session files for poky" +DESCRIPTION = "Custom MB 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 = "r23" +PR = "r29" SRC_URI = "file://etc" S = ${WORKDIR} @@ -25,4 +26,8 @@ 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/icon_theme openmoko-standard 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 + } + +PACKAGE_ARCH = "all" diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index 60ce553f67..b2867047b1 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -1,5 +1,4 @@ #!/bin/sh - SHOWCURSOR="no" openmoko-today & @@ -7,5 +6,7 @@ openmoko-dialer & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & -exec matchbox-panel-2 --start-applets showdesktop,systray,startup \ - --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar +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 --titlebar & + +exec neod diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb index 8d9a5245ca..84bd470f7a 100644 --- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb +++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb @@ -1,7 +1,10 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" RDEPENDS += "mrxvt" -PR = "r1" +PR = "r2" + +RCONFLICTS = "openmoko-terminal" +RREPLACES = "openmoko-terminal" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb new file mode 100644 index 0000000000..7a7c90c091 --- /dev/null +++ b/packages/openmoko2/openmoko-today2-folders_svn.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "The OpenMoko Today2 vfolder files" +SECTION = "openmoko/misc" +PV = "0.1.0+svn${SVNREV}" +PR = "r1" + +inherit openmoko2 + +FILES_${PN} += "${datadir}" diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb index 93e0b47456..bfc5fc201d 100644 --- a/packages/openmoko2/openmoko-today2_svn.bb +++ b/packages/openmoko2/openmoko-today2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Application Launcher" SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm" -RDEPENDS = "libedata-cal" +RDEPENDS = "libedata-cal openmoko-today2-folders" PV = "0.1.0+svn${SVNREV}" PR = "r1" |