From 4544c94913dee91c066fb5bba618c0cffc2f7215 Mon Sep 17 00:00:00 2001 From: Corentin Lecouvey Date: Tue, 27 May 2014 19:43:33 +0200 Subject: [PATCH] Make system-server start and run on tizen-common MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * packaging: fix regpmon and set_pmon installation These binaries were provided by system-server and sysman sub-package. It conducts to an rpm conflict at installation time. This fix generates correct binaries and only provide them in system-server package. * packaging: massive clean up - remove useless system-server sub-package - remove useless Apache-2.0 license sub-package - remove useless systemd require(post/postun/preun) dependencies - remove useless buildroot deletion in %install section - gather all of the %post/%postun scriptlets above %files sections - fix sysman sub-package dependencies * Removed references to (useless) missing file. * deviced.conf supersedes system-server.conf * Removed useless and confusing files from utils/ (bash scripts and one ARM binary(!)) * system-server.socket goes to sockets.target.wants, system-server.service goes to multi-user.target.wants * added missing condition to not include X11 specific code non-X targets Bug-tizen: TC-16 Change-Id: I37fef948dd64b985a7a983e6e72083eec1e61c70 Signed-off-by: Corentin Lecouvey Signed-off-by: Romuald Texier-Marcadé --- CMakeLists.txt | 7 ++- packaging/system-server.spec | 110 +++++++++++------------------------------- system-server.conf | 10 ---- systemd/system-server.service | 2 - utils/pmon | 5 -- utils/regpmon | 12 ----- utils/set_pmon | Bin 10172 -> 0 bytes 7 files changed, 32 insertions(+), 114 deletions(-) delete mode 100644 system-server.conf delete mode 100755 utils/pmon delete mode 100755 utils/regpmon delete mode 100755 utils/set_pmon diff --git a/CMakeLists.txt b/CMakeLists.txt index d4e7158..e271002 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,7 +145,9 @@ ADD_DEFINITIONS("-DLIBPATH=\"${LIB_INSTALL_DIR}/\"") ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"") ADD_DEFINITIONS("-DENABLE_KEY_FILTER") +IF(X11_SUPPORT) ADD_DEFINITIONS("-DENABLE_X_LCD_ONOFF") +ENDIF(X11_SUPPORT) ADD_DEFINITIONS("-DENABLE_DLOG_OUT") ADD_DEFINITIONS("-DENABLE_PM_LOG") @@ -176,12 +178,9 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) INSTALL(FILES ${MOVINAND_FORMAT} DESTINATION bin) INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/device-daemon DESTINATION bin) -INSTALL(FILES system-server.conf DESTINATION /etc/dbus-1/system.d) +INSTALL(FILES deviced.conf DESTINATION /etc/dbus-1/system.d) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/mmc-smack-label DESTINATION bin) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/shutdown.sh DESTINATION ${LIB_INSTALL_DIR}/system-server) -INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/utils/set_pmon DESTINATION bin) -INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/utils/regpmon DESTINATION bin) -INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/utils/pmon DESTINATION bin) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.service DESTINATION lib/systemd/system) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.socket DESTINATION lib/systemd/system) diff --git a/packaging/system-server.spec b/packaging/system-server.spec index 533f010..a7fe1bc 100755 --- a/packaging/system-server.spec +++ b/packaging/system-server.spec @@ -40,45 +40,31 @@ BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(libtzplatform-config) %{?systemd_requires} -Requires(preun): /usr/bin/systemctl -Requires(post): /usr/bin/systemctl Requires(post): /usr/bin/vconftool -Requires(postun): /usr/bin/systemctl %description system server -%package system-server -Summary: System-server daemon -Group: System/Service -Requires: %{name} = %{version}-%{release} - -%description system-server -system server daemon. - %package -n sysman Summary: Sysman library -License: Apache-2.0 Group: System/Libraries Requires: %{name} = %{version}-%{release} %description -n sysman -sysman library. +System manager interface library. %package -n sysman-devel Summary: Sysman devel library -License: Apache-2.0 Group: System/Development -Requires: %{name} = %{version}-%{release} +Requires: sysman = %{version}-%{release} %description -n sysman-devel sysman devel library. %package -n sysman-internal-devel Summary: Sysman internal devel library -License: Apache-2.0 Group: System/Development -Requires: %{name} = %{version}-%{release} +Requires: sysman = %{version}-%{release} %description -n sysman-internal-devel sysman internal devel library. @@ -118,6 +104,7 @@ Haptic library for device control (devel) %package -n libhaptic-plugin-devel Summary: Haptic plugin library for (devel) Group: Development/Libraries +Requires: libhaptic = %{version}-%{release} %description -n libhaptic-plugin-devel Haptic plugin library for device control (devel) @@ -149,6 +136,7 @@ Haptic Device manager library for device control (devel) %package -n libdeviced Summary: Deviced library Group: System/Libraries +Requires: %{name} = %{version}-%{release} %description -n libdeviced Deviced library for device control @@ -183,11 +171,10 @@ cp %{SOURCE6} . %cmake . -DTZ_SYS_ETC=%TZ_SYS_ETC %install -rm -rf %{buildroot} %make_install %install_service multi-user.target.wants system-server.service -%install_service sockets.target.wants system-server.service +%install_service sockets.target.wants system-server.socket %install_service graphical.target.wants regpmon.service install -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/regpmon.service @@ -282,10 +269,30 @@ fi systemctl daemon-reload /sbin/ldconfig -%files -n system-server +%post -n sysman -p /sbin/ldconfig + +%postun -n sysman -p /sbin/ldconfig + +%post -n libslp-pm -p /sbin/ldconfig + +%postun -n libslp-pm -p /sbin/ldconfig + +%post -n libhaptic -p /sbin/ldconfig + +%postun -n libhaptic -p /sbin/ldconfig + +%post -n libdevman -p /sbin/ldconfig + +%postun -n libdevman -p /sbin/ldconfig + +%post -n libdeviced -p /sbin/ldconfig + +%postun -n libdeviced -p /sbin/ldconfig + +%files %manifest %{name}.manifest %license LICENSE.APLv2 -%config %{_sysconfdir}/dbus-1/system.d/system-server.conf +%config %{_sysconfdir}/dbus-1/system.d/deviced.conf %{_bindir}/system_server %{_libdir}/system-server/shutdown.sh %if %{undefined simulator} @@ -296,35 +303,25 @@ systemctl daemon-reload %{_bindir}/pm_event %{_bindir}/regpmon %{_bindir}/set_pmon -%{_bindir}/pmon %{_bindir}/sys_pci_noti %{_bindir}/mmc-smack-label %{_bindir}/device-daemon %{_bindir}/fsck_msdosfs %{_unitdir}/multi-user.target.wants/system-server.service %{_unitdir}/graphical.target.wants/regpmon.service -%{_unitdir}/sockets.target.wants/system-server.service +%{_unitdir}/sockets.target.wants/system-server.socket %{_unitdir}/system-server.service %{_unitdir}/system-server.socket %{_unitdir}/regpmon.service %{_unitdir}/graphical.target.wants/zbooting-done.service %{_unitdir}/zbooting-done.service %{_datadir}/system-server/sys_pci_noti/res/locale/*/LC_MESSAGES/*.mo -%config %{_sysconfdir}/dbus-1/system.d/system-server.conf %{_datadir}/license/fsck_msdosfs %files -n sysman %manifest sysman.manifest %defattr(-,root,root,-) %{_libdir}/libsysman.so.* -%{_bindir}/regpmon -%{_bindir}/set_pmon - -%post -n sysman -/sbin/ldconfig - -%postun -n sysman -/sbin/ldconfig %files -n sysman-devel %defattr(-,root,root,-) @@ -343,12 +340,6 @@ systemctl daemon-reload %manifest libslp-pm.manifest %{_libdir}/libpmapi.so.* -%post -n libslp-pm -/sbin/ldconfig - -%postun -n libslp-pm -/sbin/ldconfig - %files -n libslp-pm-devel %defattr(-,root,root,-) %{_includedir}/pmapi/pmapi.h @@ -357,36 +348,17 @@ systemctl daemon-reload %{_libdir}/pkgconfig/pmapi.pc %{_libdir}/libpmapi.so -%post -n libslp-pm-devel -/sbin/ldconfig - -%postun -n libslp-pm-devel -/sbin/ldconfig - %files -n libhaptic %defattr(-,root,root,-) %{_libdir}/libhaptic.so.* %manifest haptic.manifest -%post -n libhaptic -/sbin/ldconfig - -%postun -n libhaptic -/sbin/ldconfig - - %files -n libhaptic-devel %defattr(-,root,root,-) %{_includedir}/haptic/haptic.h %{_libdir}/libhaptic.so %{_libdir}/pkgconfig/haptic.pc -%post -n libhaptic-devel -/sbin/ldconfig - -%postun -n libhaptic-devel -/sbin/ldconfig - %files -n libhaptic-plugin-devel %defattr(-,root,root,-) %{_includedir}/haptic/haptic_module.h @@ -399,13 +371,6 @@ systemctl daemon-reload %{_libdir}/libdevman.so.* %manifest devman.manifest - -%post -n libdevman -/sbin/ldconfig - -%postun -n libdevman -/sbin/ldconfig - %files -n libdevman-devel %{_includedir}/devman/devman.h %{_includedir}/devman/devman_image.h @@ -415,12 +380,6 @@ systemctl daemon-reload %{_libdir}/pkgconfig/devman.pc %{_libdir}/libdevman.so -%post -n libdevman-devel -/sbin/ldconfig - -%postun -n libdevman-devel -/sbin/ldconfig - %files -n libdevman-haptic-devel %{_includedir}/devman/devman_haptic_ext.h %{_includedir}/devman/devman_haptic_ext_core.h @@ -431,12 +390,6 @@ systemctl daemon-reload %{_libdir}/libdeviced.so.* %manifest deviced.manifest -%post -n libdeviced -/sbin/ldconfig - -%postun -n libdeviced -/sbin/ldconfig - %files -n libdeviced-devel %defattr(-,root,root,-) %{_includedir}/deviced/dd-battery.h @@ -451,8 +404,3 @@ systemctl daemon-reload %{_libdir}/libdeviced.so %{_libdir}/pkgconfig/deviced.pc -%post -n libdeviced-devel -/sbin/ldconfig - -%postun -n libdeviced-devel -/sbin/ldconfig diff --git a/system-server.conf b/system-server.conf deleted file mode 100644 index 21a6638..0000000 --- a/system-server.conf +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/systemd/system-server.service b/systemd/system-server.service index f548672..22540c9 100644 --- a/systemd/system-server.service +++ b/systemd/system-server.service @@ -6,9 +6,7 @@ After=vconf-setup.service # set DISPLAY for usb_setting launching Type=forking Environment=DISPLAY=:0 -ExecStartPre=/etc/init.d/device-daemon stop ExecStart=/usr/bin/device-daemon -ExecStop=/etc/init.d/device-daemon stop TimeoutStopSec=2 NotifyAccess=all diff --git a/utils/pmon b/utils/pmon deleted file mode 100755 index f389e5f..0000000 --- a/utils/pmon +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# clean up vip process history -rm -f /tmp/vip/* - diff --git a/utils/regpmon b/utils/regpmon deleted file mode 100755 index 1507f41..0000000 --- a/utils/regpmon +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -source /etc/tizen-platform.conf -# Don't regist processes on hibernation capturing sequence -if [ -e $TZ_SYS_ETC/.hib_capturing ] ; then - exit 0 -elif [ -e $TZ_SYS_ETC/.hib_capturing_firstboot ]; then - exit 0 -fi - -set_pmon -v Xorg enlightenment dbus-daemon libsqlfs_mount telephony-server pulseaudio -set_pmon -p wifid phonebook-engine voice-calld menu-daemon input_router indicator dlog-daemon ss-server media-server sf_server security-server dnet quickpanel sound_server audio-session-mgr-server launchpad_preloading_preinitializing_daemon voip-daemon drm_server calendar-serviced wrt_launchpad_daemon resourced - diff --git a/utils/set_pmon b/utils/set_pmon deleted file mode 100755 index 36c6f68f281fd7418e6545a46352df5024843b18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10172 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 WNY~SS;{Vhb)x{ae%`qx!^uGbk3W#<9 -- 2.7.4