diff options
Diffstat (limited to 'meta-openmoko')
8 files changed, 68 insertions, 41 deletions
diff --git a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb index e4baa81054..2551519348 100644 --- a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb +++ b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb @@ -1,5 +1,11 @@ -require openmoko-libs.inc - +SECTION = "openmoko/libs" DEPENDS = "libgsmd glib-2.0" +PV = "0.1.0+svn${SVNREV}" PR = "r1" -REAL_PN = "libmokogsmd2" + +inherit openmoko2 + +do_stage() { + autotools_stage_all +} + diff --git a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb b/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb index 6730426a3d..6e5383af83 100644 --- a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb +++ b/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb @@ -1,5 +1,11 @@ -require openmoko-libs.inc - +SECTION = "openmoko/libs" DEPENDS = "eds-dbus" -PR = "r1" -REAL_PN = "libmokojournal2" +PV = "0.1.0+svn${SVNREV}" +PR = "r2" + +inherit openmoko2 lib_package + +do_stage() { + autotools_stage_all +} + diff --git a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb index b845caa331..86372ae274 100644 --- a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb +++ b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb @@ -1,5 +1,14 @@ -require openmoko-libs.inc - +SECTION = "openmoko/libs" DEPENDS = "gtk+" -PV = "0.0.5+svn${SRCDATE}" -REAL_PN = "libmokoui2" +PV = "0.1.0+svn${SVNREV}" +PR = "r1" + +inherit openmoko2 + +do_stage() { + autotools_stage_all +} + + + + diff --git a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb index bd872dd79d..c63738a912 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb @@ -1,12 +1,13 @@ -require openmoko.inc - -DESCRIPTION = "The OpenMoko address book" +DESCRIPTION = "The OpenMoko Address Book" +SECTION = "openmoko/pim" +DEPENDS = "libmokoui2 libmokojournal2 dbus-glib" RDEPENDS = "libedata-book" -PV = "0.1+svn${SRCDATE}" -PR = "r2" +PV = "0.1.0+svn${SVNREV}" +PR = "r4" -SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches/;module=hito;proto=http" +inherit openmoko2 +SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http" S = "${WORKDIR}/hito/" EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko" diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb index d5011da840..655272f293 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb @@ -1,10 +1,10 @@ -require openmoko.inc - DESCRIPTION = "The OpenMoko Dialer" -DEPENDS += "libmokogsmd2 libmokoui2 libmokojournal2 gstreamer" -RDEPENDS = "gst-meta-audio" -REAL_PN = "openmoko-dialer2" -PR = "r2" +SECTION = "openmoko/pim" +DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio" +PV = "0.1.0+svn${SVNREV}" +PR = "r4" + +inherit openmoko2 EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2.bb b/meta-openmoko/packages/openmoko2/openmoko-session2.bb index 38a560461d..046f59b3d9 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-session2.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-session2.bb @@ -1,16 +1,15 @@ -DESCRIPTION = "Custom MB session files for poky" +DESCRIPTION = "Custom MB session files for OpenMoko" LICENSE = "GPL" SECTION = "x11" -RDEPENDS = "matchbox-applet-startup-monitor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato" -RCONFLICTS = "matchbox-common matchbox-sato" -PR = "r19" +RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" +RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" +RCONFLICTS = "openmoko-session" +PR = "r29" -SRC_URI = "file://etc file://matchbox-session" +SRC_URI = "file://etc" S = ${WORKDIR} do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/matchbox-session ${D}/${bindir} cp -R ${S}/etc ${D}/etc rm -fR ${D}/etc/.svn rm -fR ${D}/etc/matchbox/.svn @@ -27,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/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb index 43a1fd41d0..bbeba4420f 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb @@ -1,13 +1,12 @@ -require openmoko.inc - DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" SECTION = "openmoko/base" RCONFLICTS = "openmoko-theme-standard" -PACKAGE_ARCH = "all" -PR = "r1" +PV = "0.1.0+svnr${SRCDATE}" +PR = "r2" -SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http" +inherit openmoko2 +SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http" S = "${WORKDIR}/openmoko-standard-2" do_install() { @@ -20,4 +19,7 @@ do_install() { echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc } +CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc" + +PACKAGE_ARCH = "all" FILES_${PN} = "${datadir} ${sysconfdir}" diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb index fc6aba99a2..bfc5fc201d 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb @@ -1,8 +1,8 @@ -require openmoko.inc - -DESCRIPTION = "OpenMoko Today application" +DESCRIPTION = "The OpenMoko Application Launcher" SECTION = "openmoko/pim" -DEPENDS += "startup-notification dbus-glib libice libsm libmokoui2" -REAL_PN = "openmoko-today2" +DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm" +RDEPENDS = "libedata-cal openmoko-today2-folders" +PV = "0.1.0+svn${SVNREV}" +PR = "r1" -inherit gtk-icon-cache +inherit openmoko2 gtk-icon-cache |