emuld: merged from master branch

Change-Id: I7296fbdcc17f68f03629319d9a305c15553c271d
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

diff --git a/emuld b/emuld
new file mode 100755 (executable)
index 0000000..7f13703
--- /dev/null
+++ b/emuld
@@ -0,0 +1,3 @@
+/usr/bin/emuld &
+/usr/sbin/sensord &
+/etc/emulator/sensor_setting.sh &

diff --git a/emuld.service b/emuld.service
index 2d3110fef93acd7d4912acb2b616255d80b760df..1d9173fe58f4209c715e4afec776bfd1a2aa8b87 100644 (file)
--- a/emuld.service
+++ b/emuld.service
@@ -1,7 +1,10 @@
 [Unit]
-Description=Common control daemon for emulator
-After=multi-user.target
+Description=Daemon for emulator
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/emuld
+
+[Install]
+WantedBy=emulator.target
+

diff --git a/include/emuld.h b/include/emuld.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/packaging/emuld.spec b/packaging/emuld.spec
index d029b4353290c76b2415b8f0d9ec4392acfe1b68..b8b37a410ec82a8df9fa677d16e026ba7586e5b6 100755 (executable)
--- a/packaging/emuld.spec
+++ b/packaging/emuld.spec
@@ -15,19 +15,30 @@ BuildRequires:  pkgconfig(vconf)
 %setup -q
 
 %build
-export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"    
-    
+export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
+
 LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 
 make
 
 %install
+#for systemd
 rm -rf %{buildroot}
-if [ ! -d %{buildroot}/usr/lib/systemd/system/multi-user.target.wants ]; then
-    mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
+if [ ! -d %{buildroot}/usr/lib/systemd/system/emulator.target.wants ]; then
+    mkdir -p %{buildroot}/usr/lib/systemd/system/emulator.target.wants
 fi
 cp emuld.service %{buildroot}/usr/lib/systemd/system/.
-ln -s ../emuld.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/emuld.service
+ln -s ../emuld.service %{buildroot}/usr/lib/systemd/system/emulator.target.wants/emuld.service
+
+#for legacy init
+if [ ! -d %{buildroot}/etc/init.d ]; then
+    mkdir -p %{buildroot}/etc/init.d
+fi
+cp emuld %{buildroot}/etc/init.d/.
+if [ ! -d %{buildroot}/etc/rc.d/rc3.d ]; then
+    mkdir -p %{buildroot}/etc/rc.d/rc3.d
+fi
+ln -s /etc/init.d/emuld %{buildroot}/etc/rc.d/rc3.d/S04emuld
 
 %make_install
 
@@ -50,6 +61,8 @@ touch /opt/nfc/sdkMsg
 %defattr(-,root,root,-)
 %{_prefix}/bin/emuld
 /usr/lib/systemd/system/emuld.service
-/usr/lib/systemd/system/multi-user.target.wants/emuld.service
+/usr/lib/systemd/system/emulator.target.wants/emuld.service
+/etc/init.d/emuld
+/etc/rc.d/rc3.d/S04emuld
 
 %changelog