Add wayland support in core-efl.target

In wayland segment, launch weston.target instead of Xorg.target.

Change-Id: I8f4079e2699124e1529d63c0a7ac28a4427dc427
Signed-off-by: Alex Wu <zhiwen.wu@linux.intel.com>

diff --git a/packaging/app-core.spec b/packaging/app-core.spec
index d0f88df..c6bd884 100644 (file)
--- a/packaging/app-core.spec
+++ b/packaging/app-core.spec
@@ -1,3 +1,5 @@
+%bcond_with wayland
+
 Name:       app-core
 Summary:    Application basic
 Version:    1.2
@@ -5,7 +7,11 @@ Release:    48
 Group:      Application Framework
 License:    Apache License, Version 2.0
 Source0:    app-core-%{version}.tar.gz
-Source101:  packaging/core-efl.target
+%if %{with wayland}
+Source101:  packaging/core-efl-wayland.target
+%else
+Source101:  packaging/core-efl-x.target
+%endif
 Source1001:    app-core.manifest
 BuildRequires:  pkgconfig(sensor)
 BuildRequires:  pkgconfig(vconf)
@@ -87,7 +93,7 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 install -d %{buildroot}%{_unitdir_user}/core-efl.target.wants
-install -m0644 %{SOURCE101} %{buildroot}%{_unitdir_user}
+install -m0644 %{SOURCE101} %{buildroot}%{_unitdir_user}/core-efl.target
 
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}

diff --git a/packaging/core-efl-wayland.target b/packaging/core-efl-wayland.target
new file mode 100644 (file)
index 0000000..c3fb723
--- /dev/null
+++ b/packaging/core-efl-wayland.target
@@ -0,0 +1,15 @@
+#
+# This virtual unit maps the default core components and their dependencies.
+#
+# The real desktop services should go into the final desktop target
+# folder, which should require this virtual target. While starting
+# up, systemd will assure that the core EFL and daemons start before
+# anything else. After the core target finishes, dependencies should
+# not matter too much anymore and less fine-grained dependencies can
+# be used.
+#
+
+[Unit]
+Description=Core EFL UI target
+After=weston.target
+Requires=weston.target

diff --git a/packaging/core-efl-x.target b/packaging/core-efl-x.target
new file mode 100644 (file)
index 0000000..67ec56e
--- /dev/null
+++ b/packaging/core-efl-x.target
@@ -0,0 +1,15 @@
+#
+# This virtual unit maps the default core components and their dependencies.
+#
+# The real desktop services should go into the final desktop target
+# folder, which should require this virtual target. While starting
+# up, systemd will assure that the core EFL and daemons start before
+# anything else. After the core target finishes, dependencies should
+# not matter too much anymore and less fine-grained dependencies can
+# be used.
+#
+
+[Unit]
+Description=Core EFL UI target
+After=xorg.target
+Requires=xorg.target