From 3fb7b8cd823c8311c8b5a029d4afe178d4a524b8 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 13 Sep 2017 17:58:51 +0200 Subject: Fix post install script dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Since yocto pyro we need to declare PACKAGE_WRITE_DEPS, dependency for post install script http://www.yoctoproject.org/docs/2.3/mega-manual/mega-manual.html#var-PACKAGE_WRITE_DEPS * we alsa need to explicit exit 1 if post script failed Bug-AGL: SPEC-646 Bug-AGL: SPEC-825 Change-Id: Ic15f8af884895fecacceb9886de5bebe591a2be0 Signed-off-by: Ronan Le Martret Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10883 Reviewed-by: Stéphane Desneux Reviewed-by: Thomas Rini Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- meta-app-framework/recipes-core/af-main/af-main_1.0.bb | 4 +++- meta-app-framework/recipes-core/base-files/base-files_%.bbappend | 2 +- .../recipes-core/security-manager/security-manager_%.bbappend | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-app-framework/recipes-core/af-main/af-main_1.0.bb b/meta-app-framework/recipes-core/af-main/af-main_1.0.bb index 057f412aa..52a8fe29d 100644 --- a/meta-app-framework/recipes-core/af-main/af-main_1.0.bb +++ b/meta-app-framework/recipes-core/af-main/af-main_1.0.bb @@ -11,9 +11,11 @@ BBCLASSEXTEND = "native" SECTION = "base" -DEPENDS = "openssl libxml2 xmlsec1 systemd libzip json-c systemd security-manager libcap-native af-binder" +DEPENDS = "openssl libxml2 xmlsec1 systemd libzip json-c systemd security-manager af-binder" DEPENDS_class-native = "openssl libxml2 xmlsec1 libzip json-c" +PACKAGE_WRITE_DEPS_append_smack = " smack-userspace-native libcap-native" + EXTRA_OECMAKE_class-native = "\ -DUSE_LIBZIP=1 \ -DUSE_SIMULATION=1 \ diff --git a/meta-app-framework/recipes-core/base-files/base-files_%.bbappend b/meta-app-framework/recipes-core/base-files/base-files_%.bbappend index 0e93b4d65..271fe77a6 100644 --- a/meta-app-framework/recipes-core/base-files/base-files_%.bbappend +++ b/meta-app-framework/recipes-core/base-files/base-files_%.bbappend @@ -1,5 +1,5 @@ -DEPENDS_append_smack = " smack-userspace-native" RDEPENDS_${PN}_append_smack = " smack-userspace" +PACKAGE_WRITE_DEPS_append_smack = " smack-userspace-native" do_install_append() { install -d ${D}/${sysconfdir}/skel/app-data diff --git a/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend b/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend index 23ceb2937..bd1a43ea3 100644 --- a/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend +++ b/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/security-manager:" +PACKAGE_WRITE_DEPS_append_smack = " smack-userspace-native" + SRC_URI += " file://0001-Adapt-rules-to-AGL.patch \ file://init-security-manager-db.service \ file://init-security-manager-db.sh \ -- cgit 1.2.3-korg