From: Maciej Wereski <m.wereski@partner.samsung.com>
Date: Fri, 28 Mar 2014 09:20:26 +0000 (+0100)
Subject: Add kdbus support
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac5c7ad69481a655e98e7109aa23dce341256b29;p=platform%2Fupstream%2Fmeta-generic.git

Add kdbus support

Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
---

diff --git a/generic-repos.yaml b/generic-repos.yaml
index cccba81..5c39500 100644
--- a/generic-repos.yaml
+++ b/generic-repos.yaml
@@ -15,3 +15,6 @@ Repositories:
         Url:  http://download.tizen.org/snapshots/tizen/generic/generic-x11-x86_64/@BUILD_ID@/repos/generic/@ARCH@/packages/
         Options: --ssl_verify=no
 
+    -   Name: override
+        Url: file:///usr/local/share/repos/kdbus/
+        Options:
diff --git a/generic.yaml b/generic.yaml
index 85bcca9..b77675b 100644
--- a/generic.yaml
+++ b/generic.yaml
@@ -11,13 +11,14 @@ Default:
     DefaultUser: tizen
     DefaultUserPass: tizen
     BootLoader: True
-    BootloaderAppend: "rw vga=current splash rootwait rootfstype=ext4 plymouth.enable=0"
+    BootloaderAppend: "rw vga=current splash rootwait rootfstype=ext4 plymouth.enable=0 loglevel=7 kdbus"
     BootloaderTimeout: 3
     BootloaderOptions: '--ptable=gpt --menus="install:Wipe and Install:systemd.unit=system-installer.service:test"'
     StartX: False
     Desktop: None
     Repos:
         - Generic
+        - override
     SaveRepos: False
     UserGroups: "audio,video"
     Groups:
diff --git a/scripts/generic-webkit.post b/scripts/generic-webkit.post
index c41b119..526e35a 100644
--- a/scripts/generic-webkit.post
+++ b/scripts/generic-webkit.post
@@ -8,7 +8,8 @@
 #  - WRT_PROCESS_POOL_DISABLE is a work around for TIVI-2062
 if [ -x /usr/bin/weston ]; then
 	cat > /etc/sysconfig/wrt <<EOF
-DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket
+DBUS_SESSION_BUS_ADDRESS="kernel:path=/dev/kdbus/5000-user/bus;unix:path=/run/user/5000/dbus/user_bus_socket"
+DBUS_SYSTEM_BUS_ADDRESS=kernel:path=/dev/kdbus/0-system/bus
 XDG_RUNTIME_DIR=/run/user/5000
 ELM_ENGINE=wayland_egl
 ECORE_EVAS_ENGINE=wayland_egl