diff options
Diffstat (limited to 'meta-ivi/recipes-core-ivi')
| -rw-r--r-- | meta-ivi/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch | 10 | ||||
| -rw-r--r-- | meta-ivi/recipes-core-ivi/base-passwd/base-passwd_3.5.29.bbappend | 6 | ||||
| -rw-r--r-- | meta-ivi/recipes-core-ivi/busybox/busybox/defconfig (renamed from meta-ivi/recipes-core-ivi/busybox/busybox-1.21.1/defconfig) | 0 | ||||
| -rw-r--r-- | meta-ivi/recipes-core-ivi/busybox/busybox_1.22.1.bbappend | 2 | ||||
| -rw-r--r-- | meta-ivi/recipes-core-ivi/busybox/busybox_1.23.1.bbappend | 8 | ||||
| -rw-r--r-- | meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-send-with-reply-set-notify.patch | 201 | ||||
| -rw-r--r-- | meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend | 5 |
7 files changed, 213 insertions, 19 deletions
diff --git a/meta-ivi/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch b/meta-ivi/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch deleted file mode 100644 index 320841e..0000000 --- a/meta-ivi/recipes-core-ivi/base-passwd/base-passwd/add-default-root-pass.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: base-passwd/passwd.master -=================================================================== ---- base-passwd.orig/passwd.master 2012-03-15 16:45:58.149968908 +0200 -+++ base-passwd/passwd.master 2012-03-15 16:47:26.094468934 +0200 -@@ -1,4 +1,4 @@ --root::0:0:root:/root:/bin/sh -+root:\$1\$1DO/lR8M\$f8JOOu4W8GBZzdNzCgSW40:0:0:root:/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh diff --git a/meta-ivi/recipes-core-ivi/base-passwd/base-passwd_3.5.29.bbappend b/meta-ivi/recipes-core-ivi/base-passwd/base-passwd_3.5.29.bbappend deleted file mode 100644 index 46146cc..0000000 --- a/meta-ivi/recipes-core-ivi/base-passwd/base-passwd_3.5.29.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" - -# Set "root" as password for user "root" -SRC_URI += " \ - file://add-default-root-pass.patch \ - " diff --git a/meta-ivi/recipes-core-ivi/busybox/busybox-1.21.1/defconfig b/meta-ivi/recipes-core-ivi/busybox/busybox/defconfig index 6094166..6094166 100644 --- a/meta-ivi/recipes-core-ivi/busybox/busybox-1.21.1/defconfig +++ b/meta-ivi/recipes-core-ivi/busybox/busybox/defconfig diff --git a/meta-ivi/recipes-core-ivi/busybox/busybox_1.22.1.bbappend b/meta-ivi/recipes-core-ivi/busybox/busybox_1.22.1.bbappend deleted file mode 100644 index 14ee104..0000000 --- a/meta-ivi/recipes-core-ivi/busybox/busybox_1.22.1.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}-${PV}" -SRC_URI += "file://defconfig" diff --git a/meta-ivi/recipes-core-ivi/busybox/busybox_1.23.1.bbappend b/meta-ivi/recipes-core-ivi/busybox/busybox_1.23.1.bbappend new file mode 100644 index 0000000..d368d16 --- /dev/null +++ b/meta-ivi/recipes-core-ivi/busybox/busybox_1.23.1.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI += "file://defconfig" + +# Defconfig doesn't have syslog activated +# Adapt if needed in the future +SYSTEMD_PACKAGES_remove = "${PN}-syslog" +INITSCRIPT_PACKAGES_remove = "${PN}-syslog" +ALTERNATIVE_${PN}-syslog_remove = "syslog-conf" diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-send-with-reply-set-notify.patch b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-send-with-reply-set-notify.patch new file mode 100644 index 0000000..3f92169 --- /dev/null +++ b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-send-with-reply-set-notify.patch @@ -0,0 +1,201 @@ +From 1dcacc908826f59b580bd1d1a7541fb919d4bd97 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=BCrgen=20Gehring?= <juergen.gehring@bmw.de> +Date: Thu, 23 Apr 2015 02:15:06 -0700 +Subject: [PATCH] Add dbus_connection_send_with_reply_set_notify function for + proper thread handling + +--- + dbus/dbus-connection.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++++ + dbus/dbus-connection.h | 10 ++++ + 2 files changed, 165 insertions(+) + +diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c +index e1068e3..233f179 100644 +--- a/dbus/dbus-connection.c ++++ b/dbus/dbus-connection.c +@@ -3482,6 +3482,161 @@ dbus_connection_send_with_reply (DBusConnection *connection, + } + + /** ++ * Queues a message to send, as with dbus_connection_send(), ++ * but also returns a #DBusPendingCall used to receive a reply to the ++ * message. If no reply is received in the given timeout_milliseconds, ++ * this function expires the pending reply and generates a synthetic ++ * error reply (generated in-process, not by the remote application) ++ * indicating that a timeout occurred. ++ * ++ * A #DBusPendingCall will see a reply message before any filters or ++ * registered object path handlers. See dbus_connection_dispatch() for ++ * details on when handlers are run. ++ * ++ * A #DBusPendingCall will always see exactly one reply message, ++ * unless it's cancelled with dbus_pending_call_cancel(). ++ * ++ * If #NULL is passed for the pending_return, the #DBusPendingCall ++ * will still be generated internally, and used to track ++ * the message reply timeout. This means a timeout error will ++ * occur if no reply arrives, unlike with dbus_connection_send(). ++ * ++ * If -1 is passed for the timeout, a sane default timeout is used. -1 ++ * is typically the best value for the timeout for this reason, unless ++ * you want a very short or very long timeout. If #DBUS_TIMEOUT_INFINITE is ++ * passed for the timeout, no timeout will be set and the call will block ++ * forever. ++ * ++ * @warning if the connection is disconnected or you try to send Unix ++ * file descriptors on a connection that does not support them, the ++ * #DBusPendingCall will be set to #NULL, so be careful with this. ++ * ++ * @param connection the connection ++ * @param message the message to send ++ * @param pending_return return location for a #DBusPendingCall ++ * object, or #NULL if connection is disconnected or when you try to ++ * send Unix file descriptors on a connection that does not support ++ * them. ++ * @param timeout_milliseconds timeout in milliseconds, -1 (or ++ * #DBUS_TIMEOUT_USE_DEFAULT) for default or #DBUS_TIMEOUT_INFINITE for no ++ * timeout ++ * @returns #FALSE if no memory, #TRUE otherwise. ++ * ++ */ ++dbus_bool_t ++dbus_connection_send_with_reply_set_notify (DBusConnection *connection, ++ DBusMessage *message, ++ DBusPendingCall **pending_return, ++ DBusPendingCallNotifyFunction function0, ++ void *user_data0, ++ DBusFreeFunction free_user_data0, ++ int timeout_milliseconds) ++{ ++ DBusPendingCall *pending; ++ dbus_int32_t serial = -1; ++ DBusDispatchStatus status; ++ ++ _dbus_return_val_if_fail (connection != NULL, FALSE); ++ _dbus_return_val_if_fail (message != NULL, FALSE); ++ _dbus_return_val_if_fail (timeout_milliseconds >= 0 || timeout_milliseconds == -1, FALSE); ++ ++ if (pending_return) ++ *pending_return = NULL; ++ ++ CONNECTION_LOCK (connection); ++ ++#ifdef HAVE_UNIX_FD_PASSING ++ ++ if (!_dbus_transport_can_pass_unix_fd(connection->transport) && ++ message->n_unix_fds > 0) ++ { ++ /* Refuse to send fds on a connection that cannot handle ++ them. Unfortunately we cannot return a proper error here, so ++ the best we can do is return TRUE but leave *pending_return ++ as NULL. */ ++ CONNECTION_UNLOCK (connection); ++ return TRUE; ++ } ++ ++#endif ++ ++ if (!_dbus_connection_get_is_connected_unlocked (connection)) ++ { ++ CONNECTION_UNLOCK (connection); ++ ++ return TRUE; ++ } ++ ++ pending = _dbus_pending_call_new_unlocked (connection, ++ timeout_milliseconds, ++ reply_handler_timeout); ++ ++ if (pending == NULL) ++ { ++ CONNECTION_UNLOCK (connection); ++ return FALSE; ++ } ++ ++ if (!dbus_pending_call_set_notify(pending, function0, user_data0, free_user_data0)) ++ { ++ CONNECTION_UNLOCK (connection); ++ return FALSE; ++ } ++ ++ /* Assign a serial to the message */ ++ serial = dbus_message_get_serial (message); ++ if (serial == 0) ++ { ++ serial = _dbus_connection_get_next_client_serial (connection); ++ dbus_message_set_serial (message, serial); ++ } ++ ++ if (!_dbus_pending_call_set_timeout_error_unlocked (pending, message, serial)) ++ goto error; ++ ++ /* Insert the serial in the pending replies hash; ++ * hash takes a refcount on DBusPendingCall. ++ * Also, add the timeout. ++ */ ++ if (!_dbus_connection_attach_pending_call_unlocked (connection, ++ pending)) ++ goto error; ++ ++ if (!_dbus_connection_send_unlocked_no_update (connection, message, NULL)) ++ { ++ _dbus_connection_detach_pending_call_and_unlock (connection, ++ pending); ++ goto error_unlocked; ++ } ++ ++ if (pending_return) ++ *pending_return = pending; /* hand off refcount */ ++ else ++ { ++ _dbus_connection_detach_pending_call_unlocked (connection, pending); ++ /* we still have a ref to the pending call in this case, we unref ++ * after unlocking, below ++ */ ++ } ++ ++ status = _dbus_connection_get_dispatch_status_unlocked (connection); ++ ++ /* this calls out to user code */ ++ _dbus_connection_update_dispatch_status_and_unlock (connection, status); ++ ++ if (pending_return == NULL) ++ dbus_pending_call_unref (pending); ++ ++ return TRUE; ++ ++ error: ++ CONNECTION_UNLOCK (connection); ++ error_unlocked: ++ dbus_pending_call_unref (pending); ++ return FALSE; ++} ++ ++/** + * Sends a message and blocks a certain time period while waiting for + * a reply. This function does not reenter the main loop, + * i.e. messages other than the reply are queued up but not +diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h +index fe4d04e..e8cedf1 100644 +--- a/dbus/dbus-connection.h ++++ b/dbus/dbus-connection.h +@@ -229,6 +229,16 @@ dbus_bool_t dbus_connection_send_with_reply (DBusConnection + DBusMessage *message, + DBusPendingCall **pending_return, + int timeout_milliseconds); ++ ++DBUS_EXPORT ++dbus_bool_t dbus_connection_send_with_reply_set_notify (DBusConnection *connection, ++ DBusMessage *message, ++ DBusPendingCall **pending_return, ++ DBusPendingCallNotifyFunction function0, ++ void * user_data0, ++ DBusFreeFunction free_user_data0, ++ int timeout_milliseconds); ++ + DBUS_EXPORT + DBusMessage * dbus_connection_send_with_reply_and_block (DBusConnection *connection, + DBusMessage *message, +-- +1.9.1 + diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend b/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend index cf7f64f..495f219 100644 --- a/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend +++ b/meta-ivi/recipes-core-ivi/dbus/dbus_%.bbappend @@ -9,7 +9,10 @@ SRC_URI_AFBUS = "" # add support for GENIVI CommonAPI D-Bus runtime # - http://projects.genivi.org/commonapi/ -SRC_URI_COMMONAPI = "file://dbus-DBusMessage-add-support-for-custom-marshaling.patch" +SRC_URI_COMMONAPI = " \ + file://dbus-DBusMessage-add-support-for-custom-marshaling.patch \ + file://capi-dbus-add-send-with-reply-set-notify.patch \ + " SRC_URI_append = "\ ${SRC_URI_AFBUS} \ |