aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2019-05-17 17:28:05 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-06-19 13:05:28 +0000
commit4b0ef61b6ba59ca8a347453cbfdd159f2cf74f40 (patch)
treee9261e20588a2424b36c3063e30fb31c1f4baa11
parentb287de2158d43b4d97a41bac162cbba52591003f (diff)
af-main: Remove afm-user-daemon and bump version
The process afm-user-daemon is no more used within AGL. So it is better to remove its installation. Integrates the following changes: * d0d4dcd Allow setting of libexec location * 2db5d23 Fix outdated application path. * cc93752 Refactor of system and user setup * 316b19f Remove unused definitions * 401188a Use definition of afm_prefix * efabde7 afm-unit conf: Remove useless tests * 405ba31 afm-user-session: moves in libexec directory * 07a9590 afm-unit: Simplify the Makefile * 44b1bdc afm-unit.conf: cleanup of generation * 2f3486b gitignore: Add ignore of EXTERNALSRC's artifacts * 5b801a3 afm-unit.conf: Refactor its generation * ce5c20d afm-user-daemon: Remove it by default Bug-AGL: SPEC-2006 Bug-AGL: SPEC-2360 Bug-AGL: SPEC-2367 Bug-AGL: SPEC-2436 Bug-AGL: SPEC-2437 Change-Id: Ib77ecc2e9aabb8a3c5cef7266c3f5b19205939b9 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--meta-app-framework/recipes-core/af-main/af-main_git.bb6
-rw-r--r--meta-app-framework/recipes-core/af-main/af-main_git.inc2
2 files changed, 1 insertions, 7 deletions
diff --git a/meta-app-framework/recipes-core/af-main/af-main_git.bb b/meta-app-framework/recipes-core/af-main/af-main_git.bb
index 6aca6959b..4a565453d 100644
--- a/meta-app-framework/recipes-core/af-main/af-main_git.bb
+++ b/meta-app-framework/recipes-core/af-main/af-main_git.bb
@@ -65,9 +65,6 @@ USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system --gid ${afm_name} --home-dir ${afm_datadir} ${afm_name}"
GROUPADD_PARAM_${PN} = "--system ${afm_name}"
-FILES_${PN} += "\
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/afm-user-daemon.service', '', d)} \
-"
RDEPENDS_${PN}_append_with-lsm-smack = " smack bash"
DEPENDS_append_with-lsm-smack = " smack-native"
@@ -87,9 +84,6 @@ do_install_append_class-target() {
install -d ${D}${afm_datadir}/applications
install -d ${D}${afm_datadir}/icons
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
- install -d -m 0755 ${D}${systemd_user_unitdir}/default.target.wants
- ln -s ../afm-user-daemon.service ${D}${systemd_user_unitdir}/default.target.wants/afm-user-daemon.service
- ln -s ../afm-user-session.service ${D}${systemd_user_unitdir}/default.target.wants/afm-user-session.service
install -d -m 0755 ${D}${systemd_system_unitdir}/multi-user.target.wants
install -d -m 0755 ${D}${systemd_system_unitdir}/sockets.target.wants
ln -sf ../afm-system-setup.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afm-system-setup.service
diff --git a/meta-app-framework/recipes-core/af-main/af-main_git.inc b/meta-app-framework/recipes-core/af-main/af-main_git.inc
index d943d8efe..f6a8e3d83 100644
--- a/meta-app-framework/recipes-core/af-main/af-main_git.inc
+++ b/meta-app-framework/recipes-core/af-main/af-main_git.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-main;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "b4ca569c08a233114fb77106a8b4aa34d47ab54c"
+SRCREV = "ce5c20d2fa7e9c3e08c97643c77c7647bef79cd5"
PV = "${AGL_BRANCH}+git${SRCPV}"
S = "${WORKDIR}/git"