diff options
| author |   Roger Zanoni <rzanoni@igalia.com> | 2022-12-25 23:51:17 +0100 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-01-26 12:08:35 +0000 |
| commit | 3ed8bec1f924c6f710a0453346679db57ce8b951 (patch) | |
| tree | e69d7646e9762df468e034b5c5ebc6a6183ed56b | |
| parent | f3dc1d6ce3d465308f56a03f3566c1d6d10e21c9 (diff) | |
weston-ini-conf: Add weston-ini-landscape-no-activate
This change adds an option to use a weston.ini config in landscape mode
with automatic activation disabled by default, to be used by wam.
Bug-AGL: SPEC-4647, SPEC-4528
Signed-off-by: Roger Zanoni <rzanoni@igalia.com>
Change-Id: Ibaeefc4cae07b3f4cb4bbc619bb068fd259d81fc
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28371
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-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 04907c671..46558932c 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb @@ -80,12 +80,16 @@ do_compile() { done sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape-inverted + + cat ${WORKDIR}/weston.ini.landscape > ${WORKDIR}/weston.ini.landscape-no-activate + sed -i -e 's#\[core\]#[core]\nactivate-by-default=false#' ${WORKDIR}/weston.ini.landscape-no-activate } 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-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}/ } @@ -138,6 +142,18 @@ RCONFLICTS:${PN}-no-activate = "${PN}" ALTERNATIVE:${PN}-no-activate = "weston.ini" ALTERNATIVE_TARGET_${PN}-no-activate = "${weston_ini_dir}/weston.ini.default-no-activate" +# landscape, no activation by default +PACKAGE_BEFORE_PN += "${PN}-landscape-no-activate" + +FILES:${PN}-landscape-no-activate = "${weston_ini_dir}/weston.ini.landscape-no-activate" + +RDEPENDS:${PN}-landscape-no-activate = "weston-init" +RPROVIDES:${PN}-landscape-no-activate = "weston-ini" +RCONFLICTS:${PN}-landscape-no-activate = "${PN}" +ALTERNATIVE:${PN}-landscape-no-activate = "weston.ini" +ALTERNATIVE_TARGET_${PN}-landscape-no-activate = "${weston_ini_dir}/weston.ini.landscape-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 6e599e9b9..48af1968c 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 @@ -2,3 +2,4 @@ RDEPENDS:${PN} = "" RDEPENDS:${PN}-landscape = "" RDEPENDS:${PN}-landscape-inverted = "" RDEPENDS:${PN}-no-activate = "" +RDEPENDS:${PN}-landscape-no-activate = "" |