summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuciano Dittgen <luciano.dittgen@ossystems.com.br>2026-08-25 15:25:24 -0300
committerLuciano Dittgen <luciano.dittgen@ossystems.com.br>2026-08-25 15:25:24 -0300
commit1bc06dc07dcbdf81ed46f485556ae2dc4480af69 (patch)
treefe1426bb2a739447c160c8e321835c18f40619c4
parent133d12b64ba177eea37f5dfaf77ca0ae8be7641f (diff)
downloadmeta-freescale-1bc06dc07dcbdf81ed46f485556ae2dc4480af69.tar.gz
weston: Reformat PACKAGECONFIG to satisfy multilineident
Rewrite the multi-line PACKAGECONFIG ??= assignments in both weston recipes to the value-on-next-line form: the opening quote is followed by a line continuation, and every value sits on its own line indented by four spaces. oelint.vars.multilineident is non-convergent on the previous form, where the first value (an inline-python ${@bb.utils.contains(...)}) starts on the same line as the operator. There the rule reports "19 set, 4 desirable" but re-indenting the continuations to 4 makes it report "4 set, 19 desirable" on its other analysis branch, so no indentation clears it. Moving the first value onto its own line makes the rule compute a stable desirable indent of 4, which the reformat matches, so the finding clears cleanly. It also removes the redundant leading space after the operator that oelint.vars.notneededspace flagged. Both recipes are verbatim i.MX forks of the OE-core weston recipe, whose PACKAGECONFIG block uses the same same-line form (and would trip the same rule). This reformat therefore diverges the copied block from upstream OE-core on purpose, to satisfy lint; a future OE-core re-sync of this block will need to re-apply it. The change is whitespace only: the effective PACKAGECONFIG value (a space-separated token list) is unchanged. Verified inert by building weston (14.0.2, DISTRO fslc-wayland, MACHINE imx8mm-lpddr4-evk) with the original and the reformatted recipe and comparing buildhistory: the weston package set, DEPENDS, RDEPENDS, FILELIST and PKGSIZE are byte-identical across the change. Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>
-rw-r--r--recipes-graphics/wayland/weston_10.0.5.imx.bb21
-rw-r--r--recipes-graphics/wayland/weston_14.0.2.imx.bb23
2 files changed, 23 insertions, 21 deletions
diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb
index ca3922478..83cde735f 100644
--- a/recipes-graphics/wayland/weston_10.0.5.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb
@@ -43,16 +43,17 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
43 43
44EXTRA_OEMESON += "-Dpipewire=false" 44EXTRA_OEMESON += "-Dpipewire=false"
45 45
46PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ 46PACKAGECONFIG ??= "\
47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ 47 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \
48 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ 48 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
49 ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ 49 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
50 ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \ 50 ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \
51 image-jpeg \ 51 ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \
52 screenshare \ 52 image-jpeg \
53 shell-desktop \ 53 screenshare \
54 shell-fullscreen \ 54 shell-desktop \
55 shell-ivi" 55 shell-fullscreen \
56 shell-ivi"
56 57
57# Can be 'damage', 'im', 'egl', 'shm', 'touch', 'dmabuf-feedback', 'dmabuf-v4l', 'dmabuf-egl' or 'all' 58# Can be 'damage', 'im', 'egl', 'shm', 'touch', 'dmabuf-feedback', 'dmabuf-v4l', 'dmabuf-egl' or 'all'
58SIMPLECLIENTS ?= "all" 59SIMPLECLIENTS ?= "all"
diff --git a/recipes-graphics/wayland/weston_14.0.2.imx.bb b/recipes-graphics/wayland/weston_14.0.2.imx.bb
index a3303a81f..fb36ff072 100644
--- a/recipes-graphics/wayland/weston_14.0.2.imx.bb
+++ b/recipes-graphics/wayland/weston_14.0.2.imx.bb
@@ -44,17 +44,18 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
44 44
45EXTRA_OEMESON += "-Dpipewire=false -Dtests=false" 45EXTRA_OEMESON += "-Dpipewire=false -Dtests=false"
46 46
47PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ 47PACKAGECONFIG ??= "\
48 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ 48 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \
49 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ 49 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
50 ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ 50 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
51 image-jpeg \ 51 ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \
52 screenshare \ 52 image-jpeg \
53 shell-desktop \ 53 screenshare \
54 shell-fullscreen \ 54 shell-desktop \
55 shell-ivi \ 55 shell-fullscreen \
56 shell-kiosk \ 56 shell-ivi \
57 " 57 shell-kiosk \
58 "
58 59
59# Can be 'damage', 'im', 'egl', 'shm', 'touch', 'dmabuf-feedback', 'dmabuf-v4l', 'dmabuf-egl' or 'all' 60# Can be 'damage', 'im', 'egl', 'shm', 'touch', 'dmabuf-feedback', 'dmabuf-v4l', 'dmabuf-egl' or 'all'
60SIMPLECLIENTS ?= "all" 61SIMPLECLIENTS ?= "all"