Merge branch 'tizen_2.2' into tizen

Conflicts:
	packaging/system-server.manifest
	packaging/system-server.spec
	ss_predefine.c

Signed-off-by: jy910.yun <jy910.yun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5b867d..f2975ee 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,6 +75,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 MESSAGE("FLAGS: ${CMAKE_C_FLAGS}")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-DPREDEFINE_SO_DIR=\"${LIB_INSTALL_DIR}/ss_predefine/\"")
 ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"")
 IF( $ENV{ARCH} MATCHES "arm" )
        ADD_DEFINITIONS("-DTARGET")
@@ -105,7 +106,6 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
 INSTALL(FILES ${MOVINAND_FORMAT} DESTINATION bin)
 INSTALL(FILES ${UDEV_RULES} DESTINATION ${UDEV_RULES_PATH})
-INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/system_server.sh DESTINATION /etc/rc.d/init.d)
 INSTALL(FILES system-server.conf DESTINATION /etc/dbus-1/system.d)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/system-server.rule DESTINATION /opt/etc/smack/accesses.d)
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/mmc-smack-label DESTINATION bin)

diff --git a/packaging/system-server.changes b/packaging/system-server.changes
new file mode 100644 (file)
index 0000000..0eff37a
--- /dev/null
+++ b/packaging/system-server.changes
@@ -0,0 +1,8 @@
+* Thu Aug 22 2013 Maciej Wereski <m.wereski@partner.samsung.com> accepted/tizen/20130710.221248@a1019c4
+- fix typo in udev rules
+
+* Thu Aug 22 2013 Maciej Wereski <m.wereski@partner.samsung.com> accepted/tizen/20130710.221248@414edb6
+- Remove initscripts
+
+* Wed May 29 2013 Baptiste DURAND <baptiste.durand@eurogiciel.fr> 2.1b_release@3310617
+- Fix compatibility for x64 arch.

diff --git a/packaging/system-server.spec b/packaging/system-server.spec
index 60fd953..49177fc 100755 (executable)
--- a/packaging/system-server.spec
+++ b/packaging/system-server.spec
@@ -53,7 +53,7 @@ Deviced library for device control (devel)
 
 %prep
 %setup -q
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 
 %build
 cp %{SOURCE2} .
@@ -64,15 +64,10 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d/
-ln -s %{_sysconfdir}/init.d/system_server.sh %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S35system-server
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d/
-ln -s %{_sysconfdir}/init.d/system_server.sh %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S00system-server
-
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-mkdir -p %{buildroot}%{_libdir}/systemd/system/sockets.target.wants
-ln -s ../system-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/system-server.service
-ln -s ../system-server.service %{buildroot}%{_libdir}/systemd/system/sockets.target.wants/system-server.socket
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
+ln -s ../system-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/system-server.service
+ln -s ../system-server.service %{buildroot}%{_unitdir}/sockets.target.wants/system-server.socket
 
 %post
 
@@ -145,11 +140,8 @@ systemctl daemon-reload
 
 
 %files
-%manifest system-server.manifest
+%manifest %{name}.manifest
 %config %{_sysconfdir}/dbus-1/system.d/system-server.conf
-%{_sysconfdir}/rc.d/init.d/system_server.sh
-%{_sysconfdir}/rc.d/rc3.d/S35system-server
-%{_sysconfdir}/rc.d/rc5.d/S00system-server
 %{_bindir}/system_server
 /opt/etc/smack/accesses.d/system-server.rule
 %if 0%{?simulator}
@@ -161,10 +153,10 @@ systemctl daemon-reload
 %{_bindir}/sys_event
 %{_bindir}/sys_pci_noti
 %{_bindir}/mmc-smack-label
-%{_libdir}/systemd/system/multi-user.target.wants/system-server.service
-%{_libdir}/systemd/system/sockets.target.wants/system-server.socket
-%{_libdir}/systemd/system/system-server.service
-%{_libdir}/systemd/system/system-server.socket
+%{_unitdir}/multi-user.target.wants/system-server.service
+%{_unitdir}/sockets.target.wants/system-server.socket
+%{_unitdir}/system-server.service
+%{_unitdir}/system-server.socket
 %{_datadir}/system-server/udev-rules/91-system-server.rules
 %{_datadir}/system-server/sys_pci_noti/res/locale/*/LC_MESSAGES/*.mo
 

diff --git a/predefine_act_plugin/CMakeLists.txt b/predefine_act_plugin/CMakeLists.txt
index 100c04f..e1b4b73 100644 (file)
--- a/predefine_act_plugin/CMakeLists.txt
+++ b/predefine_act_plugin/CMakeLists.txt
@@ -1,11 +1,9 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(xxx-predefine C)
-
 SET(SRCS xxx-predefine.c) 
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 SET(VERSION 1.0)
  
@@ -34,5 +32,5 @@ SET(CMAKE_LDFLAGS "-Wl,zdefs")
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 

diff --git a/system_server.sh b/system_server.sh
deleted file mode 100644 (file)
index 3db1e64..0000000
--- a/system_server.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/bin/system_server &