[oe-commits] org.oe.dev merge of '7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e'
florian commit
openembedded-commits at lists.openembedded.org
Mon Jul 30 21:35:31 UTC 2007
merge of '7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e'
and 'aaed7d89c2d2f9469b923a2d2d65c83ad37bc838'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 802e060fdcc7fa600a6f20b2de68a01d0e340e51
ViewMTN: http://monotone.openembedded.org/revision.psp?id=802e060fdcc7fa600a6f20b2de68a01d0e340e51
Files:
1
packages/gpephone/gpe-applauncher_0.9.bb
packages/gpephone/machined_svn.bb
packages/gpephone/ptim-manager_svn.bb
packages/blassic
packages/openmoko2
packages/openmoko2/openmoko-session2
packages/openmoko2/openmoko-session2/etc
packages/openmoko2/openmoko-session2/etc/matchbox
classes/openmoko2.bbclass
packages/blassic/blassic_0.10.1.bb
packages/openmoko2/libmokogsmd2_svn.bb
packages/openmoko2/libmokojournal2_svn.bb
packages/openmoko2/libmokopanelui2_svn.bb
packages/openmoko2/libmokoui2_svn.bb
packages/openmoko2/openmoko-contacts2_svn.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/openmoko2/openmoko-icon-theme-standard_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2/matchbox-session
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/openmoko2/openmoko-today2_svn.bb
packages/qemu/files/makefile.patch
classes/openmoko-panel-plugin.bbclass
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/bluez/bluez-utils.inc
packages/qemu/qemu_cvs.bb
mtn:execute
true
Diffs:
#
# mt diff -r7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e -r802e060fdcc7fa600a6f20b2de68a01d0e340e51
#
#
#
# add_file "packages/gpephone/gpe-applauncher_0.9.bb"
# content [fc172f9eabde581dd56130838da9ef7c15723ca3]
#
# patch "packages/gpephone/machined_svn.bb"
# from [c192d49beecd4b546ada28a1e7cd67964213339b]
# to [b1aa2bc7c8b777a29ced8ae606722efa408e1301]
#
# patch "packages/gpephone/ptim-manager_svn.bb"
# from [4c3fe941a6e90ebc9e6e3297be02b3de9df72b1f]
# to [e0ddcec53b318d7b7301948e99d5a260791f538f]
#
============================================================
--- packages/gpephone/gpe-applauncher_0.9.bb fc172f9eabde581dd56130838da9ef7c15723ca3
+++ packages/gpephone/gpe-applauncher_0.9.bb fc172f9eabde581dd56130838da9ef7c15723ca3
@@ -0,0 +1,12 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += '${datadir}/themes'
============================================================
--- packages/gpephone/machined_svn.bb c192d49beecd4b546ada28a1e7cd67964213339b
+++ packages/gpephone/machined_svn.bb b1aa2bc7c8b777a29ced8ae606722efa408e1301
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "Device abstraction and support daemon"
SECTION = "gpephone"
PRIORITY = "required"
LICENSE = "GPL"
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 dbus-glib gtk+"
PV = "0.1+svn-${SRCDATE}"
PR = "r0"
@@ -13,6 +13,3 @@ S = "${WORKDIR}/${PN}"
SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
S = "${WORKDIR}/${PN}"
-
-#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
-
============================================================
--- packages/gpephone/ptim-manager_svn.bb 4c3fe941a6e90ebc9e6e3297be02b3de9df72b1f
+++ packages/gpephone/ptim-manager_svn.bb e0ddcec53b318d7b7301948e99d5a260791f538f
@@ -1,17 +1,16 @@ PV = "0.1+svn-${SRCDATE}"
DESCRIPTION = "Phone input method manager module"
SECTION = "gpephone"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+ ptim-headers libiac"
PV = "0.1+svn-${SRCDATE}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
inherit gpephone pkgconfig autotools
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager \
- file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager"
S = "${WORKDIR}/immanager"
#
# mt diff -raaed7d89c2d2f9469b923a2d2d65c83ad37bc838 -r802e060fdcc7fa600a6f20b2de68a01d0e340e51
#
#
#
# add_dir "packages/blassic"
#
# add_dir "packages/openmoko2"
#
# add_dir "packages/openmoko2/openmoko-session2"
#
# add_dir "packages/openmoko2/openmoko-session2/etc"
#
# add_dir "packages/openmoko2/openmoko-session2/etc/matchbox"
#
# add_file "classes/openmoko2.bbclass"
# content [80c28ba30fcb1a7997d64595641141f1a49e3c68]
#
# add_file "packages/blassic/blassic_0.10.1.bb"
# content [05a9598501383ac4a00f7312f0582e93fa40e9bd]
#
# add_file "packages/openmoko2/libmokogsmd2_svn.bb"
# content [fdaa954512eb9af1f964483f9c2fc585cb677608]
#
# add_file "packages/openmoko2/libmokojournal2_svn.bb"
# content [15b332f5c75a6f64de12d666bf71409ae4ab8999]
#
# add_file "packages/openmoko2/libmokopanelui2_svn.bb"
# content [cae0414648cd159c9b09a353cb29019fdf139af7]
#
# add_file "packages/openmoko2/libmokoui2_svn.bb"
# content [fc8c35f6eb460dc277d372d31baffef3c4b04d52]
#
# add_file "packages/openmoko2/openmoko-contacts2_svn.bb"
# content [fe8ddc379d3397d04fcb2bf58940316edb474428]
#
# add_file "packages/openmoko2/openmoko-dialer2_svn.bb"
# content [10449f420626a2dc7eb7ffddcdc2588946e18e7f]
#
# add_file "packages/openmoko2/openmoko-icon-theme-standard_svn.bb"
# content [3889e0cbc8b415f8ccc206cf34c0b2d3f5324e5b]
#
# add_file "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# content [26f95f7ca147900b49432aadc380a147c5b707f2]
#
# add_file "packages/openmoko2/openmoko-session2/matchbox-session"
# content [5cebfee4515cb3cb7befc8bcb71bd2ce05de927e]
#
# add_file "packages/openmoko2/openmoko-session2.bb"
# content [9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c]
#
# add_file "packages/openmoko2/openmoko-theme-standard2_svn.bb"
# content [63e4490c76e470ecdf213580aa34e8a3c10d1da7]
#
# add_file "packages/openmoko2/openmoko-today2_svn.bb"
# content [19b5a82e4b9df73c893f35975ee0e6717ea38027]
#
# add_file "packages/qemu/files/makefile.patch"
# content [7b6e4a3e609da907d4026cba1f49fec3b972603d]
#
# patch "classes/openmoko-panel-plugin.bbclass"
# from [ab5e8526c41ab342808418a27680dd97b13f18c3]
# to [012f38a2bf927dd13a92d1a76a02c43173db369f]
#
# patch "conf/machine/fic-gta01.conf"
# from [1c8e90287feedbc8f33cb1859b4e13cbf1007c10]
# to [466d77dadd32f0dc79d242207f09ccd87533b0aa]
#
# patch "conf/machine/fic-gta02.conf"
# from [35a3ed508f3117b908249db21b5778bc4578be37]
# to [02cbabf3237da327316e9124d6c52fce6776baeb]
#
# patch "packages/bluez/bluez-utils.inc"
# from [13716750ab0571681b9e8449ea1ce394c881897e]
# to [1f441bd0eaa3829668270c8d41ff96df7bc33e8d]
#
# patch "packages/qemu/qemu_cvs.bb"
# from [a1c43b431c24813b3186b20f390639c0b6b2fb4c]
# to [21c0eb8c52d75f5c8ad4e17a5a96056fc7c71835]
#
# set "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# attr "mtn:execute"
# value "true"
#
============================================================
--- classes/openmoko2.bbclass 80c28ba30fcb1a7997d64595641141f1a49e3c68
+++ classes/openmoko2.bbclass 80c28ba30fcb1a7997d64595641141f1a49e3c68
@@ -0,0 +1,28 @@
+inherit autotools pkgconfig
+
+HOMEPAGE = "http://www.openmoko.org"
+OPENMOKO_RELEASE ?= "OM-2007.2"
+OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk"
+
+def openmoko_two_get_license(d):
+ import bb
+ openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+ return "LGPL GPL".split()[section != "libs"]
+
+def openmoko_two_get_subdir(d):
+ import bb
+ openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+ if section == 'base': return ""
+ elif section == 'libs': return "libraries"
+ elif section in 'apps tools pim'.split(): return "applications"
+ elif section == "panel-plugin": return "panel-plugins"
+ elif section == "inputmethods": return "inputmethods"
+ else: return section
+
+LICENSE = "${@openmoko_two_get_license(d)}"
+SUBDIR = "${@openmoko_two_get_subdir(d)}"
+
+SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http"
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} += "${datadir}/icons"
============================================================
--- packages/blassic/blassic_0.10.1.bb 05a9598501383ac4a00f7312f0582e93fa40e9bd
+++ packages/blassic/blassic_0.10.1.bb 05a9598501383ac4a00f7312f0582e93fa40e9bd
@@ -0,0 +1,11 @@
+DESCRIPTION = "classic basic interpreter"
+LICENSE = "GPLv2"
+DEPENDS = "ncurses"
+
+SRC_URI = "http://www.blassic.org/bin/blassic-${PV}.tgz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-graphics=yes"
+
+
============================================================
--- packages/openmoko2/libmokogsmd2_svn.bb fdaa954512eb9af1f964483f9c2fc585cb677608
+++ packages/openmoko2/libmokogsmd2_svn.bb fdaa954512eb9af1f964483f9c2fc585cb677608
@@ -0,0 +1,11 @@
+SECTION = "openmoko/libs"
+DEPENDS = "libgsmd glib-2.0"
+PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko2
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/openmoko2/libmokojournal2_svn.bb 15b332f5c75a6f64de12d666bf71409ae4ab8999
+++ packages/openmoko2/libmokojournal2_svn.bb 15b332f5c75a6f64de12d666bf71409ae4ab8999
@@ -0,0 +1,10 @@
+SECTION = "openmoko/libs"
+DEPENDS = "eds-dbus"
+PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko2
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/openmoko2/libmokopanelui2_svn.bb cae0414648cd159c9b09a353cb29019fdf139af7
+++ packages/openmoko2/libmokopanelui2_svn.bb cae0414648cd159c9b09a353cb29019fdf139af7
@@ -0,0 +1,11 @@
+SECTION = "openmoko/libs"
+DEPENDS = "gtk+"
+PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko2
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/openmoko2/libmokoui2_svn.bb fc8c35f6eb460dc277d372d31baffef3c4b04d52
+++ packages/openmoko2/libmokoui2_svn.bb fc8c35f6eb460dc277d372d31baffef3c4b04d52
@@ -0,0 +1,14 @@
+SECTION = "openmoko/libs"
+DEPENDS = "gtk+"
+PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko2
+
+do_stage() {
+ autotools_stage_all
+}
+
+
+
+
============================================================
--- packages/openmoko2/openmoko-contacts2_svn.bb fe8ddc379d3397d04fcb2bf58940316edb474428
+++ packages/openmoko2/openmoko-contacts2_svn.bb fe8ddc379d3397d04fcb2bf58940316edb474428
@@ -0,0 +1,12 @@
+DESCRIPTION = "The OpenMoko address book"
+SECTION = "openmoko/pim"
+RDEPENDS = "libedata-book"
+PV = "0.1+svn${SRCDATE}"
+PR = "r2"
+
+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"
============================================================
--- packages/openmoko2/openmoko-dialer2_svn.bb 10449f420626a2dc7eb7ffddcdc2588946e18e7f
+++ packages/openmoko2/openmoko-dialer2_svn.bb 10449f420626a2dc7eb7ffddcdc2588946e18e7f
@@ -0,0 +1,11 @@
+DESCRIPTION = "The OpenMoko Dialer"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2"
+PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko2
+
+EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
+
+FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/"
============================================================
--- packages/openmoko2/openmoko-icon-theme-standard_svn.bb 3889e0cbc8b415f8ccc206cf34c0b2d3f5324e5b
+++ packages/openmoko2/openmoko-icon-theme-standard_svn.bb 3889e0cbc8b415f8ccc206cf34c0b2d3f5324e5b
@@ -0,0 +1,19 @@
+DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.1.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko-base autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http"
+S = "${WORKDIR}/icons"
+
+PACKAGE_ARCH = "all"
+
+pkg_postinst_${PN} () {
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+ gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
+}
+
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session 26f95f7ca147900b49432aadc380a147c5b707f2
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session 26f95f7ca147900b49432aadc380a147c5b707f2
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+SHOWCURSOR="no"
+
+openmoko-today2 &
+openmoko-dialer2 &
+
+matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
+
+exec matchbox-panel-2 --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar
+
============================================================
--- packages/openmoko2/openmoko-session2/matchbox-session 5cebfee4515cb3cb7befc8bcb71bd2ce05de927e
+++ packages/openmoko2/openmoko-session2/matchbox-session 5cebfee4515cb3cb7befc8bcb71bd2ce05de927e
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Very simple session manager for matchbox tools
+#
+
+# Uncomment below to enable parsing of debian menu entrys
+# export MB_USE_DEB_MENUS=1
+
+if [ -e $HOME/.matchbox/session ]
+then
+exec $HOME/.matchbox/session
+fi
+
+if [ -e /etc/matchbox/session ]
+then
+exec /etc/matchbox/session
+fi
+
+# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
+# dont exist.
+
+matchbox-desktop-2 &
+matchbox-panel-2 --orientation south &
+exec matchbox-window-manager $@
============================================================
--- packages/openmoko2/openmoko-session2.bb 9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c
+++ packages/openmoko2/openmoko-session2.bb 9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c
@@ -0,0 +1,30 @@
+DESCRIPTION = "Custom MB session files for poky"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
+RCONFLICTS = "matchbox-common openmoko-session"
+PR = "r20"
+
+SRC_URI = "file://etc file://matchbox-session"
+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
+ chmod -R 755 ${D}/etc
+}
+
+pkg_postinst_openmoko-session2 () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme openmoko-standard-2
+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
+}
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb 63e4490c76e470ecdf213580aa34e8a3c10d1da7
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb 63e4490c76e470ecdf213580aa34e8a3c10d1da7
@@ -0,0 +1,23 @@
+DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+RCONFLICTS = "openmoko-theme-standard"
+PV = "0.1.0+srvn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2008/artwork/themes;module=openmoko-standard-2;proto=http"
+S = "${WORKDIR}/openmoko-standard-2"
+
+do_install() {
+ find ${WORKDIR} -name ".svn" | xargs rm -rf
+ install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0
+ cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
+ rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
+
+ install -d ${D}${sysconfdir}/gtk-2.0
+ echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir} ${sysconfdir}"
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb 19b5a82e4b9df73c893f35975ee0e6717ea38027
+++ packages/openmoko2/openmoko-today2_svn.bb 19b5a82e4b9df73c893f35975ee0e6717ea38027
@@ -0,0 +1,7 @@
+DESCRIPTION = "The OpenMoko Application Launcher"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm"
+
+PV = "0.1.0+srvn${SRCDATE}"
+
+inherit openmoko2 gtk-icon-cache
============================================================
--- packages/qemu/files/makefile.patch 7b6e4a3e609da907d4026cba1f49fec3b972603d
+++ packages/qemu/files/makefile.patch 7b6e4a3e609da907d4026cba1f49fec3b972603d
@@ -0,0 +1,37 @@
+Index: qemu/Makefile
+===================================================================
+--- qemu.orig/Makefile 2007-07-30 18:25:50.000000000 +0200
++++ qemu/Makefile 2007-07-30 18:26:13.000000000 +0200
+@@ -5,14 +5,14 @@
+ .PHONY: all clean distclean dvi info install install-doc tar tarbin \
+ speed test test2 html dvi info
+
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
++CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
+ ifdef CONFIG_DARWIN
+ CFLAGS+= -mdynamic-no-pic
+ endif
+ ifeq ($(ARCH),sparc)
+ CFLAGS+=-mcpu=ultrasparc
+ endif
+-LDFLAGS=-g
++LDFLAGS+=-g
+ LIBS=
+ DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ TOOLS=qemu-img$(EXESUF)
+Index: qemu/Makefile.target
+===================================================================
+--- qemu.orig/Makefile.target 2007-07-30 18:27:17.000000000 +0200
++++ qemu/Makefile.target 2007-07-30 18:27:23.000000000 +0200
+@@ -17,9 +17,9 @@
+ VPATH+=:$(SRC_PATH)/linux-user
+ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
+ endif
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
++CFLAGS+=-Wall -O2 -g -fno-strict-aliasing
+ #CFLAGS+=-Werror
+-LDFLAGS=-g
++LDFLAGS+=-g
+ LIBS=
+ HELPER_CFLAGS=$(CFLAGS)
+ DYNGEN=../dyngen$(EXESUF)
============================================================
--- classes/openmoko-panel-plugin.bbclass ab5e8526c41ab342808418a27680dd97b13f18c3
+++ classes/openmoko-panel-plugin.bbclass 012f38a2bf927dd13a92d1a76a02c43173db369f
@@ -1,6 +1,6 @@ DEPENDS += "matchbox-panel-2"
SECTION = "openmoko/panel-plugin"
DEPENDS += "matchbox-panel-2"
-inherit openmoko
+inherit openmoko2
FILES_${PN} = "${libdir}/matchbox-panel/lib*.so* ${datadir}"
============================================================
--- conf/machine/fic-gta01.conf 1c8e90287feedbc8f33cb1859b4e13cbf1007c10
+++ conf/machine/fic-gta01.conf 466d77dadd32f0dc79d242207f09ccd87533b0aa
@@ -35,8 +35,8 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4
# extra jffs2 tweaks
EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
-# build tools
-EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+# build / upload tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
# tune for S3C24x0
include conf/machine/include/tune-arm920t.conf
============================================================
--- conf/machine/fic-gta02.conf 35a3ed508f3117b908249db21b5778bc4578be37
+++ conf/machine/fic-gta02.conf 02cbabf3237da327316e9124d6c52fce6776baeb
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
#@NAME: FIC GTA02 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#@DESCRIPTION: Machine configuration for the FIC Neo1973.2 GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
@@ -32,10 +32,10 @@ ROOT_FLASH_SIZE = "256"
ROOT_FLASH_SIZE = "256"
# extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
-# build tools
-EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+# build / upload tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
# tune for S3C24x0
include conf/machine/include/tune-arm920t.conf
============================================================
--- packages/bluez/bluez-utils.inc 13716750ab0571681b9e8449ea1ce394c881897e
+++ packages/bluez/bluez-utils.inc 1f441bd0eaa3829668270c8d41ff96df7bc33e8d
@@ -1,7 +1,7 @@ PRIORITY = "optional"
DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
SECTION = "console"
PRIORITY = "optional"
-DEPENDS = "bluez-libs-${PV} dbus cups"
+DEPENDS = "bluez-libs-${PV} libusb dbus cups"
PROVIDES = "bluez-utils-dbus"
RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
RREPLACES = "blu%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list