From f4c744cd55620e24703c358a15c3511d4d925192 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 28 Mar 2022 16:39:51 +0200 Subject: base-files: dont install wayland-env.sh It's been handled in weston-init recipe of meta-toradex-nxp layer, drop a duplicated weston env file. Related-to: ELB-3477 Signed-off-by: Ming Liu --- recipes-core/base-files/base-files/wayland-env.sh | 13 ------------- recipes-core/base-files/base-files_3.0.14.bbappend | 2 -- 2 files changed, 15 deletions(-) delete mode 100644 recipes-core/base-files/base-files/wayland-env.sh diff --git a/recipes-core/base-files/base-files/wayland-env.sh b/recipes-core/base-files/base-files/wayland-env.sh deleted file mode 100644 index e351296..0000000 --- a/recipes-core/base-files/base-files/wayland-env.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - - export XDG_SESSION_TYPE=unspecified - export XDG_SESSION_CLASS=background -fi - diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend index 13d7822..8faabfb 100644 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/recipes-core/base-files/base-files_3.0.14.bbappend @@ -3,14 +3,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/base-files:" SRC_URI += " \ file://disable_systemd_coloroutput.sh \ file://x11-display-var.sh \ - file://wayland-env.sh \ " do_install:append () { install -m 0755 -d ${D}${sysconfdir}/profile.d install -m 0644 ${WORKDIR}/disable_systemd_coloroutput.sh ${D}${sysconfdir}/profile.d/ install -m 0644 ${WORKDIR}/x11-display-var.sh ${D}${sysconfdir}/profile.d/ - install -m 0644 ${WORKDIR}/wayland-env.sh ${D}${sysconfdir}/profile.d/ } BASEFILESISSUEINSTALL = "" -- cgit v1.2.3