diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2022-09-15 14:44:33 +0300 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2022-09-22 11:08:52 +0000 |
| commit | 6a8a33f99a66ae150a86e10551b2ad81a4117e13 (patch) | |
| tree | 06e9c59f81da461741d94d6c872edaf6854ccb6b | |
| parent | 5c7eb02af82c879127e1049727e721df241f61f1 (diff) | |
weston-ini-conf: Add weston-ini-config-no-activate
This patch adds a way to tick dynamically activate-by-default to false,
and provide a safe migration towards disabling by default activation
entirely.
We do this with just only the Qt toolkit and will proceed with
WAM/chromium once that has support as well for this.
Bug-AGL: SPEC-4528
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I3573ea92d3ea865db223bd01e58b9ec202cfa7ae
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27990
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
| -rw-r--r-- | meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb | 16 | ||||
| -rw-r--r-- | meta-app-framework/recipes-graphics/wayland/weston-ini-conf_agl-app-fw.inc | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb index 9eea06adc..d0f0eb556 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb @@ -55,6 +55,10 @@ do_compile() { done sed -i -e '$ d' ${WORKDIR}/weston.ini.default + cat ${WORKDIR}/weston.ini.default > ${WORKDIR}/weston.ini.default-no-activate + echo "[core]" >> ${WORKDIR}/weston.ini.default-no-activate + echo "activate-by-default=false" >> ${WORKDIR}/weston.ini.default-no-activate + # Do it again, but filter fragments to configure for landscape # and a corresponding landscape-inverted that is 180 degrees # rotated. @@ -80,6 +84,7 @@ do_compile() { do_install:append() { install -d ${D}${weston_ini_dir} install -m 0644 ${WORKDIR}/weston.ini.default ${D}${weston_ini_dir}/ + install -m 0644 ${WORKDIR}/weston.ini.default-no-activate ${D}${weston_ini_dir}/ install -m 0644 ${WORKDIR}/weston.ini.landscape ${D}${weston_ini_dir}/ install -m 0644 ${WORKDIR}/weston.ini.landscape-inverted ${D}${weston_ini_dir}/ } @@ -121,6 +126,17 @@ RCONFLICTS:${PN}-landscape-inverted = "${PN}" ALTERNATIVE:${PN}-landscape-inverted = "weston.ini" ALTERNATIVE_TARGET_${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted" +# no activation by default +PACKAGE_BEFORE_PN += "${PN}-no-activate" + +FILES:${PN}-no-activate = "${weston_ini_dir}/weston.ini.default-no-activate" + +RDEPENDS:${PN}-no-activate = "weston-init" +RPROVIDES:${PN}-no-activate = "weston-ini" +RCONFLICTS:${PN}-no-activate = "${PN}" +ALTERNATIVE:${PN}-no-activate = "weston.ini" +ALTERNATIVE_TARGET_${PN}-no-activate = "${weston_ini_dir}/weston.ini.default-no-activate" + # This is a settings-only package, we do not need a development package # (and its fixed dependency to ${PN} being installed) PACKAGES:remove = "${PN}-dev ${PN}-staticdev" diff --git a/meta-app-framework/recipes-graphics/wayland/weston-ini-conf_agl-app-fw.inc b/meta-app-framework/recipes-graphics/wayland/weston-ini-conf_agl-app-fw.inc index 25213a9f1..6e599e9b9 100644 --- a/meta-app-framework/recipes-graphics/wayland/weston-ini-conf_agl-app-fw.inc +++ b/meta-app-framework/recipes-graphics/wayland/weston-ini-conf_agl-app-fw.inc @@ -1,3 +1,4 @@ RDEPENDS:${PN} = "" RDEPENDS:${PN}-landscape = "" RDEPENDS:${PN}-landscape-inverted = "" +RDEPENDS:${PN}-no-activate = "" |