From 2a3bbd117220b55682f95dd527f9971f3efdcd82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= Date: Wed, 28 Dec 2016 19:15:54 +0100 Subject: [PATCH 01/16] Fix whitespace in aglwgt bbclass MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This change fixes an issue in the aglwgt bbclass use of FILES_${PN} that lead to a missing inclusion of the *.wgt file. Change-Id: I4ec8485e9f375f3e9278310381b270b0d3647f62 Signed-off-by: Jan-Simon Möller Signed-off-by: Stephane Desneux --- meta-app-framework/classes/aglwgt.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass index f7da1e401..734e979c5 100644 --- a/meta-app-framework/classes/aglwgt.bbclass +++ b/meta-app-framework/classes/aglwgt.bbclass @@ -31,7 +31,7 @@ do_aglwgt_deploy() { install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/ } -FILES_${PN} += " /usr/AGL/apps/*.wgt " +FILES_${PN} += "/usr/AGL/apps/*.wgt" addtask aglwgt_package before do_build after do_compile addtask aglwgt_deploy before do_build after do_install \ No newline at end of file -- 2.16.6 From 115ecf63ed97c79b1b1055d76dee835135277030 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= Date: Wed, 28 Dec 2016 20:45:11 +0100 Subject: [PATCH 02/16] Be more precise in addtask MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This changeset fixes a timing issue on parallel builds when using the aglwgt bbclass. It turns out that we need to make sure our steps finish before do_package is being called. Change-Id: Ib3bc0d39562c6a0d9ba4c55352c61ce1b57d5409 Signed-off-by: Jan-Simon Möller Signed-off-by: Stephane Desneux --- meta-app-framework/classes/aglwgt.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass index 734e979c5..97fb6ff8d 100644 --- a/meta-app-framework/classes/aglwgt.bbclass +++ b/meta-app-framework/classes/aglwgt.bbclass @@ -33,5 +33,5 @@ do_aglwgt_deploy() { FILES_${PN} += "/usr/AGL/apps/*.wgt" -addtask aglwgt_package before do_build after do_compile -addtask aglwgt_deploy before do_build after do_install \ No newline at end of file +addtask aglwgt_deploy before do_package after do_install +addtask aglwgt_package before do_aglwgt_deploy after do_compile -- 2.16.6 From dfd78e0100e23391b1a3d74e639940a1efee7474 Mon Sep 17 00:00:00 2001 From: Ronan Date: Mon, 2 Jan 2017 17:10:24 +0100 Subject: [PATCH 03/16] add fakeroot to aglwgt_deploy task * we need to have pseudo env when we deploy agl app, if not developer id is use instead of pseudo id (root), and a QA issue is rise "host contamination". BB-must-fix Change-Id: I65c61cf1f5318b9cb9afe942da662863389f28b9 Signed-off-by: Ronan Signed-off-by: Stephane Desneux --- meta-app-framework/classes/aglwgt.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass index 97fb6ff8d..94f75f2a7 100644 --- a/meta-app-framework/classes/aglwgt.bbclass +++ b/meta-app-framework/classes/aglwgt.bbclass @@ -26,6 +26,10 @@ do_aglwgt_package() { ) } +python () { + d.setVarFlag('do_aglwgt_deploy', 'fakeroot', '1') +} + do_aglwgt_deploy() { install -d ${D}/usr/AGL/apps install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/ -- 2.16.6 From a589515377149448834425e53ea71645a73f77ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Tue, 3 Jan 2017 11:46:04 +0100 Subject: [PATCH 04/16] Activates threading and hook features MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Activation of threading was delayed until CES demo. Now that CES demo is on, threading can be activated and tested in real. This also enables new features: - Compiler fixes - Hooking of requests (for debugging) - Change in handling option --roothttp - Documentation improvements - Minor internal improvements and cleanup Change-Id: I4c7052697a83c3d49a283970c502c62a5d3ddd64 Signed-off-by: José Bollo Signed-off-by: Stephane Desneux --- meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb index c50d49aae..cf5b46538 100644 --- a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb +++ b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb @@ -1,6 +1,6 @@ SUMMARY = "HTTP REST interface to automotive backends for HTML5 UI support" DESCRIPTION = "Automotive-Framework-Binder Daemon provides a HTTP REST \ -interface to various automotive-oriented bindings (sound, radio...), \ +interface to various automotive-oriented bindings, \ allowing HTML5 UIs to send platform-specific requests in a secure way." HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder" @@ -8,7 +8,6 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS = "file json-c libmicrohttpd systemd util-linux" -DEPENDS += "alsa-lib glib-2.0 gssdp gupnp gupnp-av pulseaudio" SRC_URI_git = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-binder;protocol=https;branch=master" SRC_URI_files = "" @@ -16,7 +15,7 @@ SRC_URI = "${SRC_URI_git} \ ${SRC_URI_files} \ " -SRCREV = "dcdb2427f80a325fad889586c8696a2b684d6a61" +SRCREV = "2db7c92c0b4f5840884481fa4c95facbdea63bb6" S = "${WORKDIR}/git" inherit cmake pkgconfig -- 2.16.6 From cbca8a09594c90392b2bf87437daa4b9a9db9bff Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 14 Oct 2016 14:21:15 +0200 Subject: [PATCH 05/16] fix libcap patch Change-Id: I49d42748c6dcb1927d1370b0706a085a17aa8a2b Signed-off-by: Ronan Le Martret Signed-off-by: Stephane Desneux --- .../libcap/removing-capability-enforcement.patch | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/meta-app-framework/recipes-support/libcap/libcap/removing-capability-enforcement.patch b/meta-app-framework/recipes-support/libcap/libcap/removing-capability-enforcement.patch index fd01c19e9..fa359fa87 100644 --- a/meta-app-framework/recipes-support/libcap/libcap/removing-capability-enforcement.patch +++ b/meta-app-framework/recipes-support/libcap/libcap/removing-capability-enforcement.patch @@ -3,16 +3,18 @@ From: =?UTF-8?q?Jos=C3=A9=20Bollo?= Date: Fri, 22 Jan 2016 16:23:59 +0100 Subject: [PATCH] removing capability enforcement +Signed-off-by: ronan + Change-Id: Idb724192ceab176a611bbed45c0ebc9c8eb5dd30 --- - progs/setcap.c | 43 ------------------------------------------- - 1 file changed, 43 deletions(-) + progs/setcap.c | 45 +-------------------------------------------- + 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/progs/setcap.c b/progs/setcap.c -index 83090ae..01faa17 100644 +index 7304343..71999b6 100644 --- a/progs/setcap.c +++ b/progs/setcap.c -@@ -58,7 +58,6 @@ static int read_caps(int quiet, const char *filename, char *buffer) +@@ -58,11 +58,9 @@ static int read_caps(int quiet, const char *filename, char *buffer) int main(int argc, char **argv) { @@ -20,7 +22,11 @@ index 83090ae..01faa17 100644 char buffer[MAXCAP+1]; int retval, quiet=0, verify=0; cap_t mycaps; -@@ -150,53 +149,11 @@ int main(int argc, char **argv) +- cap_value_t capflag; + + if (argc < 3) { + usage(); +@@ -150,54 +148,13 @@ int main(int argc, char **argv) printf("%s: OK\n", *argv); } } else { @@ -45,6 +51,7 @@ index 83090ae..01faa17 100644 retval = cap_set_file(*++argv, cap_d); if (retval != 0) { - int explained = 0; + int oerrno = errno; -#ifdef linux - cap_value_t cap; - cap_flag_value_t per_state; @@ -67,13 +74,14 @@ index 83090ae..01faa17 100644 - fprintf(stderr, "Failed to set capabilities on file `%s' (%s)\n", - argv[0], strerror(errno)); + argv[0], strerror(oerrno)); - if (!explained) { - usage(); - } ++ } } if (cap_d) { -- -2.1.4 +2.6.6 -- 2.16.6 From 795cc7ddb4feab5595c25b616a7e4726112bcf61 Mon Sep 17 00:00:00 2001 From: Ronan Date: Tue, 25 Oct 2016 16:11:27 +0200 Subject: [PATCH 06/16] fix for gcc6 build Change-Id: Iea4f0ba83e1d93ea2e7cc5950dced714b65dd251 Signed-off-by: Ronan Signed-off-by: Stephane Desneux --- .../0001-Fix-Cmake-conf-for-gcc6-build.patch | 40 ++++++++++++++++++++++ .../security-manager/0001-Fix-gcc6-build.patch | 38 ++++++++++++++++++++ .../security-manager/security-manager_%.bbappend | 5 ++- 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-Cmake-conf-for-gcc6-build.patch create mode 100644 meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-gcc6-build.patch diff --git a/meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-Cmake-conf-for-gcc6-build.patch b/meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-Cmake-conf-for-gcc6-build.patch new file mode 100644 index 000000000..43a3ee103 --- /dev/null +++ b/meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-Cmake-conf-for-gcc6-build.patch @@ -0,0 +1,40 @@ +From 19c99315a5dcba3b696c30d1fdd42a1dcd574a80 Mon Sep 17 00:00:00 2001 +From: Ronan +Date: Thu, 13 Oct 2016 11:37:47 +0200 +Subject: [PATCH] Fix Cmake conf for gcc6 build + +Signed-off-by: Ronan +--- + src/cmd/CMakeLists.txt | 4 +--- + src/server/CMakeLists.txt | 1 - + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt +index ee9a160..aa7a12c 100644 +--- a/src/cmd/CMakeLists.txt ++++ b/src/cmd/CMakeLists.txt +@@ -1,8 +1,6 @@ + FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options) + +-INCLUDE_DIRECTORIES(SYSTEM +- ${Boost_INCLUDE_DIRS} +- ) ++ + + INCLUDE_DIRECTORIES( + ${INCLUDE_PATH} +diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt +index 753eb96..8eef25d 100644 +--- a/src/server/CMakeLists.txt ++++ b/src/server/CMakeLists.txt +@@ -8,7 +8,6 @@ FIND_PACKAGE(Threads REQUIRED) + + INCLUDE_DIRECTORIES(SYSTEM + ${SERVER_DEP_INCLUDE_DIRS} +- ${Boost_INCLUDE_DIRS} + ${Threads_INCLUDE_DIRS} + ) + +-- +2.6.6 + diff --git a/meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-gcc6-build.patch b/meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-gcc6-build.patch new file mode 100644 index 000000000..1b3c8c427 --- /dev/null +++ b/meta-app-framework/recipes-core/security-manager/security-manager/0001-Fix-gcc6-build.patch @@ -0,0 +1,38 @@ +From cb9acc2b723b297ee373bf814282711f02657aa5 Mon Sep 17 00:00:00 2001 +From: Ronan +Date: Wed, 12 Oct 2016 17:48:55 +0200 +Subject: [PATCH] Fix gcc6 build + +Signed-off-by: ronan +--- + src/client/client-security-manager.cpp | 1 + + src/common/include/privilege_db.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/client/client-security-manager.cpp b/src/client/client-security-manager.cpp +index 74a6b30..347cddd 100644 +--- a/src/client/client-security-manager.cpp ++++ b/src/client/client-security-manager.cpp +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + static const char *EMPTY = ""; + +diff --git a/src/common/include/privilege_db.h b/src/common/include/privilege_db.h +index 03c6680..8dd39a1 100644 +--- a/src/common/include/privilege_db.h ++++ b/src/common/include/privilege_db.h +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.6.6 + 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 a4cd6075e..90f69eb47 100644 --- a/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend +++ b/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend @@ -2,7 +2,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/security-manager:" SRC_URI += " file://0001-Adapt-rules-to-AGL.patch \ file://init-security-manager-db.service \ - file://init-security-manager-db.sh" + file://init-security-manager-db.sh \ + file://0001-Fix-gcc6-build.patch \ + file://0001-Fix-Cmake-conf-for-gcc6-build.patch \ +" FILES_${PN}_append = "${bindir}/init-security-manager-db.sh \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/init-security-manager-db.service', '', d)} \ -- 2.16.6 From 2de30e26d06251cb50aff482f0c729c316b8fad0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= Date: Mon, 16 Jan 2017 19:43:03 +0100 Subject: [PATCH 07/16] Add missing DEPENDS to af-binder MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To fix WARNING: af-binder-1.0-r0 do_package_qa: QA Issue: af-binder rdepends on libcrypto, but it isn't a build dependency, missing openssl in DEPENDS or PACKAGECONFIG? [build-deps] openssl is added to DEPENDS. Change-Id: Ib1d38f8041e053f7c706fcb2cc187aad765aa9c4 Signed-off-by: Jan-Simon Möller Signed-off-by: Stephane Desneux --- meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb index cf5b46538..cb1d53e45 100644 --- a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb +++ b/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-f LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -DEPENDS = "file json-c libmicrohttpd systemd util-linux" +DEPENDS = "file json-c libmicrohttpd systemd util-linux openssl" SRC_URI_git = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-binder;protocol=https;branch=master" SRC_URI_files = "" -- 2.16.6 From a9fd01093b3feda9a5f71484c1934c890da8cb52 Mon Sep 17 00:00:00 2001 From: Ronan Date: Fri, 20 Jan 2017 16:30:39 +0100 Subject: [PATCH 08/16] Move feature code into the meta recipes * Having a minimlal local.conf serving the only purpose of user customization is the "Yocto" way of doing things * After a source synchronization (repo sync), feature code must be update without regenerate local.conf * move feature/agl-demo to meta-agl-demo Change-Id: I6db3956da8091bf583b20fce7dc184bfe622a85a Signed-off-by: Ronan Signed-off-by: Stephane Desneux --- meta-app-framework/conf/include/agl-appfw-smack.inc | 12 ++++++++++++ templates/feature/agl-appfw-smack/50_local.conf.inc | 14 ++------------ 2 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 meta-app-framework/conf/include/agl-appfw-smack.inc diff --git a/meta-app-framework/conf/include/agl-appfw-smack.inc b/meta-app-framework/conf/include/agl-appfw-smack.inc new file mode 100644 index 000000000..90862cb09 --- /dev/null +++ b/meta-app-framework/conf/include/agl-appfw-smack.inc @@ -0,0 +1,12 @@ +# enable security features (smack, cynara) - required by Application Framework +OVERRIDES .= ":smack" +DISTRO_FEATURES_append = " smack dbus-cynara" + +# use tar-native to support SMACK extended attributes independently of host config +IMAGE_CMD_TAR = "tar --xattrs-include='*'" +IMAGE_DEPENDS_tar_append = " tar-replacement-native" +EXTRANATIVEPATH += "tar-native" + +# security: enable ssh server in place of dropbear to support PAM on user sessions +IMAGE_FEATURES += "ssh-server-openssh" + diff --git a/templates/feature/agl-appfw-smack/50_local.conf.inc b/templates/feature/agl-appfw-smack/50_local.conf.inc index 90862cb09..add62a30b 100644 --- a/templates/feature/agl-appfw-smack/50_local.conf.inc +++ b/templates/feature/agl-appfw-smack/50_local.conf.inc @@ -1,12 +1,2 @@ -# enable security features (smack, cynara) - required by Application Framework -OVERRIDES .= ":smack" -DISTRO_FEATURES_append = " smack dbus-cynara" - -# use tar-native to support SMACK extended attributes independently of host config -IMAGE_CMD_TAR = "tar --xattrs-include='*'" -IMAGE_DEPENDS_tar_append = " tar-replacement-native" -EXTRANATIVEPATH += "tar-native" - -# security: enable ssh server in place of dropbear to support PAM on user sessions -IMAGE_FEATURES += "ssh-server-openssh" - +#see meta-agl-extra/meta-app-framework/conf/include/agl-appfw-smack.inc +require conf/include/agl-appfw-smack.inc -- 2.16.6 From 802f845b9d31b8b72067930abd2a23f1a321c691 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 15 Feb 2017 16:54:11 +0100 Subject: [PATCH 09/16] Add afm-install used to install wgt at first boot * afm-install can install wgt app like afm-util but use dbus "system" session instead of "user". #/usr/bin/afm-install install /usr/AGL/apps/$file.wgt Change-Id: Id7361350257347a8db32f539b3bdeb3f2d8f554c Signed-off-by: Ronan Le Martret Signed-off-by: Stephane Desneux --- .../recipes-core/af-main/af-main/afm-install | 44 ++++++++++++++++++++++ .../recipes-core/af-main/af-main_1.0.bb | 6 +++ 2 files changed, 50 insertions(+) create mode 100755 meta-app-framework/recipes-core/af-main/af-main/afm-install diff --git a/meta-app-framework/recipes-core/af-main/af-main/afm-install b/meta-app-framework/recipes-core/af-main/af-main/afm-install new file mode 100755 index 000000000..6d37baed8 --- /dev/null +++ b/meta-app-framework/recipes-core/af-main/af-main/afm-install @@ -0,0 +1,44 @@ +#!/bin/sh + +pretty() { + sed \ + -e '/^method return .*/d' \ + -e 's/^Error org.freedesktop.DBus.Error.Failed: "\?\(.*\)"\?$/ERROR: \1/' \ + -e 's/^ string "\(.*\)"/\1/' \ + -e 's/},/&\n/' +} + +send() { + dbus-send --system --print-reply \ + --dest=org.AGL.afm.system \ + /org/AGL/afm/system \ + org.AGL.afm.system.$1 \ + "string:$2" | + pretty +} + +case "$1" in + + add|install) + f=$(realpath $2) + send install '{"wgt":"'"$f"'","force":true}' + ;; + + -h|--help|help) + cat << EOC + +The commands are: + + add wgt + install wgt install the wgt file + +EOC + ;; + + *) + echo "unknown command $1" >&2 + exit 1 + ;; +esac + + 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 834e293fa..7819bfadf 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 @@ -64,6 +64,11 @@ SRC_URI += "\ file://add-qt-wayland-shell-integration.patch \ " +# tools used to install wgt at first boot +SRC_URI += "\ + file://afm-install \ +" + do_install_append() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/init-afm-dirs.sh ${D}${bindir} @@ -74,6 +79,7 @@ do_install_append() { install -p -D ${WORKDIR}/init-afm-dirs.service ${D}${systemd_unitdir}/system/init-afm-dirs.service ln -sf ${systemd_unitdir}/system/init-afm-dirs.service ${D}${sysconfdir}/systemd/system/default.target.wants fi + install -m 0755 ${WORKDIR}/afm-install ${D}${bindir} } do_install_append_smack () { -- 2.16.6 From 3051f4733706d78b31356cd8c3464f25613996eb Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 15 Feb 2017 17:02:52 +0100 Subject: [PATCH 10/16] Allowed wgt app to auto-install at the first boot * link to gerrit review 8467 (meta-agl) Change-Id: I87832b52dde60134908d29261ca8f8049338e815 Signed-off-by: Ronan Le Martret Signed-off-by: Stephane Desneux --- meta-app-framework/classes/aglwgt.bbclass | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass index 94f75f2a7..14f00a74c 100644 --- a/meta-app-framework/classes/aglwgt.bbclass +++ b/meta-app-framework/classes/aglwgt.bbclass @@ -30,12 +30,32 @@ python () { d.setVarFlag('do_aglwgt_deploy', 'fakeroot', '1') } + +POST_INSTALL_LEVEL ?= "10" +POST_INSTALL_SCRIPT ?= "${POST_INSTALL_LEVEL}-${PN}.sh" + +EXTRA_WGT_POSTINSTALL ?= "" + do_aglwgt_deploy() { - install -d ${D}/usr/AGL/apps - install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/ + install -d ${D}/usr/AGL/apps + install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/ + APP_FILES="" + for file in ${D}/usr/AGL/apps/*.wgt;do + APP_FILES+=" "$(basename $file); + done + install -d ${D}/${sysconfdir}/agl-postinsts + cat > ${D}/${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} < Date: Thu, 16 Feb 2017 18:03:32 +0100 Subject: [PATCH 11/16] Add dependency to images * [SPEC-424] Change-Id: I50704658bd7970b5638d7f4f7fe6167e342e9b4b Signed-off-by: Ronan Le Martret Signed-off-by: Stephane Desneux --- ...agegroup-agl-core.bbappend => packagegroup-agl-image-minimal.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-app-framework/recipes-core/packagegroups/{packagegroup-agl-core.bbappend => packagegroup-agl-image-minimal.bbappend} (100%) diff --git a/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-core.bbappend b/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-image-minimal.bbappend similarity index 100% rename from meta-app-framework/recipes-core/packagegroups/packagegroup-agl-core.bbappend rename to meta-app-framework/recipes-core/packagegroups/packagegroup-agl-image-minimal.bbappend -- 2.16.6 From 1c4beeed432eabb0e8f2083b0340a35989262d61 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 17 Feb 2017 14:35:31 +0100 Subject: [PATCH 12/16] aglwgt.bbclass: fix bashism Depending on the host shell, the class may fail due to specific bash syntax. Change-Id: I59938b009b27e8fbdc533e8b58c80a36864723bb Signed-off-by: Stephane Desneux --- meta-app-framework/classes/aglwgt.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass index 14f00a74c..afe9a5516 100644 --- a/meta-app-framework/classes/aglwgt.bbclass +++ b/meta-app-framework/classes/aglwgt.bbclass @@ -41,7 +41,7 @@ do_aglwgt_deploy() { install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/ APP_FILES="" for file in ${D}/usr/AGL/apps/*.wgt;do - APP_FILES+=" "$(basename $file); + APP_FILES="${APP_FILES} $(basename $file)"; done install -d ${D}/${sysconfdir}/agl-postinsts cat > ${D}/${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} < Date: Thu, 23 Feb 2017 11:03:08 +0100 Subject: [PATCH 13/16] Update af-main * Fix wgtpkg-pack * Add json-c for native and nativesdk Change-Id: I9f2f6b55b729099a70e00f53c631e181d19cf1c9 Signed-off-by: Ronan Le Martret Signed-off-by: Stephane Desneux --- meta-app-framework/recipes-core/af-main/af-main_1.0.bb | 2 +- meta-app-framework/recipes-core/af-main/af-main_1.0.inc | 2 +- meta-app-framework/recipes-core/af-main/nativesdk-af-main_1.0.bb | 2 +- 3 files changed, 3 insertions(+), 3 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 7819bfadf..c7b8ba440 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 @@ -12,7 +12,7 @@ BBCLASSEXTEND = "native" SECTION = "base" DEPENDS = "openssl libxml2 xmlsec1 systemd libzip json-c security-manager libcap-native af-binder" -DEPENDS_class-native = "openssl libxml2 xmlsec1 libzip" +DEPENDS_class-native = "openssl libxml2 xmlsec1 libzip json-c" afm_name = "afm" afm_confdir = "${sysconfdir}/${afm_name}" diff --git a/meta-app-framework/recipes-core/af-main/af-main_1.0.inc b/meta-app-framework/recipes-core/af-main/af-main_1.0.inc index 0d07fc2da..c04661a0e 100644 --- a/meta-app-framework/recipes-core/af-main/af-main_1.0.inc +++ b/meta-app-framework/recipes-core/af-main/af-main_1.0.inc @@ -14,7 +14,7 @@ SRC_URI = "${SRC_URI_git} \ ${SRC_URI_files} \ " -SRCREV = "c6b2074e18ce7a37a59bc1c3831407b42b18c889" +SRCREV = "7cf2890d871e76c082528565f59e1d0d1055b7f9" S = "${WORKDIR}/git" diff --git a/meta-app-framework/recipes-core/af-main/nativesdk-af-main_1.0.bb b/meta-app-framework/recipes-core/af-main/nativesdk-af-main_1.0.bb index ba70c59ab..021c9ac00 100644 --- a/meta-app-framework/recipes-core/af-main/nativesdk-af-main_1.0.bb +++ b/meta-app-framework/recipes-core/af-main/nativesdk-af-main_1.0.bb @@ -4,7 +4,7 @@ inherit nativesdk cmake pkgconfig SECTION = "base" -DEPENDS = "nativesdk-openssl nativesdk-libxml2 nativesdk-xmlsec1 nativesdk-libzip" +DEPENDS = "nativesdk-openssl nativesdk-libxml2 nativesdk-xmlsec1 nativesdk-libzip nativesdk-json-c" afm_name = "afm" afm_confdir = "${sysconfdir}/${afm_name}" -- 2.16.6 From 2af22bf84f7c7b1b1047a6d451aa0ac3a8b35c5c Mon Sep 17 00:00:00 2001 From: Phong Tran Date: Thu, 23 Feb 2017 23:41:45 +0700 Subject: [PATCH 14/16] Fix the error of homescreen for QEMU x86-64 libEGL.so is not availabe in QEMU x86-64 env. This make the afm-user-daemon service is loaded failure. This make the homescreen fail to load. Remove LD_PRELOAD of libEGL.so for QEMU x86-64. Change-Id: Iba9a904cc7e4000861ec0e0d6f5c22f48428b954 Signed-off-by: Phong Tran Signed-off-by: Stephane Desneux --- meta-app-framework/recipes-core/af-main/af-main_1.0.bb | 4 ++++ 1 file changed, 4 insertions(+) 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 c7b8ba440..6a1d36a99 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 @@ -82,6 +82,10 @@ do_install_append() { install -m 0755 ${WORKDIR}/afm-install ${D}${bindir} } +do_install_append_qemux86-64() { + sed -i -e '/LD_PRELOAD=\/usr\/lib\/libEGL.so/d' ${D}${systemd_user_unitdir}/afm-user-daemon.service +} + do_install_append_smack () { install -d ${D}/${sysconfdir}/smack/accesses.d cat > ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user < Date: Mon, 6 Mar 2017 17:11:33 +0100 Subject: [PATCH 15/16] Add service dependency on run-agl-postinsts * if we add meta-app-framework you should add dependency on afm-system-daemon for run-agl-postinsts service [SPEC-431] Change-Id: I17ac918c0880aa46ba01e78257aacac390a50aba Signed-off-by: Ronan Le Martret Signed-off-by: Stephane Desneux --- .../recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 meta-app-framework/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bbappend diff --git a/meta-app-framework/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bbappend b/meta-app-framework/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bbappend new file mode 100644 index 000000000..590ab708a --- /dev/null +++ b/meta-app-framework/recipes-devtools/run-agl-postinsts/run-agl-postinsts_1.0.bbappend @@ -0,0 +1 @@ +SYSTEMD_SERVICE_AFTER_append = " afm-system-daemon.service" -- 2.16.6 From 953167ff715a932338ce55c63b6115cb7352157f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Wed, 8 Mar 2017 13:15:58 +0100 Subject: [PATCH 16/16] Removes systemd warnings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Systemd was complaining that the service files were executable. This patch removes that issue. Change-Id: I77183bb142956fec84b3ca727f7084e8f652c292 Signed-off-by: José Bollo Signed-off-by: Stephane Desneux --- meta-app-framework/recipes-core/af-main/af-main_1.0.bb | 2 +- .../recipes-core/security-manager/security-manager_%.bbappend | 2 +- 2 files changed, 2 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 6a1d36a99..e229cd22f 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 @@ -76,7 +76,7 @@ do_install_append() { mkdir -p ${D}${sysconfdir}/systemd/user/default.target.wants mkdir -p ${D}${sysconfdir}/systemd/system/default.target.wants ln -sf ${systemd_user_unitdir}/afm-user-daemon.service ${D}${sysconfdir}/systemd/user/default.target.wants - install -p -D ${WORKDIR}/init-afm-dirs.service ${D}${systemd_unitdir}/system/init-afm-dirs.service + install -m 644 -p -D ${WORKDIR}/init-afm-dirs.service ${D}${systemd_unitdir}/system/init-afm-dirs.service ln -sf ${systemd_unitdir}/system/init-afm-dirs.service ${D}${sysconfdir}/systemd/system/default.target.wants fi install -m 0755 ${WORKDIR}/afm-install ${D}${bindir} 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 90f69eb47..23ceb2937 100644 --- a/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend +++ b/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend @@ -16,7 +16,7 @@ do_install_append () { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then mkdir -p ${D}${systemd_unitdir}/system mkdir -p ${D}${sysconfdir}/systemd/system/default.target.wants - install -p -D ${WORKDIR}/init-security-manager-db.service ${D}${systemd_unitdir}/system/init-security-manager-db.service + install -m 644 -p -D ${WORKDIR}/init-security-manager-db.service ${D}${systemd_unitdir}/system/init-security-manager-db.service ln -sf ${systemd_unitdir}/system/init-security-manager-db.service ${D}${sysconfdir}/systemd/system/default.target.wants fi } -- 2.16.6