Merge branch 'master' into systemd

diff --git a/packaging/app-core.spec b/packaging/app-core.spec
index c4ec025..93a8eb9 100644 (file)
--- a/packaging/app-core.spec
+++ b/packaging/app-core.spec
@@ -6,6 +6,7 @@ Release:    34
 Group:      TO_BE/FILLED_IN
 License:    Apache License, Version 2.0
 Source0:    app-core-%{version}.tar.gz
+Source101:  packaging/core-efl.target
 BuildRequires:  pkgconfig(sensor)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(aul)
@@ -86,6 +87,8 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 %make_install
+install -d %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants
+install -m0644 %{SOURCE101} %{buildroot}%{_libdir}/systemd/user/
 
 
 %post efl -p /sbin/ldconfig
@@ -115,6 +118,8 @@ rm -rf %{buildroot}
 %manifest app-core.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libappcore-common.so.*
+%{_libdir}/systemd/user/core-efl.target
+%{_libdir}/systemd/user/core-efl.target.wants/
 
 %files common-devel
 %defattr(-,root,root,-)

diff --git a/packaging/core-efl.target b/packaging/core-efl.target
new file mode 100644 (file)
index 0000000..67ec56e
--- /dev/null
+++ b/packaging/core-efl.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