Karthik,
Looks better. Now, can you just merge the existing wayland_env and the new
profile you are adding? Both of them are installed in /etc/profile.d and get
sourced on every login. Just add the mkdir and chmod part to the end of
existing wayland_env.sh and that's it. Also, since you are changing wayldn_env
file anyway, set XDG_RUNTIME_DIR to the same value of /tmp/${UID}-runtime-dir?
--
Denys
On Thu, Apr 09, 2015 at 06:04:33PM +0530, Karthik Ramanan wrote:
> There are different set of requirements on the bootup behavior
> across different platforms. To name a few:
> * J6, the required behavior is console/command prompt
> * AM57xx, it will be the matrix-gui (QT5 on Wayland)
>
> weston-init recipe addresses the needs of AM57xx.
> This patch is needed for J6/J6-Eco etc.
>
> Note that if there are customers on AM57xx who need the default behavior
> to be console/command prompt, this patch will address those needs.
> It does not conflict with weston-init.
>
> Signed-off-by: Karthik Ramanan <[email protected]>
> ---
> .../recipes-graphics/wayland/weston/profile | 8 ++++++++
> .../recipes-graphics/wayland/weston/wayland_env.sh | 2 +-
> .../recipes-graphics/wayland/weston_1.6.0.bbappend | 4 +++-
> 3 files changed, 12 insertions(+), 2 deletions(-)
> create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/profile
>
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/profile
> b/meta-arago-distro/recipes-graphics/wayland/weston/profile
> new file mode 100644
> index 0000000..0848c18
> --- /dev/null
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston/profile
> @@ -0,0 +1,8 @@
> +if test -z "${XDG_RUNTIME_DIR}"; then
> + export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir
> +fi
> +
> +if ! test -d "${XDG_RUNTIME_DIR}"; then
> + mkdir -p "${XDG_RUNTIME_DIR}"
> + chmod 0700 "${XDG_RUNTIME_DIR}"
> +fi
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/wayland_env.sh
> b/meta-arago-distro/recipes-graphics/wayland/weston/wayland_env.sh
> index a0e3b90..70a7d17 100644
> --- a/meta-arago-distro/recipes-graphics/wayland/weston/wayland_env.sh
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston/wayland_env.sh
> @@ -3,6 +3,6 @@
> ### Wayland Environment Variables ###
>
> export XDG_CONFIG_HOME=/etc/
> -export XDG_RUNTIME_DIR=/run/user/root
> +export XDG_RUNTIME_DIR=/tmp
> export WAYLAND_DISPLAY=wayland-0
> export WS_CALUDEV_FILE=/etc/udev/rules.d/ws-calibrate.rules
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.6.0.bbappend
> b/meta-arago-distro/recipes-graphics/wayland/weston_1.6.0.bbappend
> index b0e8985..e3a9089 100644
> --- a/meta-arago-distro/recipes-graphics/wayland/weston_1.6.0.bbappend
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_1.6.0.bbappend
> @@ -2,13 +2,14 @@
> PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor
> WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev
> mtdev"
> PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm
> udev libgbm mtdev"
>
> -PR_append = "-arago3"
> +PR_append = "-arago4"
>
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> SRC_URI += "file://wayland_env.sh \
> file://weston.ini \
>
> file://0001-weston-Enabling-DRM-backend-with-multiple-displays.patch \
> + file://profile \
> "
>
> # Add custom Arago Wayland Environment script file
> @@ -16,6 +17,7 @@ do_install_append () {
> install -d ${D}${sysconfdir}/profile.d
> install -m 0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}
> install -m 0644 ${WORKDIR}/wayland_env.sh ${D}${sysconfdir}/profile.d/
> + install -m 0644 ${WORKDIR}/profile
> ${D}${sysconfdir}/profile.d/weston_profile
> }
>
> PACKAGES += "${PN}-conf"
> --
> 1.7.9.5
>
> _______________________________________________
> meta-arago mailing list
> [email protected]
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
