Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-init: sync with meta-fsl-bsp-release branch sumo-4.14.98-2.3.0 

Rework the weston-init recipe and add a BBMASK to ignore meta-freescale's
weston-init.bbappend file.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2020-01-16 14:08:26 +01:00
parent d9e523578d
commit 759fc05e09
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-digi-dey/conf/layer.conf
View File

@ -15,6 +15,7 @@ BBFILE_PATTERN_digi-dey := "^${LAYERDIR}/"
BBFILE_PRIORITY_digi-dey = "6" BBFILE_PRIORITY_digi-dey = "6"
BBMASK += "meta-freescale/recipes-graphics/drm/libdrm_%.bbappend" BBMASK += "meta-freescale/recipes-graphics/drm/libdrm_%.bbappend"
BBMASK += "meta-freescale/recipes-graphics/wayland/weston-init.bbappend"
LAYERDEPENDS_digi-dey = "core digi-arm" LAYERDEPENDS_digi-dey = "core digi-arm"
LAYERDEPENDS_digi-dey += "openembedded-layer networking-layer webserver qt5-layer swupdate" LAYERDEPENDS_digi-dey += "openembedded-layer networking-layer webserver qt5-layer swupdate"

24
meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend
View File

@ -1,23 +1,31 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
REQUIRED_DISTRO_FEATURES_remove_mx6sl = "opengl" # OpenGL is not required for parts with GPU support for 2D but not 3D
IMX_REQUIRED_DISTRO_FEATURES_REMOVE = ""
IMX_REQUIRED_DISTRO_FEATURES_REMOVE_imxgpu2d = "opengl"
IMX_REQUIRED_DISTRO_FEATURES_REMOVE_imxgpu3d = ""
REQUIRED_DISTRO_FEATURES_remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}"
SRC_URI_append = " file://profile" SRC_URI_append_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd wayland x11', 'file://weston.config', '', d)}"
SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd wayland x11', 'file://weston.config', '', d)}"
HAS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" HAS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
HAS_XWAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland x11', 'true', 'false', d)}"
do_install_append() { do_install_append() {
install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh
if ${HAS_SYSTEMD}; then if ${HAS_SYSTEMD}; then
sed -i \ sed -i \
-e 's,/usr/bin,${bindir},g' \ -e 's,/usr/bin,${bindir},g' \
-e 's,/etc,${sysconfdir},g' \ -e 's,/etc,${sysconfdir},g' \
-e 's,/var,${localstatedir},g' \ -e 's,/var,${localstatedir},g' \
${D}${systemd_system_unitdir}/weston.service ${D}${systemd_system_unitdir}/weston.service
if ${HAS_XWAYLAND}; then fi
install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston if [ -f ${WORKDIR}/weston.config ]; then
fi install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston
fi fi
} }
# Add profile support not accepted by upstream
SRC_URI += "file://profile"
do_install_append() {
install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh
}

2
meta-digi-dey/recipes-graphics/wayland/weston-init/imxdrm/weston.config
View File

@ -1,2 +0,0 @@
#!/bin/sh
OPTARGS="--xwayland"

2
meta-digi-dey/recipes-graphics/wayland/weston-init/mx6sl/weston.config Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
FB_MULTI_BUFFER=1

2
meta-digi-dey/recipes-graphics/wayland/weston-init/weston.config
View File

@ -1,2 +0,0 @@
#!/bin/sh
OPTARGS="--xwayland"