From: jy910.yun <jy910.yun@samsung.com>
Date: Tue, 3 Sep 2013 12:11:11 +0000 (+0900)
Subject: Merge branch 'tizen_2.2' into tizen
X-Git-Tag: submit/tizen/20130904.062602^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9612df5004c5c3090cf73f5f9730e1b6a24670e9;p=platform%2Fcore%2Fsystem%2Fsystem-server.git

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>
---

9612df5004c5c3090cf73f5f9730e1b6a24670e9
diff --cc CMakeLists.txt
index eda0ddb,f5b867d..f2975ee
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -69,14 -86,32 +87,31 @@@ SET(UDEV_RULES udev-rules/91-system-ser
  
  CONFIGURE_FILE(${UDEV_RULES}.in ${UDEV_RULES} @ONLY)
  
- ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-ldl")
+ # libdeviced
+ ADD_LIBRARY(${DEVICED_NAME} SHARED ${DEVICED_SRCS})
+ TARGET_LINK_LIBRARIES(${DEVICED_NAME} ${pkgs_LDFLAGS})
+ SET_TARGET_PROPERTIES(${DEVICED_NAME} PROPERTIES VERSION ${VERSION})
+ INSTALL(TARGETS ${DEVICED_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
  
+ FOREACH(hfile ${DEVICED_HEADERS})
+ 	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${DEVICED_NAME})
+ ENDFOREACH(hfile)
+ 
+ CONFIGURE_FILE(${DEVICED_NAME}.pc.in ${DEVICED_NAME}.pc @ONLY)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEVICED_NAME}.pc DESTINATION lib/pkgconfig)
+ 
+ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-ldl" "-ludev" "-lsmack")
  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)
+ 
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.service DESTINATION /usr/lib/systemd/system)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.socket  DESTINATION /usr/lib/systemd/system)
  
  ADD_SUBDIRECTORY(restarter)
  ADD_SUBDIRECTORY(sys_event)
diff --cc packaging/system-server.spec
index 751b448,60fd953..49177fc
--- a/packaging/system-server.spec
+++ b/packaging/system-server.spec
@@@ -34,9 -36,24 +36,24 @@@ Requires(postun): /usr/bin/systemct
  %description
  Description: System server
  
+ %package -n libdeviced
+ Summary:    Deviced library
+ Group:      Development/Libraries
+ 
+ %description -n libdeviced
+ Deviced library for device control
+ 
+ %package -n libdeviced-devel
+ Summary:    Deviced library for (devel)
+ Group:      Development/Libraries
+ Requires:   libdeviced = %{version}-%{release}
+ 
+ %description -n libdeviced-devel
+ Deviced library for device control (devel)
+ 
  %prep
  %setup -q
 -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 +%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
  
  %build
  cp %{SOURCE2} .
@@@ -46,9 -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
- install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/system-server.service
++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
  
@@@ -132,11 -159,22 +151,22 @@@ systemctl daemon-reloa
  %endif
  %{_bindir}/movi_format.sh
  %{_bindir}/sys_event
- %{_bindir}/sys_device_noti
  %{_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
- %{_datadir}/system-server/sys_device_noti/batt_full_icon.png
++%{_unitdir}/system-server.socket
  %{_datadir}/system-server/udev-rules/91-system-server.rules
- %{_datadir}/system-server/sys_device_noti/res/locale/*/LC_MESSAGES/*.mo
  %{_datadir}/system-server/sys_pci_noti/res/locale/*/LC_MESSAGES/*.mo
+ 
+ %files -n libdeviced
+ %defattr(-,root,root,-)
+ %{_libdir}/libdeviced.so.*
+ %manifest deviced.manifest
+ 
+ %files -n libdeviced-devel
+ %defattr(-,root,root,-)
+ %{_includedir}/deviced/dd-battery.h
+ %{_libdir}/libdeviced.so
+ %{_libdir}/pkgconfig/deviced.pc