summaryrefslogtreecommitdiffstats
path: root/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-graphics')
-rw-r--r--recipes-graphics/kms-conf/kms-conf_1.0.bb9
-rw-r--r--recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc2
-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.inc4
5 files changed, 17 insertions, 11 deletions
diff --git a/recipes-graphics/kms-conf/kms-conf_1.0.bb b/recipes-graphics/kms-conf/kms-conf_1.0.bb
index 4a665a49b..865024e39 100644
--- a/recipes-graphics/kms-conf/kms-conf_1.0.bb
+++ b/recipes-graphics/kms-conf/kms-conf_1.0.bb
@@ -2,11 +2,12 @@ SUMMARY = "kms configuration file for the qt eglfs platform"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-SRC_URI = " \
- file://kms.conf \
-"
+SRC_URI = "file://kms.conf"
+
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
do_install:append() {
install -d ${D}${sysconfdir}
- install -m 644 ${WORKDIR}/kms.conf ${D}${sysconfdir}
+ install -m 644 ${UNPACKDIR}/kms.conf ${D}${sysconfdir}
}
diff --git a/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc b/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc
index 08b6aa495..caed32e64 100644
--- a/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc
+++ b/recipes-graphics/ttf-fonts/ttf-dejavu_agldemo.inc
@@ -7,6 +7,6 @@ SRC_URI:append = " file://cleaner.py"
do_install:prepend() {
for TTF in ${S}/*.ttf; do
- fontforge -script ${WORKDIR}/cleaner.py ${TTF}
+ fontforge -script ${UNPACKDIR}/cleaner.py ${TTF}
done
}
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 fe9bd098b..f50fcd45c 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 763103d45..29f65ccc2 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 62aa9048b..eed10159b 100644
--- a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
+++ b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
@@ -6,7 +6,9 @@ WESTON_FRAGMENTS_BASE += "grpc-proxy"
do_configure:append() {
# Standalone cluster support version
- cp ${WORKDIR}/remote-output.cfg.in ${WORKDIR}/remote-output.cfg
+ sed -e "s#host=.*#host=${REMOTING_OUTPUT_HOST}#" \
+ -e "s#port=.*#port=${REMOTING_OUTPUT_PORT}#" \
+ ${UNPACKDIR}/remote-output.cfg.in > ${WORKDIR}/remote-output.cfg
}
do_compile:append() {