Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
system setup: Fix settings on /run/user
[src/app-framework-main.git]
/
conf
/
system
/
CMakeLists.txt
diff --git
a/conf/system/CMakeLists.txt
b/conf/system/CMakeLists.txt
index
26fc562
..
3cabd0c
100644
(file)
--- a/
conf/system/CMakeLists.txt
+++ b/
conf/system/CMakeLists.txt
@@
-1,5
+1,5
@@
###########################################################################
###########################################################################
-# Copyright (C) 2015-201
8
IoT.bzh
+# Copyright (C) 2015-201
9
IoT.bzh
#
# author: José Bollo <jose.bollo@iot.bzh>
#
#
# author: José Bollo <jose.bollo@iot.bzh>
#
@@
-18,9
+18,18
@@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8)
+if(AGL_DEVEL)
+ set(create_platform_debug "dodir ${afm_platform_rundir}/debug")
+endif()
+
configure_file(afm-system-daemon.service.in afm-system-daemon.service)
configure_file(afm-system-daemon.service.in afm-system-daemon.service)
-configure_file(afm-system-daemon.socket.in afm-system-daemon.socket)
+configure_file(afm-system-daemon.socket.in afm-system-daemon.socket)
+configure_file(afm-system-setup.service.in afm-system-setup.service)
+configure_file(afm-system-setup.sh.in afm-system-setup.sh)
configure_file(afm-api-afm-main@.service.in afm-api-afm-main@.service)
configure_file(afm-api-afm-main@.service.in afm-api-afm-main@.service)
+configure_file(afm-user-session@.service.in afm-user-session@.service)
+configure_file(afm-user-setup@.service.in afm-user-setup@.service)
+configure_file(afm-user-setup.sh.in afm-user-setup.sh)
if(NOT USE_SDK)
set(SYSCONFDIR_DBUS_SYSTEM ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d CACHE STRING "Path to dbus system configuration files")
if(NOT USE_SDK)
set(SYSCONFDIR_DBUS_SYSTEM ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d CACHE STRING "Path to dbus system configuration files")
@@
-34,12
+43,25
@@
if(NOT USE_SDK)
${CMAKE_CURRENT_BINARY_DIR}/afm-api-afm-main@.service
${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.service
${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.socket
${CMAKE_CURRENT_BINARY_DIR}/afm-api-afm-main@.service
${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.service
${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.socket
- ${CMAKE_CURRENT_
SOURCE
_DIR}/afm-system-setup.service
- ${CMAKE_CURRENT_
SOURCE
_DIR}/afm-user-session@.service
+ ${CMAKE_CURRENT_
BINARY
_DIR}/afm-system-setup.service
+ ${CMAKE_CURRENT_
BINARY
_DIR}/afm-user-session@.service
${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session@.target
${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session@.target
- ${CMAKE_CURRENT_
SOURCE
_DIR}/afm-user-setup@.service
+ ${CMAKE_CURRENT_
BINARY
_DIR}/afm-user-setup@.service
DESTINATION
${UNITDIR_SYSTEM}
)
DESTINATION
${UNITDIR_SYSTEM}
)
+ install(
+ DIRECTORY
+ ${CMAKE_CURRENT_SOURCE_DIR}/user-runtime-dir@.service.wants
+ DESTINATION
+ ${UNITDIR_SYSTEM}
+ )
+ install(
+ PROGRAMS
+ ${CMAKE_CURRENT_BINARY_DIR}/afm-user-setup.sh
+ ${CMAKE_CURRENT_BINARY_DIR}/afm-system-setup.sh
+ DESTINATION
+ ${afm_libexecdir}
+ )
endif()
endif()