From ce5c20d2fa7e9c3e08c97643c77c7647bef79cd5 Mon Sep 17 00:00:00 2001
From: José Bollo <jose.bollo@iot.bzh>
Date: Thu, 23 May 2019 18:38:45 +0200
Subject: afm-user-daemon: Remove it by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The daemon afm-user-daemon is deprecated.
To be cleaner, it is removed from the compilation
and the installation.
It is still kept a again for little time in the
unexpected case where it could be useful to compile
it.
Bug-AGL: SPEC-2437
Change-Id: Ifccee49eb14ceff5f7a78fb299260918a585bf93
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
CMakeLists.txt | 2 ++
conf/user/CMakeLists.txt | 2 +-
src/CMakeLists.txt | 8 +++++---
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84a476e..c83e59d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,8 @@ set(ALLOW_NO_SIGNATURE OFF CACHE BOOL "if set, widgets without signature are acc
set(SIMULATE_SECMGR OFF CACHE BOOL "if set, the security manager is simulated")
set(SIMULATE_SMACK OFF CACHE BOOL "if set, the smack environment is simulated")
+set(LEGACY_USER_DAEMON OFF CACHE BOOL "compile and install the legacy afm-user-daemon")
+
set(afm_name "afm" CACHE STRING "Name for application framework user")
set(afm_confdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}/${afm_name}" CACHE STRING "Directory for configuration files")
set(afm_datadir "${CMAKE_INSTALL_FULL_DATADIR}/${afm_name}" CACHE STRING "Root directory for installions")
diff --git a/conf/user/CMakeLists.txt b/conf/user/CMakeLists.txt
index d552a72..a8d72dc 100644
--- a/conf/user/CMakeLists.txt
+++ b/conf/user/CMakeLists.txt
@@ -18,7 +18,7 @@
cmake_minimum_required(VERSION 2.8)
-if(NOT USE_SDK)
+if(NOT USE_SDK AND LEGACY_USER_DAEMON)
configure_file(afm-user-daemon.service.in afm-user-daemon.service)
set(SYSCONFDIR_DBUS_USER ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/session.d CACHE STRING "Path to dbus session configuration files")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2346db0..b112d55 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -170,9 +170,11 @@ if(libsystemd_FOUND AND AFB_FOUND)
add_library(jbus STATIC utils-jbus.c)
- add_executable(afm-user-daemon afm-user-daemon.c)
- target_link_libraries(afm-user-daemon jbus utils)
- install(TARGETS afm-user-daemon DESTINATION ${CMAKE_INSTALL_BINDIR})
+ if(LEGACY_USER_DAEMON)
+ add_executable(afm-user-daemon afm-user-daemon.c)
+ target_link_libraries(afm-user-daemon jbus utils)
+ install(TARGETS afm-user-daemon DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
add_library(afm-binding MODULE afm-binding.c)
target_link_libraries(afm-binding wgtpkg wgt secwrp utils afm)
--
cgit