diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-09 18:20:38 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-09 18:24:36 +0200 |
| commit | 99cef05b4c32c401868c7f487784130e607ca74c (patch) | |
| tree | 21c978e2209cddafd44e8b850eaa53dde7ed7553 /meta-app-framework | |
| parent | 0f1670b4b635d54c744a3e697be169957f321808 (diff) | |
| parent | ffa9f4476251778974c77e35d924c20b29bf2792 (diff) | |
Merge remote-tracking branch 'origin/sandbox/sdesneux/thud-upgrade'
Update the core distro to YP 2.6 'thud'.
Bug-AGL: SPEC-1837
Change-Id: I5a753503c4ca15bcb0d4f0f30c4a91e7d50ab024
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-app-framework')
| -rw-r--r-- | meta-app-framework/classes/aglwgt.bbclass | 3 | ||||
| -rw-r--r-- | meta-app-framework/conf/layer.conf | 1 | ||||
| -rw-r--r-- | meta-app-framework/recipes-core/af-main/af-main_git.bb | 4 | ||||
| -rw-r--r-- | meta-app-framework/recipes-support/libcap/libcap_%.bbappend | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass index ab3416a0d..717bd7b90 100644 --- a/meta-app-framework/classes/aglwgt.bbclass +++ b/meta-app-framework/classes/aglwgt.bbclass @@ -23,6 +23,9 @@ DEPENDS_append = " af-binder-devtools-native" EXTRA_OECMAKE_append_agl-ptest = " -DBUILD_TEST_WGT=TRUE" +# FIXME: Remove once CMake+ninja issues are resolved +OECMAKE_GENERATOR = "Unix Makefiles" + do_aglwgt_package() { cd ${B} ${S}/autobuild/agl/autobuild package BUILD_DIR=${B} DEST=${B} VERBOSE=TRUE || \ diff --git a/meta-app-framework/conf/layer.conf b/meta-app-framework/conf/layer.conf index 97ca5524a..4af5354a6 100644 --- a/meta-app-framework/conf/layer.conf +++ b/meta-app-framework/conf/layer.conf @@ -9,3 +9,4 @@ BBFILE_COLLECTIONS += "app-framework" BBFILE_PATTERN_app-framework = "^${LAYERDIR}/" BBFILE_PRIORITY_app-framework = "70" +LAYERSERIES_COMPAT_app-framework = "thud" 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 041816289..0b2153048 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 @@ -98,7 +98,7 @@ do_install_append_class-target() { echo "QT_WAYLAND_SHELL_INTEGRATION=ivi-shell" > ${D}${afm_confdir}/unit.env.d/qt-for-ivi-shell } -pkg_postinst_${PN}() { +pkg_postinst_ontarget_${PN}() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then chgrp ${afm_name} $D${systemd_units_root}/system chgrp ${afm_name} $D${systemd_units_root}/system/afm-user-session@.target.wants @@ -110,7 +110,7 @@ pkg_postinst_${PN}() { chown ${afm_name}:${afm_name} $D${afm_datadir}/icons } -pkg_postinst_${PN}_append_with-lsm-smack() { +pkg_postinst_ontarget_${PN}_append_with-lsm-smack() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then chsmack -a 'System::Shared' -t $D${systemd_units_root}/system chsmack -a 'System::Shared' -t $D${systemd_units_root}/system/afm-user-session@.target.wants diff --git a/meta-app-framework/recipes-support/libcap/libcap_%.bbappend b/meta-app-framework/recipes-support/libcap/libcap_%.bbappend index c4561db22..ac909a64c 100644 --- a/meta-app-framework/recipes-support/libcap/libcap_%.bbappend +++ b/meta-app-framework/recipes-support/libcap/libcap_%.bbappend @@ -1,2 +1,3 @@ FILESEXTRAPATHS_append_class-native := ":${THISDIR}/${PN}" -SRC_URI_append_class-native = " file://removing-capability-enforcement.patch" +# FIXME: It needs to be determined if this is still required +#SRC_URI_append_class-native = " file://removing-capability-enforcement.patch" |