summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-01-03 23:38:29 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-03 23:38:29 +0000
commit00f830a1dc2c74a8052f85e3a42801d65cf1e9f2 (patch)
tree8bc3ec9bf5de23160c21f22b068e70cfe15f6545
parent07e1fc5185995fe409ecc8bf0f1ec1d30ae71bcc (diff)
parent02c830b4fad1bf2ec28d1fa9df1188709187912e (diff)
explicit_merge of '12e4d92e98860b8d7e48bdb73bfd9efb0e0a7c21'
and '7de90a055904c4af8890dd5ae8c192bfd41b3fa1' using ancestor '' to branch 'org.openembedded.dev'
-rw-r--r--packages/gpe-autostarter/gpe-autostarter-0.11/.mtn2git_empty0
-rw-r--r--packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch66
-rw-r--r--packages/gpe-autostarter/gpe-autostarter_0.11.bb2
-rw-r--r--packages/gpe-beam/gpe-beam-0.2.8/.mtn2git_empty0
-rw-r--r--packages/gpe-beam/gpe-beam-0.2.8/dbus-new-api.patch76
-rw-r--r--packages/gpe-beam/gpe-beam_0.2.8.bb1
-rw-r--r--packages/linux/handhelds-pxa-2.6_cvs.bb3
-rw-r--r--packages/setserial/setserial_2.17.bb4
8 files changed, 152 insertions, 0 deletions
diff --git a/packages/gpe-autostarter/gpe-autostarter-0.11/.mtn2git_empty b/packages/gpe-autostarter/gpe-autostarter-0.11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-autostarter/gpe-autostarter-0.11/.mtn2git_empty
diff --git a/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch b/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch
new file mode 100644
index 0000000000..05fbdde501
--- /dev/null
+++ b/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch
@@ -0,0 +1,66 @@
+--- gpe-autostarter-0.11/autostarter.c.orig 2005-08-29 19:39:10 +0200
++++ gpe-autostarter-0.11/autostarter.c 2005-08-29 19:42:01 +0200
+@@ -50,7 +50,11 @@
+ if (type != DBUS_TYPE_STRING)
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
++#ifndef DBUS_INTERFACE_LOCAL
+ subsys = dbus_message_iter_get_string (&iter);
++#else
++ dbus_message_iter_get_basic (&iter, &subsys);
++#endif
+
+ if (!strcmp (subsys, "net"))
+ return handle_net_message (message, &iter);
+@@ -72,7 +72,11 @@
+ return autostarter_handle_dbus_request (connection, message);
+
+ if (dbus_message_is_signal (message,
++#ifndef DBUS_INTERFACE_LOCAL
+ DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
++#else
++ DBUS_INTERFACE_LOCAL,
++#endif
+ "Disconnected"))
+ exit (0);
+
+--- gpe-autostarter-0.11/bluetooth.c.orig 2005-08-29 19:36:33 +0200
++++ gpe-autostarter-0.11/bluetooth.c 2005-08-29 19:41:43 +0200
+@@ -40,7 +40,11 @@
+ if (type != DBUS_TYPE_STRING)
+ return;
+
++#ifndef DBUS_INTERFACE_LOCAL
+ action = dbus_message_iter_get_string (iter);
++#else
++ dbus_message_iter_get_basic (iter, &action);
++#endif
+
+ if (! strcmp (action, "register") || ! strcmp (action, "add"))
+ {
+--- gpe-autostarter-0.11/net.c.orig 2005-08-29 19:36:29 +0200
++++ gpe-autostarter-0.11/net.c 2005-08-29 19:41:29 +0200
+@@ -97,7 +97,11 @@
+ if (type != DBUS_TYPE_STRING)
+ return;
+
++#ifndef DBUS_INTERFACE_LOCAL
+ action = dbus_message_iter_get_string (iter);
++#else
++ dbus_message_iter_get_basic (iter, &action);
++#endif
+
+ if (! dbus_message_iter_next (iter))
+ return;
+@@ -106,7 +106,11 @@
+ if (type != DBUS_TYPE_STRING)
+ return;
+
++#ifndef DBUS_INTERFACE_LOCAL
+ interface = dbus_message_iter_get_string (iter);
++#else
++ dbus_message_iter_get_basic (iter, &interface);
++#endif
+
+ if (! strcmp (action, "register") || ! strcmp (action, "add"))
+ {
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
index 555134889b..e670c168d3 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
@@ -4,3 +4,5 @@ RDEPENDS = "hotplug-dbus"
LICENSE = "GPL"
inherit gpe
+
+SRC_URI += " file://dbus-new-api.patch;patch=1"
diff --git a/packages/gpe-beam/gpe-beam-0.2.8/.mtn2git_empty b/packages/gpe-beam/gpe-beam-0.2.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-beam/gpe-beam-0.2.8/.mtn2git_empty
diff --git a/packages/gpe-beam/gpe-beam-0.2.8/dbus-new-api.patch b/packages/gpe-beam/gpe-beam-0.2.8/dbus-new-api.patch
new file mode 100644
index 0000000000..723ba64194
--- /dev/null
+++ b/packages/gpe-beam/gpe-beam-0.2.8/dbus-new-api.patch
@@ -0,0 +1,76 @@
+--- gpe-beam-0.2.7/dbus.c.orig 2005-08-29 21:05:28 +0200
++++ gpe-beam-0.2.7/dbus.c 2005-08-29 21:07:11 +0200
+@@ -40,7 +40,11 @@
+ return obex_client_handle_dbus_request (connection, message);
+
+ if (dbus_message_is_signal (message,
++#ifndef DBUS_INTERFACE_LOCAL
+ DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
++#else
++ DBUS_INTERFACE_LOCAL,
++#endif
+ "Disconnected"))
+ exit (0);
+
+@@ -70,10 +70,18 @@
+
+ dbus_connection_register_object_path (connection, object_path, &dbus_obex_vtable, NULL);
+
++#ifndef DBUS_INTERFACE_LOCAL
+ dbus_bus_acquire_service (connection, SERVICE_NAME, 0, &error);
++#else
++ dbus_bus_request_name (connection, SERVICE_NAME, 0, &error);
++#endif
+ if (dbus_error_is_set (&error))
+ {
++#ifndef DBUS_INTERFACE_LOCAL
+ gpe_error_box_fmt (_("Failed to acquire service: %s"), error.message);
++#else
++ gpe_error_box_fmt (_("Failed to request name: %s"), error.message);
++#endif
+ dbus_error_free (&error);
+ }
+ }
+--- gpe-beam-0.2.7/obexclient-dbus.c.orig 2005-08-29 21:05:33 +0200
++++ gpe-beam-0.2.7/obexclient-dbus.c 2005-08-29 21:10:00 +0200
+@@ -73,7 +73,11 @@
+ if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING)
+ goto wrong_args;
+
++#ifndef DBUS_INTERFACE_LOCAL
+ filename = dbus_message_iter_get_string (&iter);
++#else
++ dbus_message_iter_get_basic (&iter, &filename);
++#endif
+
+ if (!dbus_message_iter_next (&iter))
+ goto wrong_args;
+@@ -81,16 +81,28 @@
+ if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING)
+ goto wrong_args;
+
++#ifndef DBUS_INTERFACE_LOCAL
+ mime_type = dbus_message_iter_get_string (&iter);
++#else
++ dbus_message_iter_get_basic (&iter, &mime_type);
++#endif
+
+ if (!dbus_message_iter_next (&iter))
+ goto wrong_args;
+
+ if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_ARRAY
++#ifndef DBUS_INTERFACE_LOCAL
+ || dbus_message_iter_get_array_type (&iter) != DBUS_TYPE_BYTE)
++#else
++ || dbus_message_iter_get_element_type (&iter) != DBUS_TYPE_BYTE)
++#endif
+ goto wrong_args;
+
++#ifndef DBUS_INTERFACE_LOCAL
+ dbus_message_iter_get_byte_array (&iter, &data, &len);
++#else
++ dbus_message_iter_get_fixed_array (&iter, &data, &len);
++#endif
+
+ reply = dbus_message_new_method_return (message);
+ if (!reply)
diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb
index d55cd6db60..b8e69d6b11 100644
--- a/packages/gpe-beam/gpe-beam_0.2.8.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.8.bb
@@ -10,3 +10,4 @@ PRIORITY = "optional"
MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
LICENSE = "GPL"
+SRC_URI += "file://dbus-new-api.patch;patch=1"
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index 9b3c5822bf..dca6a8c254 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -16,6 +16,9 @@ S = "${WORKDIR}/kernel26"
inherit kernel
+FILES_kernel-image_ipaq-pxa270 = ""
+ALLOW_EMPTY_ipaq_pxa270 = 1
+
K_MAJOR = "2"
K_MINOR = "6"
K_MICRO = "13"
diff --git a/packages/setserial/setserial_2.17.bb b/packages/setserial/setserial_2.17.bb
index 5d774ff6a3..fb131cb0b1 100644
--- a/packages/setserial/setserial_2.17.bb
+++ b/packages/setserial/setserial_2.17.bb
@@ -10,3 +10,7 @@ do_install() {
install -d ${D}${mandir}
autotools_do_install
}
+
+do_stage() {
+ :
+}