* 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 <corentin.lecouvey@open.eurogiciel.org>
Signed-off-by: Romuald Texier-Marcadé <romuald.texier-marcade@open.eurogiciel.org>
ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"")
ADD_DEFINITIONS("-DENABLE_KEY_FILTER")
ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"")
ADD_DEFINITIONS("-DENABLE_KEY_FILTER")
ADD_DEFINITIONS("-DENABLE_X_LCD_ONOFF")
ADD_DEFINITIONS("-DENABLE_X_LCD_ONOFF")
ADD_DEFINITIONS("-DENABLE_DLOG_OUT")
ADD_DEFINITIONS("-DENABLE_PM_LOG")
ADD_DEFINITIONS("-DENABLE_DLOG_OUT")
ADD_DEFINITIONS("-DENABLE_PM_LOG")
INSTALL(FILES ${MOVINAND_FORMAT} DESTINATION bin)
INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/device-daemon 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}/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)
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)
BuildRequires: pkgconfig(libtzplatform-config)
%{?systemd_requires}
BuildRequires: pkgconfig(libtzplatform-config)
%{?systemd_requires}
-Requires(preun): /usr/bin/systemctl
-Requires(post): /usr/bin/systemctl
Requires(post): /usr/bin/vconftool
Requires(post): /usr/bin/vconftool
-Requires(postun): /usr/bin/systemctl
%description
system server
%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
%package -n sysman
Summary: Sysman library
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
%description -n sysman
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
%description -n sysman
+System manager interface library.
%package -n sysman-devel
Summary: Sysman devel library
%package -n sysman-devel
Summary: Sysman devel library
Group: System/Development
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
%description -n sysman-devel
sysman devel library.
%package -n sysman-internal-devel
Summary: Sysman internal devel library
Group: System/Development
Group: System/Development
-Requires: %{name} = %{version}-%{release}
+Requires: sysman = %{version}-%{release}
%description -n sysman-internal-devel
sysman internal devel library.
%description -n sysman-internal-devel
sysman internal devel library.
%package -n libhaptic-plugin-devel
Summary: Haptic plugin library for (devel)
Group: Development/Libraries
%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)
%description -n libhaptic-plugin-devel
Haptic plugin library for device control (devel)
%package -n libdeviced
Summary: Deviced library
Group: System/Libraries
%package -n libdeviced
Summary: Deviced library
Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
%description -n libdeviced
Deviced library for device control
%description -n libdeviced
Deviced library for device control
%cmake . -DTZ_SYS_ETC=%TZ_SYS_ETC
%install
%cmake . -DTZ_SYS_ETC=%TZ_SYS_ETC
%install
%make_install
%install_service multi-user.target.wants system-server.service
%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
%install_service graphical.target.wants regpmon.service
install -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/regpmon.service
systemctl daemon-reload
/sbin/ldconfig
systemctl daemon-reload
/sbin/ldconfig
+%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
%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}
%{_bindir}/system_server
%{_libdir}/system-server/shutdown.sh
%if %{undefined simulator}
%{_bindir}/pm_event
%{_bindir}/regpmon
%{_bindir}/set_pmon
%{_bindir}/pm_event
%{_bindir}/regpmon
%{_bindir}/set_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
%{_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
%{_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.*
%{_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,-)
%files -n sysman-devel
%defattr(-,root,root,-)
%manifest libslp-pm.manifest
%{_libdir}/libpmapi.so.*
%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
%files -n libslp-pm-devel
%defattr(-,root,root,-)
%{_includedir}/pmapi/pmapi.h
%{_libdir}/pkgconfig/pmapi.pc
%{_libdir}/libpmapi.so
%{_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
%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
%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
%files -n libhaptic-plugin-devel
%defattr(-,root,root,-)
%{_includedir}/haptic/haptic_module.h
%{_libdir}/libdevman.so.*
%manifest devman.manifest
%{_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
%files -n libdevman-devel
%{_includedir}/devman/devman.h
%{_includedir}/devman/devman_image.h
%{_libdir}/pkgconfig/devman.pc
%{_libdir}/libdevman.so
%{_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
%files -n libdevman-haptic-devel
%{_includedir}/devman/devman_haptic_ext.h
%{_includedir}/devman/devman_haptic_ext_core.h
%{_libdir}/libdeviced.so.*
%manifest deviced.manifest
%{_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
%files -n libdeviced-devel
%defattr(-,root,root,-)
%{_includedir}/deviced/dd-battery.h
%{_libdir}/libdeviced.so
%{_libdir}/pkgconfig/deviced.pc
%{_libdir}/libdeviced.so
%{_libdir}/pkgconfig/deviced.pc
-%post -n libdeviced-devel
-/sbin/ldconfig
-
-%postun -n libdeviced-devel
-/sbin/ldconfig
+++ /dev/null
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
- <policy user="root">
- <allow own="slp.system.server"/>
- </policy>
- <policy context="default">
- <deny own="slp.system.server"/>
- </policy>
-</busconfig>
# set DISPLAY for usb_setting launching
Type=forking
Environment=DISPLAY=:0
# set DISPLAY for usb_setting launching
Type=forking
Environment=DISPLAY=:0
-ExecStartPre=/etc/init.d/device-daemon stop
ExecStart=/usr/bin/device-daemon
ExecStart=/usr/bin/device-daemon
-ExecStop=/etc/init.d/device-daemon stop
TimeoutStopSec=2
NotifyAccess=all
TimeoutStopSec=2
NotifyAccess=all
+++ /dev/null
-#!/bin/sh
-
-# clean up vip process history
-rm -f /tmp/vip/*
-
+++ /dev/null
-#!/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
-