diff options
27 files changed, 14 insertions, 504 deletions
@@ -3,18 +3,11 @@ _variants=( - v0-vga:rpi2 - v0-vga:rpi3 v0-hdmi:rpi2 v0-hdmi:rpi3 v0-hdmiusb:rpi2 v0-hdmiusb:rpi3 - v1-vga:rpi2 - v1-vga:rpi3 - v1-hdmi:rpi2 - v1-hdmi:rpi3 - v2-hdmi:zerow v2-hdmi:rpi4 v2-hdmiusb:rpi4 diff --git a/configs/kvmd/main/v0-vga-rpi2.yaml b/configs/kvmd/main/v0-vga-rpi2.yaml deleted file mode 100644 index b90a4996..00000000 --- a/configs/kvmd/main/v0-vga-rpi2.yaml +++ /dev/null @@ -1,63 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include override.yaml - -logging: !include logging.yaml - -kvmd: - server: - unix: /run/kvmd/kvmd.sock - - auth: !include auth.yaml - - hid: - type: serial - reset_pin: 4 - device: /dev/kvmd-hid - - atx: - type: gpio - power_led_pin: 24 - hdd_led_pin: 22 - power_switch_pin: 23 - reset_switch_pin: 27 - - msd: - type: disabled - - streamer: - sync_delay: 1.0 - init_delay: 3.0 - desired_fps: 0 - unix: /run/kvmd/ustreamer.sock - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--tv-standard=pal" - - "--format=yuyv" - - "--encoder=cpu" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--resolution=720x576" - - "--fake-resolution=800x600" - - "--last-as-blank=0" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - -ipmi: - kvmd: - unix: /run/kvmd/kvmd.sock - -vnc: - kvmd: - unix: /run/kvmd/kvmd.sock - - streamer: - unix: /run/kvmd/ustreamer.sock diff --git a/configs/kvmd/main/v0-vga-rpi3.yaml b/configs/kvmd/main/v0-vga-rpi3.yaml deleted file mode 100644 index b90a4996..00000000 --- a/configs/kvmd/main/v0-vga-rpi3.yaml +++ /dev/null @@ -1,63 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include override.yaml - -logging: !include logging.yaml - -kvmd: - server: - unix: /run/kvmd/kvmd.sock - - auth: !include auth.yaml - - hid: - type: serial - reset_pin: 4 - device: /dev/kvmd-hid - - atx: - type: gpio - power_led_pin: 24 - hdd_led_pin: 22 - power_switch_pin: 23 - reset_switch_pin: 27 - - msd: - type: disabled - - streamer: - sync_delay: 1.0 - init_delay: 3.0 - desired_fps: 0 - unix: /run/kvmd/ustreamer.sock - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--tv-standard=pal" - - "--format=yuyv" - - "--encoder=cpu" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--resolution=720x576" - - "--fake-resolution=800x600" - - "--last-as-blank=0" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - -ipmi: - kvmd: - unix: /run/kvmd/kvmd.sock - -vnc: - kvmd: - unix: /run/kvmd/kvmd.sock - - streamer: - unix: /run/kvmd/ustreamer.sock diff --git a/configs/kvmd/main/v1-hdmi-rpi2.yaml b/configs/kvmd/main/v1-hdmi-rpi2.yaml deleted file mode 100644 index 09f62afa..00000000 --- a/configs/kvmd/main/v1-hdmi-rpi2.yaml +++ /dev/null @@ -1,67 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include override.yaml - -logging: !include logging.yaml - -kvmd: - server: - unix: /run/kvmd/kvmd.sock - - auth: !include auth.yaml - - hid: - type: serial - reset_pin: 4 - device: /dev/kvmd-hid - - atx: - type: gpio - power_led_pin: 24 - hdd_led_pin: 22 - power_led_inverted: true - hdd_led_inverted: true - power_switch_pin: 23 - reset_switch_pin: 27 - - msd: - type: relay - target_pin: 12 - reset_pin: 13 - device: /dev/kvmd-msd - - streamer: - unix: /run/kvmd/ustreamer.sock - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--encoder=omx" - - "--glitched-resolutions=720x480,720x576" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--last-as-blank=0" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - -ipmi: - kvmd: - unix: /run/kvmd/kvmd.sock - -vnc: - kvmd: - unix: /run/kvmd/kvmd.sock - - streamer: - unix: /run/kvmd/ustreamer.sock diff --git a/configs/kvmd/main/v1-hdmi-rpi3.yaml b/configs/kvmd/main/v1-hdmi-rpi3.yaml deleted file mode 100644 index 09f62afa..00000000 --- a/configs/kvmd/main/v1-hdmi-rpi3.yaml +++ /dev/null @@ -1,67 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include override.yaml - -logging: !include logging.yaml - -kvmd: - server: - unix: /run/kvmd/kvmd.sock - - auth: !include auth.yaml - - hid: - type: serial - reset_pin: 4 - device: /dev/kvmd-hid - - atx: - type: gpio - power_led_pin: 24 - hdd_led_pin: 22 - power_led_inverted: true - hdd_led_inverted: true - power_switch_pin: 23 - reset_switch_pin: 27 - - msd: - type: relay - target_pin: 12 - reset_pin: 13 - device: /dev/kvmd-msd - - streamer: - unix: /run/kvmd/ustreamer.sock - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--persistent" - - "--dv-timings" - - "--format=uyvy" - - "--encoder=omx" - - "--glitched-resolutions=720x480,720x576" - - "--workers=3" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--drop-same-frames=30" - - "--last-as-blank=0" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - -ipmi: - kvmd: - unix: /run/kvmd/kvmd.sock - -vnc: - kvmd: - unix: /run/kvmd/kvmd.sock - - streamer: - unix: /run/kvmd/ustreamer.sock diff --git a/configs/kvmd/main/v1-vga-rpi2.yaml b/configs/kvmd/main/v1-vga-rpi2.yaml deleted file mode 100644 index 7b1c5b65..00000000 --- a/configs/kvmd/main/v1-vga-rpi2.yaml +++ /dev/null @@ -1,71 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include override.yaml - -logging: !include logging.yaml - -kvmd: - server: - unix: /run/kvmd/kvmd.sock - - auth: !include auth.yaml - - hid: - type: serial - reset_pin: 4 - device: /dev/kvmd-hid - - atx: - type: gpio - power_led_pin: 24 - hdd_led_pin: 22 - power_led_inverted: true - hdd_led_inverted: true - power_switch_pin: 23 - reset_switch_pin: 27 - - msd: - type: relay - target_pin: 12 - reset_pin: 13 - device: /dev/kvmd-msd - - streamer: - cap_pin: 17 - conv_pin: 18 - sync_delay: 1.0 - init_delay: 3.0 - init_restart_after: 1.0 - desired_fps: 0 - unix: /run/kvmd/ustreamer.sock - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--tv-standard=pal" - - "--format=yuyv" - - "--encoder=cpu" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--resolution=720x576" - - "--fake-resolution=800x600" - - "--last-as-blank=0" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - -ipmi: - kvmd: - unix: /run/kvmd/kvmd.sock - -vnc: - kvmd: - unix: /run/kvmd/kvmd.sock - - streamer: - unix: /run/kvmd/ustreamer.sock diff --git a/configs/kvmd/main/v1-vga-rpi3.yaml b/configs/kvmd/main/v1-vga-rpi3.yaml deleted file mode 100644 index 7b1c5b65..00000000 --- a/configs/kvmd/main/v1-vga-rpi3.yaml +++ /dev/null @@ -1,71 +0,0 @@ -# Don't touch this file otherwise your device may stop working. -# Use override.yaml to modify required settings. -# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd. - -override: !include override.yaml - -logging: !include logging.yaml - -kvmd: - server: - unix: /run/kvmd/kvmd.sock - - auth: !include auth.yaml - - hid: - type: serial - reset_pin: 4 - device: /dev/kvmd-hid - - atx: - type: gpio - power_led_pin: 24 - hdd_led_pin: 22 - power_led_inverted: true - hdd_led_inverted: true - power_switch_pin: 23 - reset_switch_pin: 27 - - msd: - type: relay - target_pin: 12 - reset_pin: 13 - device: /dev/kvmd-msd - - streamer: - cap_pin: 17 - conv_pin: 18 - sync_delay: 1.0 - init_delay: 3.0 - init_restart_after: 1.0 - desired_fps: 0 - unix: /run/kvmd/ustreamer.sock - cmd: - - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" - - "--tv-standard=pal" - - "--format=yuyv" - - "--encoder=cpu" - - "--quality={quality}" - - "--desired-fps={desired_fps}" - - "--resolution=720x576" - - "--fake-resolution=800x600" - - "--last-as-blank=0" - - "--unix={unix}" - - "--unix-rm" - - "--unix-mode=0660" - - "--exit-on-parent-death" - - "--process-name-prefix={process_name_prefix}" - - "--notify-parent" - - "--no-log-colors" - -ipmi: - kvmd: - unix: /run/kvmd/kvmd.sock - -vnc: - kvmd: - unix: /run/kvmd/kvmd.sock - - streamer: - unix: /run/kvmd/ustreamer.sock diff --git a/configs/os/boot-config/v0-vga-rpi2.txt b/configs/os/boot-config/v0-vga-rpi2.txt deleted file mode 100644 index d78de4ae..00000000 --- a/configs/os/boot-config/v0-vga-rpi2.txt +++ /dev/null @@ -1,6 +0,0 @@ -# See /boot/overlays/README for all available options -initramfs initramfs-linux.img followkernel - -hdmi_force_hotplug=1 -gpu_mem=16 -enable_uart=1 diff --git a/configs/os/boot-config/v0-vga-rpi3.txt b/configs/os/boot-config/v0-vga-rpi3.txt deleted file mode 100644 index 5d41ab3c..00000000 --- a/configs/os/boot-config/v0-vga-rpi3.txt +++ /dev/null @@ -1,7 +0,0 @@ -# See /boot/overlays/README for all available options -initramfs initramfs-linux.img followkernel - -hdmi_force_hotplug=1 -gpu_mem=16 -enable_uart=1 -dtoverlay=disable-bt diff --git a/configs/os/boot-config/v1-hdmi-rpi2.txt b/configs/os/boot-config/v1-hdmi-rpi2.txt deleted file mode 100644 index 6bf6cf12..00000000 --- a/configs/os/boot-config/v1-hdmi-rpi2.txt +++ /dev/null @@ -1,9 +0,0 @@ -# See /boot/overlays/README for all available options -initramfs initramfs-linux.img followkernel - -hdmi_force_hotplug=1 -gpu_mem=256 -start_x=1 -enable_uart=1 -dtoverlay=tc358743,i2c_pins_28_29=1 -dtparam=act_led_gpio=26 diff --git a/configs/os/boot-config/v1-hdmi-rpi3.txt b/configs/os/boot-config/v1-hdmi-rpi3.txt deleted file mode 100644 index dd7d6b73..00000000 --- a/configs/os/boot-config/v1-hdmi-rpi3.txt +++ /dev/null @@ -1,10 +0,0 @@ -# See /boot/overlays/README for all available options -initramfs initramfs-linux.img followkernel - -hdmi_force_hotplug=1 -gpu_mem=256 -start_x=1 -enable_uart=1 -dtoverlay=tc358743 -dtparam=act_led_gpio=26 -dtoverlay=disable-bt diff --git a/configs/os/boot-config/v1-vga-rpi2.txt b/configs/os/boot-config/v1-vga-rpi2.txt deleted file mode 100644 index 84053d2c..00000000 --- a/configs/os/boot-config/v1-vga-rpi2.txt +++ /dev/null @@ -1,7 +0,0 @@ -# See /boot/overlays/README for all available options -initramfs initramfs-linux.img followkernel - -hdmi_force_hotplug=1 -gpu_mem=16 -dtparam=act_led_gpio=26 -enable_uart=1 diff --git a/configs/os/boot-config/v1-vga-rpi3.txt b/configs/os/boot-config/v1-vga-rpi3.txt deleted file mode 100644 index 095f44a4..00000000 --- a/configs/os/boot-config/v1-vga-rpi3.txt +++ /dev/null @@ -1,8 +0,0 @@ -# See /boot/overlays/README for all available options -initramfs initramfs-linux.img followkernel - -hdmi_force_hotplug=1 -gpu_mem=16 -dtparam=act_led_gpio=26 -enable_uart=1 -dtoverlay=disable-bt diff --git a/configs/os/cmdline/v0-vga-rpi2.sed b/configs/os/cmdline/v0-vga-rpi2.sed deleted file mode 100644 index 57f42700..00000000 --- a/configs/os/cmdline/v0-vga-rpi2.sed +++ /dev/null @@ -1,2 +0,0 @@ -s/console=ttyAMA0\,115200//g -s/kgdboc=ttyAMA0\,115200//g diff --git a/configs/os/cmdline/v0-vga-rpi3.sed b/configs/os/cmdline/v0-vga-rpi3.sed deleted file mode 100644 index 57f42700..00000000 --- a/configs/os/cmdline/v0-vga-rpi3.sed +++ /dev/null @@ -1,2 +0,0 @@ -s/console=ttyAMA0\,115200//g -s/kgdboc=ttyAMA0\,115200//g diff --git a/configs/os/cmdline/v1-hdmi-rpi2.sed b/configs/os/cmdline/v1-hdmi-rpi2.sed deleted file mode 100644 index b3614eb0..00000000 --- a/configs/os/cmdline/v1-hdmi-rpi2.sed +++ /dev/null @@ -1,3 +0,0 @@ -s/console=ttyAMA0\,115200//g -s/kgdboc=ttyAMA0\,115200//g -s/rootwait/cma=128M rootwait/g diff --git a/configs/os/cmdline/v1-hdmi-rpi3.sed b/configs/os/cmdline/v1-hdmi-rpi3.sed deleted file mode 100644 index b3614eb0..00000000 --- a/configs/os/cmdline/v1-hdmi-rpi3.sed +++ /dev/null @@ -1,3 +0,0 @@ -s/console=ttyAMA0\,115200//g -s/kgdboc=ttyAMA0\,115200//g -s/rootwait/cma=128M rootwait/g diff --git a/configs/os/cmdline/v1-vga-rpi2.sed b/configs/os/cmdline/v1-vga-rpi2.sed deleted file mode 100644 index 57f42700..00000000 --- a/configs/os/cmdline/v1-vga-rpi2.sed +++ /dev/null @@ -1,2 +0,0 @@ -s/console=ttyAMA0\,115200//g -s/kgdboc=ttyAMA0\,115200//g diff --git a/configs/os/cmdline/v1-vga-rpi3.sed b/configs/os/cmdline/v1-vga-rpi3.sed deleted file mode 100644 index 57f42700..00000000 --- a/configs/os/cmdline/v1-vga-rpi3.sed +++ /dev/null @@ -1,2 +0,0 @@ -s/console=ttyAMA0\,115200//g -s/kgdboc=ttyAMA0\,115200//g diff --git a/configs/os/modules-load/v1-hdmi.conf b/configs/os/modules-load/v1-hdmi.conf deleted file mode 100644 index 5be25408..00000000 --- a/configs/os/modules-load/v1-hdmi.conf +++ /dev/null @@ -1 +0,0 @@ -tc358743 diff --git a/configs/os/udev/v0-vga-rpi2.rules b/configs/os/udev/v0-vga-rpi2.rules deleted file mode 100644 index 026a3694..00000000 --- a/configs/os/udev/v0-vga-rpi2.rules +++ /dev/null @@ -1,4 +0,0 @@ -# https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name -# https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names -KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="1-1.3:1.0", GROUP="kvmd", SYMLINK+="kvmd-video" -KERNEL=="ttyAMA0", SYMLINK+="kvmd-hid" diff --git a/configs/os/udev/v0-vga-rpi3.rules b/configs/os/udev/v0-vga-rpi3.rules deleted file mode 100644 index 62cd0641..00000000 --- a/configs/os/udev/v0-vga-rpi3.rules +++ /dev/null @@ -1,4 +0,0 @@ -# https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name -# https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names -KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="1-1.1.3:1.0|1-1.3:1.0", GROUP="kvmd", SYMLINK+="kvmd-video" -KERNEL=="ttyAMA0", SYMLINK+="kvmd-hid" diff --git a/configs/os/udev/v1-hdmi-rpi2.rules b/configs/os/udev/v1-hdmi-rpi2.rules deleted file mode 100644 index f17317dd..00000000 --- a/configs/os/udev/v1-hdmi-rpi2.rules +++ /dev/null @@ -1,5 +0,0 @@ -# https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name -# https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names -KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="3f801000.csi|3f801000.csi1", ATTR{name}=="unicam-image", GROUP="kvmd", SYMLINK+="kvmd-video", TAG+="systemd" -KERNEL=="sd[a-z]", SUBSYSTEM=="block", KERNELS=="1-1.4:1.0", GROUP="kvmd", SYMLINK+="kvmd-msd" -KERNEL=="ttyAMA0", SYMLINK+="kvmd-hid" diff --git a/configs/os/udev/v1-hdmi-rpi3.rules b/configs/os/udev/v1-hdmi-rpi3.rules deleted file mode 100644 index f267094f..00000000 --- a/configs/os/udev/v1-hdmi-rpi3.rules +++ /dev/null @@ -1,5 +0,0 @@ -# https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name -# https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names -KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="3f801000.csi|3f801000.csi1", ATTR{name}=="unicam-image", GROUP="kvmd", SYMLINK+="kvmd-video", TAG+="systemd" -KERNEL=="sd[a-z]", SUBSYSTEM=="block", KERNELS=="1-1.1.2:1.0", GROUP="kvmd", SYMLINK+="kvmd-msd" -KERNEL=="ttyAMA0", SYMLINK+="kvmd-hid" diff --git a/configs/os/udev/v1-vga-rpi2.rules b/configs/os/udev/v1-vga-rpi2.rules deleted file mode 100644 index a3c67123..00000000 --- a/configs/os/udev/v1-vga-rpi2.rules +++ /dev/null @@ -1,5 +0,0 @@ -# https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name -# https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names -KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="1-1.3:1.0", GROUP="kvmd", SYMLINK+="kvmd-video" -KERNEL=="sd[a-z]", SUBSYSTEM=="block", KERNELS=="1-1.4:1.0", GROUP="kvmd", SYMLINK+="kvmd-msd" -KERNEL=="ttyAMA0", SYMLINK+="kvmd-hid" diff --git a/configs/os/udev/v1-vga-rpi3.rules b/configs/os/udev/v1-vga-rpi3.rules deleted file mode 100644 index 8bb563c7..00000000 --- a/configs/os/udev/v1-vga-rpi3.rules +++ /dev/null @@ -1,5 +0,0 @@ -# https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name -# https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names -KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="1-1.1.3:1.0|1-1.3:1.0", GROUP="kvmd", SYMLINK+="kvmd-video" -KERNEL=="sd[a-z]", SUBSYSTEM=="block", KERNELS=="1-1.1.2:1.0|1-1.2:1.0", GROUP="kvmd", SYMLINK+="kvmd-msd" -KERNEL=="ttyAMA0", SYMLINK+="kvmd-hid" diff --git a/testenv/v1-vga-rpi3.override.yaml b/testenv/v2-hdmiusb-rpi4.override.yaml index 97967257..c16d8867 100644 --- a/testenv/v1-vga-rpi3.override.yaml +++ b/testenv/v2-hdmiusb-rpi4.override.yaml @@ -8,18 +8,26 @@ kvmd: sysfs_prefix: /fake_sysfs hid: - device: /dev/ttyS10 + keyboard: + device: /dev/null + mouse: + device: /dev/null noop: true + msd: + remount_cmd: /bin/true + unlock_cmd: /bin/true + sysfs_prefix: /fake_sysfs + streamer: - desired_fps: 30 - max_fps: 40 cmd: - "/usr/bin/ustreamer" - "--device=/dev/kvmd-video" - - "--quality={quality}" + - "--persistent" + - "--format=jpeg" + - "--resolution={resolution}" - "--desired-fps={desired_fps}" - - "--resolution=800x600" + - "--drop-same-frames=30" - "--last-as-blank=0" - "--unix={unix}" - "--unix-rm" @@ -29,6 +37,7 @@ kvmd: - "--notify-parent" - "--no-log-colors" + vnc: keymap: /usr/share/kvmd/keymaps/ru |