summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/wayland
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-graphics/wayland')
-rw-r--r--recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc4
-rw-r--r--recipes-graphics/wayland/weston-agl-driver-conf.bb9
-rw-r--r--recipes-graphics/wayland/weston-ini-conf_agldemo.inc2
3 files changed, 9 insertions, 6 deletions
diff --git a/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc b/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc
index fe9bd098..f50fcd45 100644
--- a/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc
+++ b/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc
@@ -8,8 +8,8 @@ SRC_URI:append = " \
DRM_LEASE_DEVICE = "lease"
do_install:append() {
- install -Dm644 ${WORKDIR}/agl-compositor.env ${D}${sysconfdir}/default/agl-compositor
- install -m644 ${WORKDIR}/agl-compositor-guest.conf ${D}/${systemd_system_unitdir}/agl-compositor.service.d/agl-compositor-guest.conf
+ install -Dm644 ${UNPACKDIR}/agl-compositor.env ${D}${sysconfdir}/default/agl-compositor
+ install -m644 ${UNPACKDIR}/agl-compositor-guest.conf ${D}/${systemd_system_unitdir}/agl-compositor.service.d/agl-compositor-guest.conf
}
FILES:${PN} += "\
diff --git a/recipes-graphics/wayland/weston-agl-driver-conf.bb b/recipes-graphics/wayland/weston-agl-driver-conf.bb
index 763103d4..29f65ccc 100644
--- a/recipes-graphics/wayland/weston-agl-driver-conf.bb
+++ b/recipes-graphics/wayland/weston-agl-driver-conf.bb
@@ -2,19 +2,22 @@ SUMMARY = "Weston systemd configuration to run as agl-driver user"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+SRC_URI = "file://weston-agl-driver.conf"
+
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
inherit systemd allarch features_check
REQUIRED_DISTRO_FEATURES = "wayland systemd"
-SRC_URI = "file://weston-agl-driver.conf"
-
do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install() {
# Install override drop-in
install -d ${D}${systemd_system_unitdir}/weston.service.d
- install -m 0644 ${WORKDIR}/weston-agl-driver.conf ${D}${systemd_system_unitdir}/weston.service.d/
+ install -m 0644 ${UNPACKDIR}/weston-agl-driver.conf ${D}${systemd_system_unitdir}/weston.service.d/
}
FILES:${PN} += "${systemd_system_unitdir}"
diff --git a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
index 5c7b9fee..5d15d16b 100644
--- a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
+++ b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
@@ -11,7 +11,7 @@ do_compile:append() {
rm -f ${WORKDIR}/weston.ini.kvm
sed -e "s/@GUEST_VM1_IMAGE@/${GUEST_VM1_IMAGE}/g" \
-e "s/@GUEST_VM2_IMAGE@/${GUEST_VM2_IMAGE}/g" \
- ${WORKDIR}/weston.ini.kvm.in > ${WORKDIR}/weston.ini.kvm
+ ${UNPACKDIR}/weston.ini.kvm.in > ${WORKDIR}/weston.ini.kvm
}
do_install:append() {