diff options
| -rw-r--r-- | packages/gsm/files/magician/interpreter-ready.patch | 47 | ||||
| -rw-r--r-- | packages/gsm/libgsmd_svn.bb | 1 | ||||
| -rw-r--r-- | packages/libgpewidget/libgpewidget_0.115.bb | 22 | ||||
| -rw-r--r-- | packages/php/php-native_4.3.10.bb | 5 | ||||
| -rw-r--r-- | packages/php/php-native_4.3.6.bb | 5 | ||||
| -rw-r--r-- | packages/php/php_4.3.10.bb | 1 | ||||
| -rw-r--r-- | packages/php/php_4.3.6.bb | 1 |
7 files changed, 70 insertions, 12 deletions
diff --git a/packages/gsm/files/magician/interpreter-ready.patch b/packages/gsm/files/magician/interpreter-ready.patch new file mode 100644 index 0000000000..cc6b9c6e2b --- /dev/null +++ b/packages/gsm/files/magician/interpreter-ready.patch @@ -0,0 +1,47 @@ +Index: gsm/include/gsmd/gsmd.h +=================================================================== +--- gsm.orig/include/gsmd/gsmd.h 2007-03-29 17:07:10.000000000 +0200 ++++ gsm/include/gsmd/gsmd.h 2007-03-29 17:07:43.000000000 +0200 +@@ -58,6 +58,7 @@ + + struct gsmd { + unsigned int flags; ++ int interpreter_ready; + struct gsmd_fd gfd_uart; + struct gsmd_fd gfd_sock; + struct llparser llp; +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-03-29 17:06:01.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-03-29 17:08:27.000000000 +0200 +@@ -183,6 +183,7 @@ + * an empty string or that 'ready' string, we need to init the modem */ + if (strlen(buf) == 0 || + !strcmp(buf, "AT-Command Interpreter ready")) { ++ g->interpreter_ready = 1; + gsmd_initsettings(g); + return 0; + } +@@ -372,7 +373,7 @@ + } + + /* write pending commands to UART */ +- if (what & GSMD_FD_WRITE) { ++ if ((what & GSMD_FD_WRITE) && g->interpreter_ready) { + struct gsmd_atcmd *pos, *pos2; + llist_for_each_entry_safe(pos, pos2, &g->pending_atcmds, list) { + len = strlen(pos->buf); +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-03-29 17:06:04.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-03-29 17:08:59.000000000 +0200 +@@ -291,7 +291,8 @@ + + gsmd_vendor_plugin_find(&g); + +- gsmd_initsettings(&g); ++ if (g.interpreter_ready) ++ gsmd_initsettings(&g); + + gsmd_opname_init(&g); + diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index d84d363f1a..910fa26d4d 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -12,6 +12,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ S = "${WORKDIR}/gsm" SRC_URI_append_magician = " file://vendor-tihtc.patch;patch=1 \ + file://interpreter-ready.patch;patch=1 \ file://ldisc.patch;patch=1" inherit autotools pkgconfig update-rc.d diff --git a/packages/libgpewidget/libgpewidget_0.115.bb b/packages/libgpewidget/libgpewidget_0.115.bb new file mode 100644 index 0000000000..f679296c71 --- /dev/null +++ b/packages/libgpewidget/libgpewidget_0.115.bb @@ -0,0 +1,22 @@ +LICENSE = "LGPL" +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ cairo libxrender gtk-doc" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools + +SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0" + +PACKAGES =+ "libgpewidget-bin" +FILES_libgpewidget-bin = "${bindir}/*" + +EXTRA_OECONF = "--enable-cairo" + +LDFLAGS += " -L${STAGING_LIBDIR}" + +do_stage () { + autotools_stage_all +} diff --git a/packages/php/php-native_4.3.10.bb b/packages/php/php-native_4.3.10.bb deleted file mode 100644 index c90aa83c01..0000000000 --- a/packages/php/php-native_4.3.10.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "console/network" -require php_${PV}.bb -inherit native -FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" -DEPENDS = "zlib-native" diff --git a/packages/php/php-native_4.3.6.bb b/packages/php/php-native_4.3.6.bb deleted file mode 100644 index c90aa83c01..0000000000 --- a/packages/php/php-native_4.3.6.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "console/network" -require php_${PV}.bb -inherit native -FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" -DEPENDS = "zlib-native" diff --git a/packages/php/php_4.3.10.bb b/packages/php/php_4.3.10.bb deleted file mode 100644 index c15a9ee486..0000000000 --- a/packages/php/php_4.3.10.bb +++ /dev/null @@ -1 +0,0 @@ -require php.inc diff --git a/packages/php/php_4.3.6.bb b/packages/php/php_4.3.6.bb deleted file mode 100644 index c15a9ee486..0000000000 --- a/packages/php/php_4.3.6.bb +++ /dev/null @@ -1 +0,0 @@ -require php.inc |