From dbb94429debaff7bd667226971dcd99345730f0d Mon Sep 17 00:00:00 2001 From: mlradu Date: Fri, 30 Aug 2024 16:24:59 +0300 Subject: [PATCH] 04.configure-desktop-env/02.vnc-server: remove dummy display Now that the xserver.service handles the setup for systems that don't have video output, this feature is no longer necessary. Signed-off-by: mlradu --- .../02.vnc-server/files/xorg.conf | 21 ------------------- .../02.vnc-server/run.sh | 11 ---------- 2 files changed, 32 deletions(-) delete mode 100644 stages/04.configure-desktop-env/02.vnc-server/files/xorg.conf diff --git a/stages/04.configure-desktop-env/02.vnc-server/files/xorg.conf b/stages/04.configure-desktop-env/02.vnc-server/files/xorg.conf deleted file mode 100644 index dc47cf8f4f..0000000000 --- a/stages/04.configure-desktop-env/02.vnc-server/files/xorg.conf +++ /dev/null @@ -1,21 +0,0 @@ -Section "Device" - Identifier "Configured Video Device" - Driver "dummy" -EndSection - -Section "Monitor" - Identifier "Configured Monitor" - HorizSync 31.5-48.5 - VertRefresh 50-70 -EndSection - -Section "Screen" - Identifier "Default Screen" - Monitor "Configured Monitor" - Device "Configured Video Device" - DefaultDepth 24 - SubSection "Display" - Depth 24 - Modes "1280x720" - EndSubSection -EndSection diff --git a/stages/04.configure-desktop-env/02.vnc-server/run.sh b/stages/04.configure-desktop-env/02.vnc-server/run.sh index f44a9dfde5..af33a510a6 100644 --- a/stages/04.configure-desktop-env/02.vnc-server/run.sh +++ b/stages/04.configure-desktop-env/02.vnc-server/run.sh @@ -6,14 +6,6 @@ # Copyright (c) 2024 Analog Devices, Inc. # Author: Larisa Radu -HELP="To enable VNC on a board that has a display port, you only need to install the service. This is the default approach in the script. \ - \nTo enable VNC on a board that doesn't have a display port, you need to install the xorg.conf file that contains a dummy display. \ - \nYou can do this by uncommenting line 21. \ - \nOnce you have installed the dummy display, your desktop environment might not start if you switch to a board that has a display port. \ - \nIn order to go back to the initial configuration, you only need to delete /usr/share/X11/xorg.conf.d/xorg.conf file and reboot. \ - \n \ - \nThe VNC password is: analog" - if [ "${CONFIG_DESKTOP}" = y ]; then # Add x11vnc service @@ -25,9 +17,6 @@ install -m 644 "${BASH_SOURCE%%/run.sh}"/files/xserver.service "${BUILD_DIR}/lib # Add xserver script install -m 755 "${BASH_SOURCE%%/run.sh}"/files/adi-xserver.sh "${BUILD_DIR}/usr/bin/" -# Add dummy display -#install -m 644 "${BASH_SOURCE%%/run.sh}"/files/xorg.conf "${BUILD_DIR}/usr/share/X11/xorg.conf.d/" - install -d "${BUILD_DIR}/home/analog/.vnc" chroot "${BUILD_DIR}" << EOF