diff options
Diffstat (limited to 'meta-agl/recipes-graphics')
21 files changed, 0 insertions, 399 deletions
diff --git a/meta-agl/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb b/meta-agl/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb deleted file mode 100644 index e0358d615..000000000 --- a/meta-agl/recipes-graphics/agl-desktop-config/agl-desktop-config_0.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "AGL desktop config" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI += " \ - file://user-weston-term.service \ - file://user-weston-term.path \ -" - -do_install_append() { - install -d ${D}${systemd_user_unitdir} - install -m 0644 ${WORKDIR}/user-weston-term.service ${D}${systemd_user_unitdir} - install -m 0644 ${WORKDIR}/user-weston-term.path ${D}${systemd_user_unitdir} - - install -d ${D}${systemd_user_unitdir}/default.target.wants - ln -sf ${systemd_user_unitdir}/user-weston-term.path ${D}${libdir}/systemd/user/default.target.wants -} - -FILES_${PN} += "${systemd_user_unitdir}/*" -FILES_${PN} += "${systemd_user_unitdir}/default.target.wants/default.target.wants" diff --git a/meta-agl/recipes-graphics/agl-desktop-config/files/user-weston-term.path b/meta-agl/recipes-graphics/agl-desktop-config/files/user-weston-term.path deleted file mode 100644 index 9481840e5..000000000 --- a/meta-agl/recipes-graphics/agl-desktop-config/files/user-weston-term.path +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Terminal for weston user unit path - -[Path] -PathExists=%t/wayland-0 - -[Install] -WantedBy=default.target diff --git a/meta-agl/recipes-graphics/agl-desktop-config/files/user-weston-term.service b/meta-agl/recipes-graphics/agl-desktop-config/files/user-weston-term.service deleted file mode 100644 index ad8b9583b..000000000 --- a/meta-agl/recipes-graphics/agl-desktop-config/files/user-weston-term.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Terminal for weston user -After=user-config.service -Requires=user-config.service - -[Service] -Type=simple -ExecStart=/usr/bin/weston-terminal -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/meta-agl/recipes-graphics/images/agl-image-weston.bb b/meta-agl/recipes-graphics/images/agl-image-weston.bb deleted file mode 100644 index 427132ed6..000000000 --- a/meta-agl/recipes-graphics/images/agl-image-weston.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A very basic Wayland image with a terminal" - -require agl-image-weston.inc - -LICENSE = "MIT" - -IMAGE_INSTALL_append = "\ - packagegroup-agl-image-weston \ - " - -DISTRO_FEATURES_append = " agl-core-image-profile" -IMAGE_INSTALL_append = " agl-desktop-config" diff --git a/meta-agl/recipes-graphics/images/agl-image-weston.inc b/meta-agl/recipes-graphics/images/agl-image-weston.inc deleted file mode 100644 index 947d22b50..000000000 --- a/meta-agl/recipes-graphics/images/agl-image-weston.inc +++ /dev/null @@ -1,7 +0,0 @@ -require recipes-core/images/agl-image-minimal.inc - -IMAGE_FEATURES += "splash package-management ssh-server-dropbear" - -inherit distro_features_check - -REQUIRED_DISTRO_FEATURES = "wayland" diff --git a/meta-agl/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb b/meta-agl/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb deleted file mode 100644 index dcf21bcfb..000000000 --- a/meta-agl/recipes-graphics/packagegroups/packagegroup-agl-image-weston.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "The minimal set of packages required for basic Wayland image" -LICENSE = "MIT" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-image-weston \ - " - -ALLOW_EMPTY_${PN} = "1" - -RDEPENDS_${PN} += "weston weston-init weston-ini-conf weston-examples" -RDEPENDS_${PN} += "agl-login-manager" - -RDEPENDS_${PN} += "\ - packagegroup-agl-image-minimal \ - " diff --git a/meta-agl/recipes-graphics/wayland/Readme.weston-ini-conf b/meta-agl/recipes-graphics/wayland/Readme.weston-ini-conf deleted file mode 100644 index eb30a9a96..000000000 --- a/meta-agl/recipes-graphics/wayland/Readme.weston-ini-conf +++ /dev/null @@ -1,36 +0,0 @@ -#Generate a weston.ini file: - -To generate the weston.ini file: - -''' -[core] -backend=drm-backend.so -shell=desktop-shell.so -''' - -Just create a Variable Flag: - -''' -WESTONCORE[backend]??="drm-backend.so" -WESTONCORE[shell]??="desktop-shell.so" -''' - -And add it to the Variable Flag WESTONSECTION, with the name of the section: -''' -WESTONSECTION[WESTONCORE]?="core" -''' - -#You can custumize weston.ini by create a weston-ini-conf.bbappend: - -''' -WESTONCORE[repaint-window] ??= "34" -''' - -This will generate weston.ini file: - -''' -[core] -backend=drm-backend.so -shell=ivi-shell.so -repaint-window=34 -''' diff --git a/meta-agl/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch b/meta-agl/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch deleted file mode 100644 index b04127b57..000000000 --- a/meta-agl/recipes-graphics/wayland/wayland/0001-Change-socket-mode-add-rw-for-group.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9162f7d4cfeec7103474e8703218b3679ca9ed10 Mon Sep 17 00:00:00 2001 -From: Ronan Le Martret <ronan.lemartret@iot.bzh> -Date: Tue, 18 Apr 2017 13:53:26 +0200 -Subject: [PATCH] Change socket mode:add rw for group - -Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> ---- - src/wayland-server.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/wayland-server.c b/src/wayland-server.c -index 64d1bec..313c5a0 100644 ---- a/src/wayland-server.c -+++ b/src/wayland-server.c -@@ -1189,7 +1189,10 @@ _wl_display_add_socket(struct wl_display *display, struct wl_socket *s) - wl_log("bind() failed with error: %m\n"); - return -1; - } -- -+ if (chmod(s->addr.sun_path, 0660) < 0) { -+ wl_log("chmod() failed with error: %m\n"); -+ return -1; -+ } - if (listen(s->fd, 128) < 0) { - wl_log("listen() failed with error: %m\n"); - return -1; --- -2.6.6 - diff --git a/meta-agl/recipes-graphics/wayland/wayland_%.bbappend b/meta-agl/recipes-graphics/wayland/wayland_%.bbappend deleted file mode 100644 index 9d1822697..000000000 --- a/meta-agl/recipes-graphics/wayland/wayland_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append = "\ - file://0001-Change-socket-mode-add-rw-for-group.patch \ - " diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb deleted file mode 100644 index 986a9eda9..000000000 --- a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" - -S = "${WORKDIR}" - -require weston-ini-conf/screen.inc - -DEFAULT_SCREEN[transform]?="270" -DEFAULT_SCREEN[name]?="HDMI-A-1" - -WESTONCORE[shell]??="desktop-shell.so" -WESTONCORE[backend]??="drm-backend.so" - -WESTONSHELL[locking]="true" -# hide panel -WESTONSHELL[panel-location]="none" - - -WESTONOUTPUT1[agl_screen]??="DEFAULT_SCREEN" - -WESTONSECTION[WESTONCORE]?="core" -WESTONSECTION[WESTONSHELL]?="shell" -WESTONSECTION[WESTONOUTPUT1]?="output" - -python do_generate_weston_init() { - with open(d.getVar('WORKDIR', True)+"/weston.ini" ,'w') as weston_ini: - dicoSection=d.getVarFlags('WESTONSECTION') - keysSection=list(dicoSection.keys()) - keysSection.sort() - for section in keysSection: - weston_ini.writelines( "["+dicoSection[section]+"]\n") - dicoSectionValues=d.getVarFlags(section) - keysSectionValues=list(dicoSectionValues.keys()) - keysSectionValues.sort() - for sectionValue in keysSectionValues: - if (dicoSection[section] == "output" and sectionValue == "agl_screen"): - screen=dicoSectionValues[sectionValue] - dicoScreenConfig=d.getVarFlags(screen) - keysScreenConfig=list(dicoScreenConfig.keys()) - keysScreenConfig.sort() - for screenConfig in keysScreenConfig: - weston_ini.writelines( screenConfig+"="+dicoScreenConfig[screenConfig]+"\n") - else: - weston_ini.writelines( str(sectionValue)+"="+str(dicoSectionValues[sectionValue])+"\n") - - weston_ini.writelines( "\n") -} - -#ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True) - -addtask do_generate_weston_init after do_compile before do_install - -do_install_append() { - WESTON_INI_CONFIG=${sysconfdir}/xdg/weston - install -d ${D}${WESTON_INI_CONFIG} - install -m 0644 ${WORKDIR}/weston.ini ${D}${WESTON_INI_CONFIG}/weston.ini -} diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen.inc deleted file mode 100644 index 1c7718c70..000000000 --- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen.inc +++ /dev/null @@ -1,4 +0,0 @@ -require screen_dell.inc -require screen_qemu.inc -require screen_GeChic.inc -require screen_DSI.inc diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_DSI.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_DSI.inc deleted file mode 100644 index d5d91bf68..000000000 --- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_DSI.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCREEN_DSI[name] ?= "DSI-1" -SCREEN_DSI[transform] ?= "270" diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_GeChic.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_GeChic.inc deleted file mode 100644 index d82b18027..000000000 --- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_GeChic.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCREEN_GECHIC[name] ?= "HDMI-A-1" -SCREEN_GECHIC[transform] ?= "270" -# for 1080p on GeChic 1502i: -SCREEN_GECHIC[mode] = "173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync" diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_dell.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_dell.inc deleted file mode 100644 index 051e2ee0d..000000000 --- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_dell.inc +++ /dev/null @@ -1,2 +0,0 @@ -SCREEN_DELL[name]?="HDMI-A-1" -SCREEN_DELL[transform]?="180" diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_qemu.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_qemu.inc deleted file mode 100644 index 76dd8b81f..000000000 --- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_qemu.inc +++ /dev/null @@ -1,16 +0,0 @@ -SCREEN_QEMU[name]?="Virtual-1" -#mode=1920x1080 -#mode=1600x1200 -#mode=1680x1050 -#mode=1400x1050 -SCREEN_QEMU[mode]?="1600x900" -#mode=1280x1024 -#mode=1440x900 -#mode=1280x960 -#mode=1360x768 -#mode=1280x800 -#mode=1280x768 -#mode=1280x720 -#mode=800x600 -#mode=848x480 -#mode=640x480 diff --git a/meta-agl/recipes-graphics/wayland/weston-init.bbappend b/meta-agl/recipes-graphics/wayland/weston-init.bbappend deleted file mode 100644 index 4975b8e68..000000000 --- a/meta-agl/recipes-graphics/wayland/weston-init.bbappend +++ /dev/null @@ -1,71 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -inherit agl-graphical - -WESTONSTART ??= "/usr/bin/weston --idle-time=4294967 --tty=${WESTONTTY}" -WESTONSTART_append = " ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", " --log=${DISPLAY_XDG_RUNTIME_DIR}/weston.log", "",d)}" - -SRC_URI += " \ - file://weston_tmpfiles.conf \ - file://weston.service.add \ -" - -do_install_append() { - sed -i "/\[Unit\]/aConflicts=getty@tty${WESTONTTY}.service" \ - ${D}${systemd_system_unitdir}/weston.service - - sed -i "/\[Service\]/r ${S}/weston.service.add" \ - ${D}${systemd_system_unitdir}/weston.service - - sed -e 's,User=root,User=${WESTONUSER},g' \ - -e 's,ExecStart=.*,ExecStart=${WESTONSTART},g' \ - -e 's,@WESTONTTY@,${WESTONTTY},g' \ - -e 's,@XDG_RUNTIME_DIR@,${DISPLAY_XDG_RUNTIME_DIR},g' \ - -i ${D}${systemd_system_unitdir}/weston.service - - # Add a rule to ensure the 'display' user has permissions to - # open the graphics device - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/udev/rules.d - cat >${D}${sysconfdir}/udev/rules.d/zz-dri.rules <<'EOF' -SUBSYSTEM=="drm", MODE="0660", GROUP="${WESTONGROUP}", SECLABEL{smack}="*" -EOF - - # user 'display' must own /dev/tty${WESTONTTY} for weston to start correctly - cat >${D}${sysconfdir}/udev/rules.d/zz-tty.rules <<'EOF' -SUBSYSTEM=="tty", KERNEL=="tty${WESTONTTY}", OWNER="${WESTONUSER}", SECLABEL{smack}="^" -EOF - - # user 'display' must also be able to access /dev/input/* - cat >${D}${sysconfdir}/udev/rules.d/zz-input.rules <<'EOF' -SUBSYSTEM=="input", MODE="0660", GROUP="input", SECLABEL{smack}="^" -EOF - - # user 'display' must also be able to access /dev/media*, etc. - cat >${D}${sysconfdir}/udev/rules.d/zz-remote-display.rules <<'EOF' -SUBSYSTEM=="media", MODE="0660", GROUP="display", SECLABEL{smack}="*" -SUBSYSTEM=="video4linux", MODE="0660", GROUP="display", SECLABEL{smack}="*" -KERNEL=="uvcs", SUBSYSTEM=="misc", MODE="0660", GROUP="display", SECLABEL{smack}="*" -KERNEL=="rgnmm", SUBSYSTEM=="misc", MODE="0660", GROUP="display", SECLABEL{smack}="*" -EOF - - install -d ${D}${sysconfdir}/tmpfiles.d - install -Dm755 ${WORKDIR}/weston_tmpfiles.conf ${D}/${libdir}/tmpfiles.d/weston.conf - - sed -e 's,@WESTONUSER@,${WESTONUSER},g' \ - -e 's,@WESTONGROUP@,${WESTONGROUP},g' \ - -i ${D}/${libdir}/tmpfiles.d/weston.conf -} - -do_install_append_imx() { - - install -d ${D}${sysconfdir}/udev/rules.d - cat >>${D}${sysconfdir}/udev/rules.d/zz-dri.rules <<'EOF' -SUBSYSTEM=="gpu_class", MODE="0660", GROUP="${WESTONGROUP}", SECLABEL{smack}="*" -EOF - -} - -FILES_${PN} += "${libdir}/tmpfiles.d/*.conf" - - diff --git a/meta-agl/recipes-graphics/wayland/weston-init/weston.service.add b/meta-agl/recipes-graphics/wayland/weston-init/weston.service.add deleted file mode 100644 index 3596e9c39..000000000 --- a/meta-agl/recipes-graphics/wayland/weston-init/weston.service.add +++ /dev/null @@ -1,7 +0,0 @@ -Environment="XDG_RUNTIME_DIR=@XDG_RUNTIME_DIR@" -TTYPath=/dev/tty@WESTONTTY@ -StandardInput=tty -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -UtmpIdentifier=tty@WESTONTTY@ diff --git a/meta-agl/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf b/meta-agl/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf deleted file mode 100644 index c4b302faf..000000000 --- a/meta-agl/recipes-graphics/wayland/weston-init/weston_tmpfiles.conf +++ /dev/null @@ -1,6 +0,0 @@ -# This file is distributed to create weston XDG_RUNTIME_DIR (/run/deamon/@WESTONUSER@) -# -# See tmpfiles.d(5) for details - -d /run/platform/ 0775 root root - -d /run/platform/@WESTONUSER@ 0770 @WESTONUSER@ @WESTONGROUP@ - diff --git a/meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston.patch b/meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston.patch deleted file mode 100644 index 7b84a67ba..000000000 --- a/meta-agl/recipes-graphics/wayland/weston/0001-Allow-regular-users-to-launch-Weston.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f5555b045a64231d4beaba51cbbf5f5485173900 Mon Sep 17 00:00:00 2001 -From: Ronan Le Martret <ronan.lemartret@iot.bzh> -Date: Fri, 14 Apr 2017 19:04:32 +0200 -Subject: [PATCH] Allow regular users to launch Weston - -Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> ---- - configure.ac | 6 ++++++ - src/launcher-direct.c | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 1d11864..4e48d52 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -131,6 +131,12 @@ if test x$enable_xkbcommon = xyes; then - COMPOSITOR_MODULES="$COMPOSITOR_MODULES xkbcommon >= 0.3.0" - fi - -+AC_ARG_ENABLE(sys-uid, [ --enable-sys-uid],, -+ enable_sys_uid=no) -+if test x$enable_sys_uid = xyes; then -+ AC_DEFINE(ENABLE_SYS_UID, [1], [Allow regular users to launch Weston]) -+fi -+ - AC_ARG_ENABLE(setuid-install, [ --enable-setuid-install],, - enable_setuid_install=yes) - AM_CONDITIONAL(ENABLE_SETUID_INSTALL, test x$enable_setuid_install = xyes) -diff --git a/src/launcher-direct.c b/src/launcher-direct.c -index 29d9c28..1ac6651 100644 ---- a/src/launcher-direct.c -+++ b/src/launcher-direct.c -@@ -272,8 +272,10 @@ launcher_direct_connect(struct weston_launcher **out, struct weston_compositor * - { - struct launcher_direct *launcher; - -+#ifndef ENABLE_SYS_UID - if (geteuid() != 0) - return -EINVAL; -+#endif - - launcher = zalloc(sizeof(*launcher)); - if (launcher == NULL) --- -2.6.6 - diff --git a/meta-agl/recipes-graphics/wayland/weston/0001-compositor-drm.c-Launch-without-input-devices.patch b/meta-agl/recipes-graphics/wayland/weston/0001-compositor-drm.c-Launch-without-input-devices.patch deleted file mode 100644 index 93b7739fd..000000000 --- a/meta-agl/recipes-graphics/wayland/weston/0001-compositor-drm.c-Launch-without-input-devices.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 43f66e20a6788388df4fc052d257f005c359080f Mon Sep 17 00:00:00 2001 -From: Leon Anavi <leon.anavi@konsulko.com> -Date: Wed, 14 Dec 2016 12:26:31 +0200 -Subject: [PATCH] compositor-drm.c: Launch without input devices - -Launch Weston 11 even if input devices (such as -a keyboard, a mouse or a touchscreen) are not -present. - -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> ---- - src/compositor-drm.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/compositor-drm.c b/src/compositor-drm.c -index fd89627..f66e0af 100644 ---- a/src/compositor-drm.c -+++ b/src/compositor-drm.c -@@ -3123,7 +3123,6 @@ drm_backend_create(struct weston_compositor *compositor, - if (udev_input_init(&b->input, - compositor, b->udev, seat_id) < 0) { - weston_log("failed to create input devices\n"); -- goto err_sprite; - } - - if (create_outputs(b, config->connector, drm_device) < 0) { --- -2.7.4 diff --git a/meta-agl/recipes-graphics/wayland/weston_%.bbappend b/meta-agl/recipes-graphics/wayland/weston_%.bbappend deleted file mode 100644 index 0fe75ede6..000000000 --- a/meta-agl/recipes-graphics/wayland/weston_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" - -SRC_URI_append = "\ - file://0001-compositor-drm.c-Launch-without-input-devices.patch \ - file://0001-Allow-regular-users-to-launch-Weston.patch \ - " - -EXTRA_OECONF_append = " --enable-sys-uid" |