diff options
Diffstat (limited to 'meta-app-framework')
50 files changed, 190 insertions, 191 deletions
diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass index 00d3f9744..f42c282a7 100644 --- a/meta-app-framework/classes/aglwgt.bbclass +++ b/meta-app-framework/classes/aglwgt.bbclass @@ -9,16 +9,16 @@ # # 'wgtpkg-pack' in af-main-native is required. -DEPENDS_append = " af-main-native" +DEPENDS:append = " af-main-native" # for bindings af-binder is required. -DEPENDS_append = " af-binder" +DEPENDS:append = " af-binder" # for bindings that use the cmake-apps-module -DEPENDS_append = " cmake-apps-module-native" +DEPENDS:append = " cmake-apps-module-native" # for hal bindings genskel is required. -DEPENDS_append = " af-binder-devtools-native" +DEPENDS:append = " af-binder-devtools-native" # Re-enable strip for qmake based projects (default value is "echo") OE_QMAKE_STRIP = "${STRIP}" @@ -47,8 +47,8 @@ AGLWGT_AUTOINSTALL ?= "1" # Signature keys # These are default keys for development purposes ! # Change it for production. -WGTPKG_AUTOSIGN_0_agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/developer.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/developer.cert.pem" -WGTPKG_AUTOSIGN_1_agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/platform.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/platform.cert.pem" +WGTPKG_AUTOSIGN_0:agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/developer.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/developer.cert.pem" +WGTPKG_AUTOSIGN_1:agl-sign-wgts ??= "${WORKDIR}/recipe-sysroot-native/usr/share/afm/keys/platform.key.pem:${WORKDIR}/recipe-sysroot-native/usr/share/afm/certs/platform.cert.pem" export WGTPKG_AUTOSIGN_0 export WGTPKG_AUTOSIGN_1 @@ -169,17 +169,17 @@ EOF PACKAGES += "${PN}-test ${PN}-debug ${PN}-coverage" -FILES_${PN} += " \ +FILES:${PN} += " \ /usr/AGL/apps/release/*.wgt \ /usr/AGL/apps/autoinstall \ /usr/AGL/apps/manualinstall \ ${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} \ " -FILES_${PN}-test = "/usr/AGL/apps/test/*.wgt" -FILES_${PN}-debug = "/usr/AGL/apps/debug/*.wgt" -FILES_${PN}-coverage = "/usr/AGL/apps/coverage/*.wgt" +FILES:${PN}-test = "/usr/AGL/apps/test/*.wgt" +FILES:${PN}-debug = "/usr/AGL/apps/debug/*.wgt" +FILES:${PN}-coverage = "/usr/AGL/apps/coverage/*.wgt" # Test widgets need the parent widget and the test framework -RDEPENDS_${PN}-test = "${PN} afb-test" +RDEPENDS:${PN}-test = "${PN} afb-test" EXPORT_FUNCTIONS do_configure do_compile do_install diff --git a/meta-app-framework/conf/include/agl-appfw-smack.inc b/meta-app-framework/conf/include/agl-appfw-smack.inc index 831368a31..f22fe715c 100644 --- a/meta-app-framework/conf/include/agl-appfw-smack.inc +++ b/meta-app-framework/conf/include/agl-appfw-smack.inc @@ -1,7 +1,7 @@ # enable security features (smack, cynagora) - required by Application Framework OVERRIDES .= ":with-lsm-smack" -DISTRO_FEATURES_append = " smack xattr" -DISTRO_FEATURES_NATIVE_append = " smack xattr" +DISTRO_FEATURES:append = " smack xattr" +DISTRO_FEATURES_NATIVE:append = " smack xattr" APPFW_ENABLED = "1" @@ -14,11 +14,11 @@ EXTRANATIVEPATH += "tar-native" IMAGE_FEATURES += "ssh-server-openssh" # enforce copy of xattrs (to be removed, see SPEC-475) -PACKAGECONFIG_append_pn-shadow = " attr" -PACKAGECONFIG_append_pn-shadow-native = " attr" +PACKAGECONFIG:append:pn-shadow = " attr" +PACKAGECONFIG:append:pn-shadow-native = " attr" # set the home directory for root ROOT_HOME = "/home/0" # include devel wgts in images -IMAGE_FEATURES_append = " agl-devel-wgt" +IMAGE_FEATURES:append = " agl-devel-wgt" diff --git a/meta-app-framework/conf/include/agl-sign-wgts.inc b/meta-app-framework/conf/include/agl-sign-wgts.inc index d56c01288..06a7abac0 100644 --- a/meta-app-framework/conf/include/agl-sign-wgts.inc +++ b/meta-app-framework/conf/include/agl-sign-wgts.inc @@ -1,3 +1,3 @@ # allows insertion of code or items specific to developement OVERRIDES .= ":agl-sign-wgts" -AGL_FEATURES_append = " agl-sign-wgts" +AGL_FEATURES:append = " agl-sign-wgts" diff --git a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security_appfw.inc b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security_appfw.inc index 423f15fdb..52d3f0e92 100644 --- a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security_appfw.inc +++ b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security_appfw.inc @@ -1,4 +1,4 @@ -RDEPENDS_${PN}_append = "\ +RDEPENDS:${PN}:append = "\ smack-system-setup \ xmlsec1 \ cynagora \ diff --git a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot_appfw.inc b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot_appfw.inc index b3383f114..2499c07b5 100644 --- a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot_appfw.inc +++ b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot_appfw.inc @@ -1,3 +1,3 @@ -RDEPENDS_${PN}_append = "\ +RDEPENDS:${PN}:append = "\ packagegroup-agl-app-framework \ " diff --git a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal_appfw.inc b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal_appfw.inc index b3383f114..2499c07b5 100644 --- a/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal_appfw.inc +++ b/meta-app-framework/dynamic-layers/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal_appfw.inc @@ -1,3 +1,3 @@ -RDEPENDS_${PN}_append = "\ +RDEPENDS:${PN}:append = "\ packagegroup-agl-app-framework \ " diff --git a/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb b/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb index 802167b2d..afbbc09b3 100644 --- a/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb +++ b/meta-app-framework/dynamic-layers/meta-qt5/recipes-devtools/libafb-helpers-qt/libafb-helpers-qt_git.bb @@ -1,11 +1,11 @@ require recipes-devtools/libafb-helpers/libafb-helpers_git.inc -DEPENDS_append = " qtwebsockets" -RDEPENDS_${PN}_append = " af-binder" +DEPENDS:append = " qtwebsockets" +RDEPENDS:${PN}:append = " af-binder" inherit cmake_qt5 -EXTRA_OECMAKE_append = " -DAFB_HELPERS_QT=ON -DAFB_HELPERS=OFF" +EXTRA_OECMAKE:append = " -DAFB_HELPERS_QT=ON -DAFB_HELPERS=OFF" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-app-framework/dynamic-layers/meta-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-qt5.bb b/meta-app-framework/dynamic-layers/meta-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-qt5.bb index 2f0f01fec..853627622 100644 --- a/meta-app-framework/dynamic-layers/meta-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-qt5.bb +++ b/meta-app-framework/dynamic-layers/meta-qt5/recipes-platform/packagegroups/packagegroup-agl-appfw-qt5.bb @@ -9,8 +9,8 @@ PACKAGES = "\ packagegroup-agl-appfw-qt5 \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-appfw-native \ "
\ No newline at end of file diff --git a/meta-app-framework/recipes-connectivity/bluez5/bluez5_appfw.inc b/meta-app-framework/recipes-connectivity/bluez5/bluez5_appfw.inc index 21529e96b..7b74de980 100644 --- a/meta-app-framework/recipes-connectivity/bluez5/bluez5_appfw.inc +++ b/meta-app-framework/recipes-connectivity/bluez5/bluez5_appfw.inc @@ -42,14 +42,14 @@ # The related patch has been submitted to upstream too. # upstream link: http://permalink.gmane.org/gmane.linux.bluez.kernel/67993 -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append_with-lsm-smack = "\ +SRC_URI:append:with-lsm-smack = "\ file://bluetooth.service.conf \ " -FILES_${PN}_append = " ${systemd_unitdir}" +FILES:${PN}:append = " ${systemd_unitdir}" -do_install_append_with-lsm-smack() { +do_install:append:with-lsm-smack() { install -Dm0644 ${WORKDIR}/bluetooth.service.conf ${D}${systemd_unitdir}/system/bluetooth.service.d/smack.conf } diff --git a/meta-app-framework/recipes-connectivity/connman/connman_appfw.inc b/meta-app-framework/recipes-connectivity/connman/connman_appfw.inc index 23af33104..644602021 100644 --- a/meta-app-framework/recipes-connectivity/connman/connman_appfw.inc +++ b/meta-app-framework/recipes-connectivity/connman/connman_appfw.inc @@ -19,16 +19,16 @@ # in which connmand runs, this change is not submitted upstream # and it can be overridden by a distro via FIX_CONNMAN_CAPABILITIES. -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append_with-lsm-smack = "\ +SRC_URI:append:with-lsm-smack = "\ file://connman.service.conf \ " -RDEPENDS_${PN}_append_with-lsm-smack = " smack" +RDEPENDS:${PN}:append:with-lsm-smack = " smack" -FILES_${PN}_append = " ${systemd_unitdir}" +FILES:${PN}:append = " ${systemd_unitdir}" -do_install_append_with-lsm-smack() { +do_install:append:with-lsm-smack() { install -Dm0644 ${WORKDIR}/connman.service.conf ${D}${systemd_unitdir}/system/connman.service.d/smack.conf } diff --git a/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb b/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb index 70dafb38c..1331fb886 100644 --- a/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb +++ b/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb @@ -4,5 +4,5 @@ DEPENDS = "json-c-native" inherit cmake pkgconfig native -EXTRA_OECMAKE_append = " -DONLY_DEVTOOLS=TRUE" +EXTRA_OECMAKE:append = " -DONLY_DEVTOOLS=TRUE" diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_git.bb b/meta-app-framework/recipes-core/af-binder/af-binder_git.bb index cf20e25a1..4728e47ea 100644 --- a/meta-app-framework/recipes-core/af-binder/af-binder_git.bb +++ b/meta-app-framework/recipes-core/af-binder/af-binder_git.bb @@ -4,21 +4,21 @@ DEPENDS = "file json-c libmicrohttpd systemd util-linux openssl cynara" inherit cmake pkgconfig -EXTRA_OECMAKE_append_class-target = "\ +EXTRA_OECMAKE:append:class-target = "\ -DUNITDIR_SYSTEM=${systemd_system_unitdir} \ " -EXTRA_OECMAKE_append_agl-devel = " \ +EXTRA_OECMAKE:append:agl-devel = " \ -DAGL_DEVEL=ON \ -DINCLUDE_MONITORING=ON \ -DINCLUDE_SUPERVISOR=ON -DAFS_SUPERVISION_SOCKET=/run/platform/supervisor \ " -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { mkdir -p "$D${libdir}/afb" } -do_install_append_agl-devel_class-target() { +do_install:append:agl-devel:class-target() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d -m 0755 ${D}${systemd_system_unitdir}/multi-user.target.wants ln -s ../afm-api-supervisor.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afm-api-supervisor.service @@ -29,19 +29,19 @@ do_install_append_agl-devel_class-target() { # main package ############################################# -FILES_${PN}_append_agl-devel = " ${libdir}/afb/monitoring ${systemd_system_unitdir}" +FILES:${PN}:append:agl-devel = " ${libdir}/afb/monitoring ${systemd_system_unitdir}" -RDEPENDS_${PN}-dev += "libafbwsc-dev" +RDEPENDS:${PN}-dev += "libafbwsc-dev" ############################################# # intrinsic binding packages ############################################# PACKAGES =+ "${PN}-intrinsic-bindings" -ALLOW_EMPTY_${PN}-intrinsic-bindings = "1" +ALLOW_EMPTY:${PN}-intrinsic-bindings = "1" PACKAGES_DYNAMIC = "${PN}-binding-*" -python populate_packages_prepend () { +python populate_packages:prepend () { afb_libdir = d.expand('${libdir}/afb') postinst = d.getVar('binding_postinst', True) pkgs = [] @@ -49,7 +49,7 @@ python populate_packages_prepend () { pkgs += do_split_packages(d, afb_libdir, '(.*)-api\.so$', d.expand('${PN}-binding-%s'), 'AFB binding for %s', postinst=postinst, extra_depends=d.expand('${PN}')) pkgs += do_split_packages(d, afb_libdir, '(.*(?!-api))\.so$', d.expand('${PN}-binding-%s'), 'AFB binding for %s', postinst=postinst, extra_depends=d.expand('${PN}')) - d.setVar('RDEPENDS_' + d.getVar('PN', True) + '-intrinsic-bindings', ' '.join(pkgs)) + d.setVar('RDEPENDS:' + d.getVar('PN', True) + '-intrinsic-bindings', ' '.join(pkgs)) } ############################################# @@ -57,7 +57,7 @@ python populate_packages_prepend () { ############################################# PACKAGES =+ "${PN}-tools" -FILES_${PN}-tools = "\ +FILES:${PN}-tools = "\ ${bindir}/afb-client-demo \ " @@ -66,10 +66,10 @@ FILES_${PN}-tools = "\ ############################################# PACKAGES =+ "libafbwsc libafbwsc-dev" -FILES_libafbwsc = "\ +FILES:libafbwsc = "\ ${libdir}/libafbwsc.so.* \ " -FILES_libafbwsc-dev = "\ +FILES:libafbwsc-dev = "\ ${includedir}/afb/afb-wsj1.h \ ${includedir}/afb/afb-ws-client.h \ ${libdir}/libafbwsc.so \ @@ -81,7 +81,7 @@ FILES_libafbwsc-dev = "\ ############################################# PACKAGES =+ "${PN}-devtools" -FILES_${PN}-devtools = "\ +FILES:${PN}-devtools = "\ ${bindir}/afb-exprefs \ ${bindir}/afb-json2c \ ${bindir}/afb-genskel \ @@ -90,9 +90,9 @@ FILES_${PN}-devtools = "\ ############################################# # supervisor package ############################################# -PACKAGES_append_agl-devel = " ${PN}-supervisor " +PACKAGES:append:agl-devel = " ${PN}-supervisor " -FILES_${PN}-supervisor_agl-devel = "\ +FILES:${PN}-supervisor:agl-devel = "\ ${bindir}/afs-supervisor \ ${systemd_system_unitdir} \ " @@ -102,7 +102,7 @@ FILES_${PN}-supervisor_agl-devel = "\ ############################################# PACKAGES =+ "${PN}-samples" -FILES_${PN}-samples = "\ +FILES:${PN}-samples = "\ ${datadir}/af-binder \ " @@ -110,8 +110,8 @@ FILES_${PN}-samples = "\ # meta package ############################################# PACKAGES =+ "${PN}-meta" -ALLOW_EMPTY_${PN}-meta = "1" +ALLOW_EMPTY:${PN}-meta = "1" -RDEPENDS_${PN}-meta += "${PN} ${PN}-tools libafbwsc ${PN}-intrinsic-bindings" -RDEPENDS_${PN}-meta_append_agl-devel = " ${PN}-supervisor " +RDEPENDS:${PN}-meta += "${PN} ${PN}-tools libafbwsc ${PN}-intrinsic-bindings" +RDEPENDS:${PN}-meta:append:agl-devel = " ${PN}-supervisor " diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_git.inc b/meta-app-framework/recipes-core/af-binder/af-binder_git.inc index fbaa47bc7..2908e5dca 100644 --- a/meta-app-framework/recipes-core/af-binder/af-binder_git.inc +++ b/meta-app-framework/recipes-core/af-binder/af-binder_git.inc @@ -14,9 +14,9 @@ PV = "${AGL_BRANCH}+git${SRCPV}" S = "${WORKDIR}/git" -CFLAGS_append_agl-devel = " -DAGL_DEVEL" +CFLAGS:append:agl-devel = " -DAGL_DEVEL" -EXTRA_OECMAKE_append = "\ +EXTRA_OECMAKE:append = "\ -DAGLVERSION=${AGLVERSION} \ " diff --git a/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb b/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb index 3223dd05d..334d073c2 100644 --- a/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb +++ b/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb @@ -4,5 +4,5 @@ DEPENDS = "nativesdk-json-c" inherit cmake pkgconfig nativesdk -EXTRA_OECMAKE_append = " -DONLY_DEVTOOLS=TRUE" +EXTRA_OECMAKE:append = " -DONLY_DEVTOOLS=TRUE" 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 917eaa414..8e72e4572 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 @@ -11,12 +11,12 @@ BBCLASSEXTEND = "native" SECTION = "base" DEPENDS = "openssl libxml2 xmlsec1 systemd libzip json-c systemd security-manager af-binder sed m4" -DEPENDS_class-native = "openssl libxml2 xmlsec1 libzip json-c" -RDEPENDS_${PN}_class-target += "af-binder-tools nss-localuser cynagoauth" +DEPENDS:class-native = "openssl libxml2 xmlsec1 libzip json-c" +RDEPENDS:${PN}:class-target += "af-binder-tools nss-localuser cynagoauth" -PACKAGE_WRITE_DEPS_append_with-lsm-smack = " smack-native libcap-native" +PACKAGE_WRITE_DEPS:append:with-lsm-smack = " smack-native libcap-native" -EXTRA_OECMAKE_append_class-native = "\ +EXTRA_OECMAKE:append:class-native = "\ -DUSE_LIBZIP=1 \ -DUSE_SIMULATION=1 \ -DUSE_SDK=1 \ @@ -26,7 +26,7 @@ EXTRA_OECMAKE_append_class-native = "\ -Dafm_datadir=${afm_datadir} \ " -EXTRA_OECMAKE_append_class-target = "\ +EXTRA_OECMAKE:append:class-target = "\ -DUSE_LIBZIP=1 \ -DUSE_SIMULATION=0 \ -DUSE_SDK=0 \ @@ -52,23 +52,23 @@ EXTRA_OECMAKE_append_class-target = "\ AGL_FORBID_UNSIGNED_APPS ?= "0" # # WORKAROUND: -EXTRA_OECMAKE_append_agl-devel = " -DAGL_DEVEL=1" -EXTRA_OECMAKE_append = " ${@bb.utils.contains('AGL_FORBID_UNSIGNED_APPS','1','','-DALLOW_NO_SIGNATURE=ON', d)}" +EXTRA_OECMAKE:append:agl-devel = " -DAGL_DEVEL=1" +EXTRA_OECMAKE:append = " ${@bb.utils.contains('AGL_FORBID_UNSIGNED_APPS','1','','-DALLOW_NO_SIGNATURE=ON', d)}" # # Correct version (IMPORTANT TODO: to be restored later): -#EXTRA_OECMAKE_append_agl-devel = " -DAGL_DEVEL=1 -DALLOW_NO_SIGNATURE=ON" +#EXTRA_OECMAKE:append:agl-devel = " -DAGL_DEVEL=1 -DALLOW_NO_SIGNATURE=ON" # # ------------------------ WARNING WARNING WARNNING --------------------------- USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --gid ${afm_name} --home-dir ${afm_datadir} ${afm_name}" -GROUPADD_PARAM_${PN} = "--system ${afm_name}" +USERADD_PARAM:${PN} = "--system --gid ${afm_name} --home-dir ${afm_datadir} ${afm_name}" +GROUPADD_PARAM:${PN} = "--system ${afm_name}" -RDEPENDS_${PN}_append_with-lsm-smack = " smack bash" -DEPENDS_append_with-lsm-smack = " smack-native" +RDEPENDS:${PN}:append:with-lsm-smack = " smack bash" +DEPENDS:append:with-lsm-smack = " smack-native" -do_install_append_class-target() { +do_install:append:class-target() { install -d ${D}${bindir} install -d -m 0775 ${D}${systemd_units_root}/system install -d -m 0775 "${D}${systemd_units_root}/system/multi-user.target.wants" @@ -87,7 +87,7 @@ do_install_append_class-target() { fi } -pkg_postinst_ontarget_${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 @@ -99,7 +99,7 @@ pkg_postinst_ontarget_${PN}() { chown ${afm_name}:${afm_name} $D${afm_datadir}/icons } -pkg_postinst_ontarget_${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 @@ -110,13 +110,13 @@ pkg_postinst_ontarget_${PN}_append_with-lsm-smack() { chsmack -a 'System::Shared' -t $D${afm_datadir}/applications chsmack -a 'System::Shared' -t $D${afm_datadir}/icons } -FILES_${PN} += "${systemd_units_root}/* ${systemd_system_unitdir} ${systemd_user_unitdir}" -FILES_${PN}_append_agl-sign-wgts = " ${datadir}/afm" +FILES:${PN} += "${systemd_units_root}/* ${systemd_system_unitdir} ${systemd_user_unitdir}" +FILES:${PN}:append:agl-sign-wgts = " ${datadir}/afm" PACKAGES =+ "${PN}-binding ${PN}-binding-dbg" -FILES_${PN}-binding = " ${afb_binding_dir}/afm-main-binding.so " -FILES_${PN}-binding-dbg = " ${afb_binding_dir}/.debug/afm-main-binding.so " +FILES:${PN}-binding = " ${afb_binding_dir}/afm-main-binding.so " +FILES:${PN}-binding-dbg = " ${afb_binding_dir}/.debug/afm-main-binding.so " PACKAGES =+ "${PN}-tools ${PN}-tools-dbg" -FILES_${PN}-tools = "${bindir}/wgtpkg-*" -FILES_${PN}-tools-dbg = "${bindir}/.debug/wgtpkg-*" +FILES:${PN}-tools = "${bindir}/wgtpkg-*" +FILES:${PN}-tools-dbg = "${bindir}/.debug/wgtpkg-*" 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 5ac76a796..11d563a34 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 @@ -21,10 +21,10 @@ afm_datadir = "/var/local/lib/${afm_name}" afb_binding_dir = "${libdir}/afb" systemd_units_root = "/var/local/lib/systemd" -CFLAGS_append_agl-devel = " -DAGL_DEVEL" +CFLAGS:append:agl-devel = " -DAGL_DEVEL" # only install sample keys in agl-devel mode # for production you need to deploy real keys -EXTRA_OECMAKE_append_agl-sign-wgts = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '-DINSTALL_SAMPLE_KEYS=ON', '-DINSTALL_SAMPLE_KEYS=OFF', d)}" +EXTRA_OECMAKE:append:agl-sign-wgts = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '-DINSTALL_SAMPLE_KEYS=ON', '-DINSTALL_SAMPLE_KEYS=OFF', d)}" diff --git a/meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb b/meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb index 88ab4ae68..4564831a8 100644 --- a/meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb +++ b/meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb @@ -16,13 +16,12 @@ EXTRA_OECMAKE = "\ -Dafm_datadir=${afm_datadir} \ " -do_install_append() { +do_install:append() { # remove unused .pc file we don't want to package rm -rf ${D}/${libdir} } PACKAGES = "${PN}-tools ${PN}-tools-dbg" -FILES_${PN}-tools = "${bindir}/wgtpkg-* ${afm_confdir}/*" -FILES_${PN}-tools_append_agl-sign-wgts = " ${datadir}/afm" -FILES_${PN}-tools-dbg = "${bindir}/.debug/wgtpkg-*" - +FILES:${PN}-tools = "${bindir}/wgtpkg-* ${afm_confdir}/*" +FILES:${PN}-tools:append:agl-sign-wgts = " ${datadir}/afm" +FILES:${PN}-tools-dbg = "${bindir}/.debug/wgtpkg-*" diff --git a/meta-app-framework/recipes-core/af-platform-setup/af-platform-setup_1.0.bb b/meta-app-framework/recipes-core/af-platform-setup/af-platform-setup_1.0.bb index eb473cd14..52c7a6534 100644 --- a/meta-app-framework/recipes-core/af-platform-setup/af-platform-setup_1.0.bb +++ b/meta-app-framework/recipes-core/af-platform-setup/af-platform-setup_1.0.bb @@ -13,4 +13,4 @@ do_install() { install -m 0644 ${S}/udev-shared.conf $d } -FILES_${PN} = "${systemd_system_unitdir}" +FILES:${PN} = "${systemd_system_unitdir}" diff --git a/meta-app-framework/recipes-core/base-files/base-files_appfw.inc b/meta-app-framework/recipes-core/base-files/base-files_appfw.inc index 848a39ff4..4c8301314 100644 --- a/meta-app-framework/recipes-core/base-files/base-files_appfw.inc +++ b/meta-app-framework/recipes-core/base-files/base-files_appfw.inc @@ -1,7 +1,7 @@ -RDEPENDS_${PN}_append_with-lsm-smack = " smack" -PACKAGE_WRITE_DEPS_append_with-lsm-smack = " smack-native" +RDEPENDS:${PN}:append:with-lsm-smack = " smack" +PACKAGE_WRITE_DEPS:append:with-lsm-smack = " smack-native" -do_install_append() { +do_install:append() { install -m 0700 -d ${D}/${sysconfdir}/skel chmod -R 0700 ${D}/${sysconfdir}/skel install -m 0700 -d ${D}/${sysconfdir}/skel/app-data @@ -15,7 +15,7 @@ do_install_append() { ln -s ../var/local ${D}/usr/local } -do_install_append_with-lsm-smack () { +do_install:append:with-lsm-smack () { install -d ${D}/${sysconfdir}/smack/accesses.d cat > ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user <<EOF System User::App-Shared rwxat @@ -24,7 +24,7 @@ EOF chmod 0644 ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user } -pkg_postinst_${PN}_append_with-lsm-smack() { +pkg_postinst:${PN}:append:with-lsm-smack() { chsmack -r -a 'User::Home' -t -D $D/${sysconfdir}/skel chsmack -a 'User::App-Shared' -D $D/${sysconfdir}/skel/app-data cp -rTf --preserve=all $D/${sysconfdir}/skel $D/${ROOT_HOME} @@ -35,7 +35,7 @@ pkg_postinst_${PN}_append_with-lsm-smack() { # Install default Smack rules, copied from a running Tizen IVI 3.0. # Corresponds to manifest file from default-access-domains in Tizen: # https://review.tizen.org/git?p=platform/core/security/default-ac-domains.git;a=blob;f=packaging/default-ac-domains.manifest -do_install_append_with-lsm-smack () { +do_install:append:with-lsm-smack () { install -d ${D}/${sysconfdir}/smack/accesses.d cat >${D}/${sysconfdir}/smack/accesses.d/default-access-domains <<EOF System _ -----l @@ -74,9 +74,9 @@ EOF # via postinst. This is much easier to use with bitbake, too: # - no need to maintain a patched rpm # - works for directories which are not packaged by default when empty -RDEPENDS_${PN}_append_with-lsm-smack = " smack" -DEPENDS_append_with-lsm-smack = " smack-native" -pkg_postinst_${PN}_with-lsm-smack() { +RDEPENDS:${PN}:append:with-lsm-smack = " smack" +DEPENDS:append:with-lsm-smack = " smack-native" +pkg_postinst:${PN}:with-lsm-smack() { #!/bin/sh -e # https://review.tizen.org/gerrit/gitweb?p=platform/upstream/filesystem.git;a=blob;f=packaging/filesystem.manifest: diff --git a/meta-app-framework/recipes-core/coreutils/coreutils_appfw.inc b/meta-app-framework/recipes-core/coreutils/coreutils_appfw.inc index 1b9b722ec..234487531 100644 --- a/meta-app-framework/recipes-core/coreutils/coreutils_appfw.inc +++ b/meta-app-framework/recipes-core/coreutils/coreutils_appfw.inc @@ -1,7 +1,7 @@ # Smack patches are included in coreutils v8.22, we just need to enable them. # The default is not deterministic (enabled if libsmack found), so disable # explicitly otherwise. -EXTRA_OECONF_SMACK_class-target = "--disable-libsmack" -EXTRA_OECONF_SMACK_with-lsm-smack_class-target = "--enable-libsmack" -EXTRA_OECONF_append_class-target = " ${EXTRA_OECONF_SMACK}" -DEPENDS_append_with-lsm-smack_class-target = " smack" +EXTRA_OECONF_SMACK:class-target = "--disable-libsmack" +EXTRA_OECONF_SMACK:with-lsm-smack:class-target = "--enable-libsmack" +EXTRA_OECONF:append:class-target = " ${EXTRA_OECONF_SMACK}" +DEPENDS:append:with-lsm-smack:class-target = " smack" diff --git a/meta-app-framework/recipes-core/dbus-cynagora/dbus_appfw.inc b/meta-app-framework/recipes-core/dbus-cynagora/dbus_appfw.inc index 177a117b8..4efeef7b8 100644 --- a/meta-app-framework/recipes-core/dbus-cynagora/dbus_appfw.inc +++ b/meta-app-framework/recipes-core/dbus-cynagora/dbus_appfw.inc @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/dbus-cynagora:" +FILESEXTRAPATHS:prepend := "${THISDIR}/dbus-cynagora:" -SRC_URI_append_class-target = "\ +SRC_URI:append:class-target = "\ file://0001-Integration-of-Cynara-asynchronous-security-checks.patch \ file://0002-Disable-message-dispatching-when-send-rule-result-is.patch \ file://0003-Handle-unavailability-of-policy-results-for-broadcas.patch \ @@ -10,6 +10,6 @@ SRC_URI_append_class-target = "\ file://0007-Switch-from-cynara-to-cynagora.patch \ " -DEPENDS_append_class-target = " cynagora smack" -EXTRA_OECONF_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES','smack','--enable-cynagora --disable-selinux','',d)}" +DEPENDS:append:class-target = " cynagora smack" +EXTRA_OECONF:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES','smack','--enable-cynagora --disable-selinux','',d)}" diff --git a/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb b/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb index 45861f7cc..93d2a2034 100644 --- a/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb +++ b/meta-app-framework/recipes-core/nss-localuser/nss-localuser_0.1.bb @@ -13,7 +13,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/nss-localuser;protocol=ht SRCREV = "66803c6fdb609ed83a78b9194ecb23e9c1b773e7" PV = "${AGL_BRANCH}+git${SRCPV}" -RDEPENDS_${PN} = "base-files" +RDEPENDS:${PN} = "base-files" S = "${WORKDIR}/git" @@ -25,15 +25,15 @@ do_install() { make nssdir=${D}${libdir} install } -pkg_postinst_ontarget_${PN} () { +pkg_postinst_ontarget:${PN} () { sed -e '/^hosts:/s/\<localuser\>\s*//' \ -e 's/\(^hosts:\s\s*\)\(.*\)/\1localuser \2/' \ -i $D${sysconfdir}/nsswitch.conf } -pkg_prerm_${PN} () { +pkg_prerm:${PN} () { sed -e '/^hosts:/s/\<localuser\>\s*//' \ -i $D${sysconfdir}/nsswitch.conf } -INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP:${PN} = "ldflags" diff --git a/meta-app-framework/recipes-core/shadow/shadow_appfw.inc b/meta-app-framework/recipes-core/shadow/shadow_appfw.inc index 472ffef2c..d41c996e9 100644 --- a/meta-app-framework/recipes-core/shadow/shadow_appfw.inc +++ b/meta-app-framework/recipes-core/shadow/shadow_appfw.inc @@ -1,3 +1,3 @@ -do_install_append() { +do_install:append() { sed -i '/^UMASK/s:^.*$:UMASK 077:' ${D}${sysconfdir}/login.defs } diff --git a/meta-app-framework/recipes-core/smack-system-setup/smack-system-setup_1.bb b/meta-app-framework/recipes-core/smack-system-setup/smack-system-setup_1.bb index 49b12ad3f..b74f462b4 100644 --- a/meta-app-framework/recipes-core/smack-system-setup/smack-system-setup_1.bb +++ b/meta-app-framework/recipes-core/smack-system-setup/smack-system-setup_1.bb @@ -9,9 +9,9 @@ SRC_URI = "\ file://tmp.mount.conf \ " -RDEPENDS_${PN}_append_with-lsm-smack = " smack" +RDEPENDS:${PN}:append:with-lsm-smack = " smack" -do_install_append_with-lsm-smack() { +do_install:append:with-lsm-smack() { # tuning systemd units install -Dm0644 ${WORKDIR}/systemd-tmpfiles-setup.service.conf \ ${D}${systemd_unitdir}/system/systemd-tmpfiles-setup.service.d/smack.conf @@ -25,4 +25,4 @@ do_install_append_with-lsm-smack() { ${D}${sysconfdir}/udev/rules.d/55-udev-smack-default.rules } -FILES_${PN} += "${systemd_unitdir}" +FILES:${PN} += "${systemd_unitdir}" diff --git a/meta-app-framework/recipes-core/systemd/systemd_appfw.inc b/meta-app-framework/recipes-core/systemd/systemd_appfw.inc index a5e1ae840..8aa72c570 100644 --- a/meta-app-framework/recipes-core/systemd/systemd_appfw.inc +++ b/meta-app-framework/recipes-core/systemd/systemd_appfw.inc @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:" +FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:" # Ensures systemd runs with label "System" -EXTRA_OEMESON_append_with-lsm-smack = " -Dsmack-run-label=System" +EXTRA_OEMESON:append:with-lsm-smack = " -Dsmack-run-label=System" ################################################################################## # Maintaining trivial, non-upstreamable configuration changes as patches @@ -34,7 +34,7 @@ patch_systemd() { # This comes with the recipe systemd_230/234 of poky (meta/recipes-core/systemd) # It should be removed when poky changes. ################################################################################## -do_install_prepend() { +do_install:prepend() { mv ${WORKDIR}/touchscreen.rules ${WORKDIR}/55-touchscreen.rules || true } diff --git a/meta-app-framework/recipes-core/util-linux/util-linux_appfw.inc b/meta-app-framework/recipes-core/util-linux/util-linux_appfw.inc index 05286f80d..7399aa44d 100644 --- a/meta-app-framework/recipes-core/util-linux/util-linux_appfw.inc +++ b/meta-app-framework/recipes-core/util-linux/util-linux_appfw.inc @@ -4,5 +4,5 @@ # booting with "security=none" when userspace otherwise is # compiled to use Smack. -PACKAGECONFIG_append_with-lsm-smack_class-target = " smack" +PACKAGECONFIG:append:with-lsm-smack:class-target = " smack" PACKAGECONFIG[smack] = "--with-smack, --without-smack" diff --git a/meta-app-framework/recipes-devtools/cmake-apps-module/cmake-apps-module_git.bb b/meta-app-framework/recipes-devtools/cmake-apps-module/cmake-apps-module_git.bb index 3fea2ed91..4164171ff 100644 --- a/meta-app-framework/recipes-devtools/cmake-apps-module/cmake-apps-module_git.bb +++ b/meta-app-framework/recipes-devtools/cmake-apps-module/cmake-apps-module_git.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" inherit cmake -FILES_${PN} += " ${datadir}/*/Modules/CMakeAfbTemplates*" +FILES:${PN} += " ${datadir}/*/Modules/CMakeAfbTemplates*" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-app-framework/recipes-devtools/json-c/json-c_appfw.inc b/meta-app-framework/recipes-devtools/json-c/json-c_appfw.inc index f1547e14b..c15548c55 100644 --- a/meta-app-framework/recipes-devtools/json-c/json-c_appfw.inc +++ b/meta-app-framework/recipes-devtools/json-c/json-c_appfw.inc @@ -1 +1 @@ -EXTRA_OECONF_append = " --enable-threading" +EXTRA_OECONF:append = " --enable-threading" diff --git a/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb b/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb index 1174ac4d7..9ca32fdda 100644 --- a/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb +++ b/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.bb @@ -2,7 +2,7 @@ require libafb-helpers_git.inc inherit cmake -RDEPENDS_${PN}_append = " af-binder" +RDEPENDS:${PN}:append = " af-binder" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.inc b/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.inc index 6753225b4..6da093237 100644 --- a/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.inc +++ b/meta-app-framework/recipes-devtools/libafb-helpers/libafb-helpers_git.inc @@ -10,5 +10,5 @@ SRCREV = "1d1c6cef6039effd4c045a76d30414b589336d0e" PV = "${AGLVERSION}" S = "${WORKDIR}/git" -DEPENDS_append = " af-binder jq" +DEPENDS:append = " af-binder jq" diff --git a/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb b/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb index 0ee9c5e84..74fe08144 100644 --- a/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb +++ b/meta-app-framework/recipes-devtools/libappcontroller/libappcontroller_git.bb @@ -10,10 +10,10 @@ SRCREV = "1bef31c8bbad27f4914484c5007b2e199fb073d4" PV = "${AGLVERSION}" S = "${WORKDIR}/git" -DEPENDS_append = " af-binder libafb-helpers lua" -RDEPENDS_${PN}_append = " af-binder lua" +DEPENDS:append = " af-binder libafb-helpers lua" +RDEPENDS:${PN}:append = " af-binder lua" inherit cmake -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-app-framework/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host_appfw.inc b/meta-app-framework/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host_appfw.inc index 8d6ffb5b3..27ee7cf52 100644 --- a/meta-app-framework/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host_appfw.inc +++ b/meta-app-framework/recipes-devtools/packagegroups/nativesdk-packagegroup-sdk-host_appfw.inc @@ -1,4 +1,4 @@ -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ nativesdk-af-main-tools \ nativesdk-af-binder-devtools \ nativesdk-cmake-apps-module \ diff --git a/meta-app-framework/recipes-devtools/run-postinsts/run-postinsts_appfw.inc b/meta-app-framework/recipes-devtools/run-postinsts/run-postinsts_appfw.inc index 2f3effce6..07b958aea 100644 --- a/meta-app-framework/recipes-devtools/run-postinsts/run-postinsts_appfw.inc +++ b/meta-app-framework/recipes-devtools/run-postinsts/run-postinsts_appfw.inc @@ -1,14 +1,14 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/run-postinsts:" +FILESEXTRAPATHS:prepend := "${THISDIR}/run-postinsts:" -SRC_URI_append = " file://ldconfig-wait.conf" +SRC_URI:append = " file://ldconfig-wait.conf" -do_configure_append() { +do_configure:append() { if ! grep -q StandardOutput= ${WORKDIR}/run-postinsts.service; then sed -i '/ExecStart=/iStandardOutput=journal+console' ${WORKDIR}/run-postinsts.service fi } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/systemd/system/run-postinsts.service.d install -m 0644 ${WORKDIR}/ldconfig-wait.conf ${D}${sysconfdir}/systemd/system/run-postinsts.service.d } diff --git a/meta-app-framework/recipes-graphics/wayland/wayland_appfw.inc b/meta-app-framework/recipes-graphics/wayland/wayland_appfw.inc index f39122de2..a1d55a17d 100644 --- a/meta-app-framework/recipes-graphics/wayland/wayland_appfw.inc +++ b/meta-app-framework/recipes-graphics/wayland/wayland_appfw.inc @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/wayland:" +FILESEXTRAPATHS:prepend := "${THISDIR}/wayland:" -SRC_URI_append = "\ +SRC_URI:append = "\ file://0001-Change-socket-mode-add-rw-for-group.patch \ " diff --git a/meta-app-framework/recipes-graphics/wayland/weston_8.0_appfw.inc b/meta-app-framework/recipes-graphics/wayland/weston_8.0_appfw.inc index 219ed1aef..a72f22430 100644 --- a/meta-app-framework/recipes-graphics/wayland/weston_8.0_appfw.inc +++ b/meta-app-framework/recipes-graphics/wayland/weston_8.0_appfw.inc @@ -1,19 +1,19 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/weston" +FILESEXTRAPATHS:append := ":${THISDIR}/weston" -SRC_URI_append = "\ +SRC_URI:append = "\ file://0001-Allow-regular-users-to-launch-Weston_7.0.0.patch \ file://smack-weston \ " -EXTRA_OEMESON_append = " -Denable-user-start=true" +EXTRA_OEMESON:append = " -Denable-user-start=true" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'smack', 'true', 'false', d)}; then # Install SMACK rules install -D -m 0644 ${WORKDIR}/smack-weston ${D}${sysconfdir}/smack/accesses.d/weston fi } -FILES_${PN}_append = "\ +FILES:${PN}:append = "\ ${sysconfdir}/smack/accesses.d/* \ " diff --git a/meta-app-framework/recipes-kernel/linux/linux-appfw.inc b/meta-app-framework/recipes-kernel/linux/linux-appfw.inc index 1b6d1b6a8..68fb35882 100644 --- a/meta-app-framework/recipes-kernel/linux/linux-appfw.inc +++ b/meta-app-framework/recipes-kernel/linux/linux-appfw.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux:" # Enable SMACK support without making it the default explicitly. AGL_KCONFIG_FRAGMENTS += "smack.cfg" diff --git a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework-examples.bb b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework-examples.bb index 7ba909162..1c904211b 100644 --- a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework-examples.bb +++ b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework-examples.bb @@ -8,7 +8,7 @@ PACKAGES = "\ packagegroup-agl-app-framework-examples \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ " diff --git a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework.bb b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework.bb index d15607a40..866f2e0e3 100644 --- a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework.bb +++ b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-app-framework.bb @@ -8,9 +8,9 @@ PACKAGES_${PN} = "\ packagegroup-agl-app-framework \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ af-binder \ libafbwsc \ af-main \ diff --git a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-appfw-native.bb b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-appfw-native.bb index 750fe678d..bdd967ae8 100644 --- a/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-appfw-native.bb +++ b/meta-app-framework/recipes-platform/packagegroups/packagegroup-agl-appfw-native.bb @@ -10,7 +10,7 @@ PACKAGES = "\ packagegroup-agl-appfw-native \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ " diff --git a/meta-app-framework/recipes-platform/packagegroups/packagegroup-security-framework.bb b/meta-app-framework/recipes-platform/packagegroups/packagegroup-security-framework.bb index 6b32b0349..449ce6432 100644 --- a/meta-app-framework/recipes-platform/packagegroups/packagegroup-security-framework.bb +++ b/meta-app-framework/recipes-platform/packagegroups/packagegroup-security-framework.bb @@ -14,7 +14,7 @@ inherit packagegroup # Without configuration, security-manager is not usable. We use # the policy packaged from the upstream source code here. Adapting # it for the distro can be done by patching that source. -RDEPENDS_${PN}_append_with-lsm-smack = " \ +RDEPENDS:${PN}:append:with-lsm-smack = " \ cynagora \ security-manager \ security-manager-policy \ diff --git a/meta-app-framework/recipes-security/audit/audit_2.8.5.bb b/meta-app-framework/recipes-security/audit/audit_2.8.5.bb index e372f6665..618e5e84d 100644 --- a/meta-app-framework/recipes-security/audit/audit_2.8.5.bb +++ b/meta-app-framework/recipes-security/audit/audit_2.8.5.bb @@ -26,7 +26,7 @@ INITSCRIPT_NAME = "auditd" INITSCRIPT_PARAMS = "defaults" SYSTEMD_PACKAGES = "auditd" -SYSTEMD_SERVICE_auditd = "auditd.service" +SYSTEMD_SERVICE:auditd = "auditd.service" DEPENDS += "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native" @@ -41,8 +41,8 @@ EXTRA_OECONF += "--without-prelude \ --without-golang \ --disable-zos-remote \ " -EXTRA_OECONF_append_arm = " --with-arm=yes" -EXTRA_OECONF_append_aarch64 = " --with-aarch64=yes" +EXTRA_OECONF:append:arm = " --with-arm=yes" +EXTRA_OECONF:append:aarch64 = " --with-aarch64=yes" EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ @@ -51,8 +51,8 @@ EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ pkgconfigdir=${libdir}/pkgconfig \ " -SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher" -DESCRIPTION_audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ +SUMMARY:audispd-plugins = "Plugins for the audit event dispatcher" +DESCRIPTION:audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ interface to the audit system, audispd. These plugins can do things \ like relay events to remote machines or analyze events for suspicious \ behavior." @@ -60,19 +60,19 @@ behavior." PACKAGES =+ "audispd-plugins" PACKAGES += "auditd ${PN}-python" -FILES_${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*" -FILES_auditd += "${bindir}/* ${base_sbindir}/* ${sysconfdir}/*" -FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \ +FILES:${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*" +FILES:auditd += "${bindir}/* ${base_sbindir}/* ${sysconfdir}/*" +FILES:audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \ ${sysconfdir}/audisp/plugins.d/au-remote.conf \ ${sbindir}/audisp-remote ${localstatedir}/spool/audit \ " -FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" -FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" +FILES:${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" +FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" -CONFFILES_auditd += "${sysconfdir}/audit/audit.rules" -RDEPENDS_auditd += "bash" +CONFFILES:auditd += "${sysconfdir}/audit/audit.rules" +RDEPENDS:auditd += "bash" -do_install_append() { +do_install:append() { rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la diff --git a/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb b/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb index c77c99189..d76181c98 100644 --- a/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb +++ b/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb @@ -18,6 +18,6 @@ EXTRA_OECMAKE += " \ -DUNITDIR_SYSTEM=${systemd_system_unitdir} \ " -FILES_${PN} += "${systemd_system_unitdir}" +FILES:${PN} += "${systemd_system_unitdir}" diff --git a/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb b/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb index f146051cd..55edbcebe 100644 --- a/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb +++ b/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb @@ -11,9 +11,9 @@ S = "${WORKDIR}/git" inherit cmake PROVIDES = "cynara" -RPROVIDES_${PN} = "cynara" +RPROVIDES:${PN} = "cynara" DEPENDS = "libcap" -RDEPENDS_${PN} = "cynagora" +RDEPENDS:${PN} = "cynagora" EXTRA_OECMAKE += " \ -DWITH_SYSTEMD=OFF \ @@ -21,7 +21,7 @@ EXTRA_OECMAKE += " \ -DDIRECT_CYNARA_COMPAT=ON \ " -do_install_append() { +do_install:append() { # remove cynagora stuff rm $(find ${D} -name '*cynagora*') # remove stupid test diff --git a/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb b/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb index 73f2f0949..2ed1b1541 100644 --- a/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb +++ b/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb @@ -20,19 +20,19 @@ EXTRA_OECMAKE += " \ inherit useradd USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r cynagora" -USERADD_PARAM_${PN} = "\ +GROUPADD_PARAM:${PN} = "-r cynagora" +USERADD_PARAM:${PN} = "\ --system --home ${localstatedir}/lib/empty \ --no-create-home --shell /bin/false \ --gid cynagora cynagora \ " -FILES_${PN} += "${systemd_system_unitdir}" +FILES:${PN} += "${systemd_system_unitdir}" PACKAGES =+ "${PN}-tools" -FILES_${PN}-tools += "${bindir}/cynagora-admin ${bindir}/cynagora-agent" -RDEPENDS_${PN}_append_agl-devel = " ${PN}-tools" +FILES:${PN}-tools += "${bindir}/cynagora-admin ${bindir}/cynagora-agent" +RDEPENDS:${PN}:append:agl-devel = " ${PN}-tools" inherit ptest -SRC_URI_append = " file://run-ptest" -RDEPENDS_${PN}-ptest_append = " ${PN}-tools" +SRC_URI:append = " file://run-ptest" +RDEPENDS:${PN}-ptest:append = " ${PN}-tools" diff --git a/meta-app-framework/recipes-security/security-manager/security-manager.inc b/meta-app-framework/recipes-security/security-manager/security-manager.inc index e1d1f4011..c6bc123d3 100644 --- a/meta-app-framework/recipes-security/security-manager/security-manager.inc +++ b/meta-app-framework/recipes-security/security-manager/security-manager.inc @@ -34,7 +34,7 @@ EXTRA_OECMAKE = " \ " inherit systemd -SYSTEMD_SERVICE_${PN} = "security-manager.service" +SYSTEMD_SERVICE:${PN} = "security-manager.service" inherit features_check REQUIRED_DISTRO_FEATURES += "smack" @@ -46,8 +46,8 @@ REQUIRED_DISTRO_FEATURES += "smack" # # Leave it empty to use the upstream Tizen policy. SECURITY_MANAGER_POLICY ?= "" -SRC_URI_append = " ${@' '.join(['file://' + x for x in d.getVar('SECURITY_MANAGER_POLICY', True).split()])}" -python do_patch_append () { +SRC_URI:append = " ${@' '.join(['file://' + x for x in d.getVar('SECURITY_MANAGER_POLICY', True).split()])}" +python do_patch:append () { import os import shutil import glob @@ -62,22 +62,22 @@ python do_patch_append () { shutil.copy(file, s + '/policy') } -do_install_append () { +do_install:append () { install -d ${D}/${systemd_unitdir}/system/multi-user.target.wants ln -s ../security-manager.service ${D}/${systemd_unitdir}/system/multi-user.target.wants/security-manager.service install -d ${D}/${systemd_unitdir}/system/sockets.target.wants ln -s ../security-manager.socket ${D}/${systemd_unitdir}/system/sockets.target.wants/security-manager.socket } -RDEPENDS_${PN} += "sqlite3 cynara" -FILES_${PN} += " \ +RDEPENDS:${PN} += "sqlite3 cynara" +FILES:${PN} += " \ ${systemd_unitdir} \ ${TZ_SYS_DB} \ ${bindir}/.security-manager-setup \ " PACKAGES =+ "${PN}-policy" -FILES_${PN}-policy = " \ +FILES:${PN}-policy = " \ ${datadir}/${PN} \ ${bindir}/security-manager-policy-reload \ " diff --git a/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend b/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend index ec8435369..ba3365f12 100644 --- a/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend +++ b/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/security-manager:" +FILESEXTRAPATHS:prepend := "${THISDIR}/security-manager:" EXTRA_OECMAKE =+ " -DGLOBALUSER=afm" @@ -6,7 +6,7 @@ SRC_URI += " \ file://0001-Adapt-rules-to-AGL.patch \ " -do_install_append() { +do_install:append() { # Needed for wayland-0 socket access and memfd usage echo "~APP~ System::Weston rw" >> ${D}${datadir}/security-manager/policy/app-rules-template.smack echo "System::Weston ~APP~ rw" >> ${D}${datadir}/security-manager/policy/app-rules-template.smack diff --git a/meta-app-framework/recipes-support/libcap/libcap_appfw.inc b/meta-app-framework/recipes-support/libcap/libcap_appfw.inc index 9ece5ce27..a33fd99b2 100644 --- a/meta-app-framework/recipes-support/libcap/libcap_appfw.inc +++ b/meta-app-framework/recipes-support/libcap/libcap_appfw.inc @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_append_class-native := ":${THISDIR}/libcap" +FILESEXTRAPATHS:append:class-native := ":${THISDIR}/libcap" # FIXME: It needs to be determined if this is still required -#SRC_URI_append_class-native = " file://removing-capability-enforcement.patch" +#SRC_URI:append:class-native = " file://removing-capability-enforcement.patch" diff --git a/meta-app-framework/recipes-test/afb-test/afb-test_git.bb b/meta-app-framework/recipes-test/afb-test/afb-test_git.bb index 5246abb00..6fd1424e4 100644 --- a/meta-app-framework/recipes-test/afb-test/afb-test_git.bb +++ b/meta-app-framework/recipes-test/afb-test/afb-test_git.bb @@ -10,15 +10,15 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/app-afb-test;protocol=ht SRCREV = "${AGL_APP_REVISION}" DEPENDS += "lua libafb-helpers libappcontroller" -RDEPENDS_${PN} += "lua bash jq" -RDEPENDS_${PN}-ptest += "af-binder" +RDEPENDS:${PN} += "lua bash jq" +RDEPENDS:${PN}-ptest += "af-binder" PV = "${AGLVERSION}" S = "${WORKDIR}/git" inherit cmake aglwgt pkgconfig ptest -do_install_append() { +do_install:append() { install -d ${D}${bindir} install -m 775 ${S}/afm-test.target.sh ${D}${bindir}/afm-test } diff --git a/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh b/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh index 37d2f5615..762a79e83 100755 --- a/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh +++ b/meta-app-framework/scripts/run-yocto-check-layer-enabled-flags.sh @@ -19,8 +19,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= "" # important settings imported from poky-agl.conf # we do not import -DISTRO_FEATURES_append = " systemd smack" -DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" +DISTRO_FEATURES:append = " systemd smack" +DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" # skip unnecessary in yocto-check-layer - aka FIXME upstream @@ -28,10 +28,10 @@ BBMASK += "meta-security/recipes-mac/smack/smack-test_1.0.bb" BBMASK += "packagegroup-core-security-ptest.bb" # missing in upstream recipes ... aka FIXME upstream -BBCLASSEXTEND_pn-libzip = "native nativesdk" -BBCLASSEXTEND_pn-xmlsec1 = "native nativesdk" +BBCLASSEXTEND:pn-libzip = "native nativesdk" +BBCLASSEXTEND:pn-xmlsec1 = "native nativesdk" -DISTRO_FEATURES_append = " appfw smack " +DISTRO_FEATURES:append = " appfw smack " EOF diff --git a/meta-app-framework/scripts/run-yocto-check-layer.sh b/meta-app-framework/scripts/run-yocto-check-layer.sh index 3b19cd012..c324d64f9 100755 --- a/meta-app-framework/scripts/run-yocto-check-layer.sh +++ b/meta-app-framework/scripts/run-yocto-check-layer.sh @@ -19,8 +19,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= "" # important settings imported from poky-agl.conf # we do not import -DISTRO_FEATURES_append = " systemd smack" -DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" +DISTRO_FEATURES:append = " systemd smack" +DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" # skip unnecessary in yocto-check-layer - aka FIXME upstream @@ -28,8 +28,8 @@ BBMASK += "meta-security/recipes-mac/smack/smack-test_1.0.bb" BBMASK += "packagegroup-core-security-ptest.bb" # missing in upstream recipes ... aka FIXME upstream -BBCLASSEXTEND_pn-libzip = "native nativesdk" -BBCLASSEXTEND_pn-xmlsec1 = "native nativesdk" +BBCLASSEXTEND:pn-libzip = "native nativesdk" +BBCLASSEXTEND:pn-xmlsec1 = "native nativesdk" EOF |