diff options
| author | Maxim Devaev <[email protected]> | 2022-04-10 06:00:10 +0300 |
|---|---|---|
| committer | Maxim Devaev <[email protected]> | 2022-04-10 06:00:10 +0300 |
| commit | 486f1be9867fcb3220a2918ddd5b0371ece17d5d (patch) | |
| tree | 22f6297f9a4755631c0aee3397980a8e2dde0d22 /testenv | |
| parent | 122242ea472684434989706253bb38ad48a6cbd6 (diff) | |
get rid of the otg-unlock helper
Diffstat (limited to 'testenv')
12 files changed, 7 insertions, 14 deletions
diff --git a/testenv/Dockerfile b/testenv/Dockerfile index d03ba61e..46105815 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -95,19 +95,10 @@ RUN git clone https://github.com/pikvm/ustreamer \ RUN mkdir -p \ /etc/kvmd/{nginx,vnc} \ /var/lib/kvmd/msd/{images,meta} \ - /opt/vc/bin \ - /fake_sysfs/sys/kernel/config/usb_gadget/kvmd/configs/c.1 \ - /fake_sysfs/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0 \ - /fake_sysfs/sys/class/thermal/thermal_zone0 \ - /fake_procfs/proc/device-tree \ - /fake_sysfs/sys/class/udc/fe980000.usb/device \ - /fake_sysfs/sys/bus/platform/drivers/dwc2 \ - && echo configured > /fake_sysfs/sys/class/udc/fe980000.usb/state \ - && ln -s /fake_sysfs/sys/bus/platform/drivers/dwc2 /fake_sysfs/sys/class/udc/fe980000.usb/device/driver + /opt/vc/bin COPY testenv/fakes/vcgencmd /opt/vc/bin/ -COPY testenv/fakes/msd/* /fake_sysfs/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0/ -COPY testenv/fakes/cpu_temp /fake_sysfs/sys/class/thermal/thermal_zone0/temp -COPY testenv/fakes/dt_model /fake_procfs/proc/device-tree/model +COPY testenv/fakes/sys /fake_sysfs/sys +COPY testenv/fakes/proc /fake_procfs/proc CMD /bin/bash diff --git a/testenv/fakes/dt_model b/testenv/fakes/proc/device-tree/model index 3afd3566..3afd3566 100644 --- a/testenv/fakes/dt_model +++ b/testenv/fakes/proc/device-tree/model diff --git a/testenv/fakes/cpu_temp b/testenv/fakes/sys/class/thermal/thermal_zone0/temp index 9db0c8a7..9db0c8a7 100644 --- a/testenv/fakes/cpu_temp +++ b/testenv/fakes/sys/class/thermal/thermal_zone0/temp diff --git a/testenv/fakes/sys/class/udc/fe980000.usb/device/driver b/testenv/fakes/sys/class/udc/fe980000.usb/device/driver new file mode 120000 index 00000000..cd14daa3 --- /dev/null +++ b/testenv/fakes/sys/class/udc/fe980000.usb/device/driver @@ -0,0 +1 @@ +../../../../bus/platform/drivers/dwc2
\ No newline at end of file diff --git a/testenv/fakes/sys/class/udc/fe980000.usb/state b/testenv/fakes/sys/class/udc/fe980000.usb/state new file mode 100644 index 00000000..6ad6460c --- /dev/null +++ b/testenv/fakes/sys/class/udc/fe980000.usb/state @@ -0,0 +1 @@ +configured diff --git a/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/configs/c.1/mass_storage.usb0 b/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/configs/c.1/mass_storage.usb0 new file mode 120000 index 00000000..b7637404 --- /dev/null +++ b/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/configs/c.1/mass_storage.usb0 @@ -0,0 +1 @@ +../../functions/mass_storage.usb0
\ No newline at end of file diff --git a/testenv/fakes/msd/cdrom b/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0/cdrom index d00491fd..d00491fd 100644 --- a/testenv/fakes/msd/cdrom +++ b/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0/cdrom diff --git a/testenv/fakes/msd/file b/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0/file index e69de29b..e69de29b 100644 --- a/testenv/fakes/msd/file +++ b/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0/file diff --git a/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0/forced_eject b/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0/forced_eject new file mode 120000 index 00000000..1a010b1c --- /dev/null +++ b/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0/forced_eject @@ -0,0 +1 @@ +file
\ No newline at end of file diff --git a/testenv/fakes/msd/ro b/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0/ro index d00491fd..d00491fd 100644 --- a/testenv/fakes/msd/ro +++ b/testenv/fakes/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0/ro diff --git a/testenv/v2-hdmi-rpi4.override.yaml b/testenv/v2-hdmi-rpi4.override.yaml index dc63b3a3..2625f081 100644 --- a/testenv/v2-hdmi-rpi4.override.yaml +++ b/testenv/v2-hdmi-rpi4.override.yaml @@ -17,7 +17,6 @@ kvmd: msd: remount_cmd: /bin/true - unlock_cmd: /bin/true streamer: desired_fps: 30 diff --git a/testenv/v2-hdmiusb-rpi4.override.yaml b/testenv/v2-hdmiusb-rpi4.override.yaml index 45e857b1..958bfd34 100644 --- a/testenv/v2-hdmiusb-rpi4.override.yaml +++ b/testenv/v2-hdmiusb-rpi4.override.yaml @@ -14,7 +14,6 @@ kvmd: msd: remount_cmd: /bin/true - unlock_cmd: /bin/true streamer: cmd: |