Merge branch 'master' into RTSP-video-driver

Author: Thomas-Vreys

dockerfiles/staging/dut/Dockerfile

@@ -14,7 +14,7 @@ RUN apt update -q=2 && \
 
 COPY --chown=root:root ./authorized_keys /root/.ssh/authorized_keys
 
-# As sshd scrubs ENV variables if they are set by the ENV varibale ensure to put the into /etc/profile as shown below
+# As sshd scrubs ENV variables if they are set by the ENV variable ensure to put the into /etc/profile as shown below
 ENV NOTVISIBLE="in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 

examples/qemu-run.py

@@ -41,7 +41,7 @@ def main(args):
         "-s",
         "--state",
         default=os.environ.get("LG_STATE"),
-        help="State to transition the strategy into (alternatively provided via LG_STATE",
+        help="State to transition the strategy into (alternatively provided via LG_STATE)",
     )
     parser.add_argument(
         "-v",

labgrid/remote/client.py

@@ -1862,7 +1862,7 @@ def get_parser(auto_doc_mode=False) -> "argparse.ArgumentParser | AutoProgramArg
         "-s",
         "--state",
         type=str,
-        help="strategy state to switch into before command (default: value from env varibale LG_STATE)",
+        help="strategy state to switch into before command (default: value from env variable LG_STATE)",
     )
     parser.add_argument(
         "-i",

labgrid/resource/udev.py

@@ -107,6 +107,20 @@ def suggest_match(self, device):
                 else:
                     suggestions.append({'@ID_SERIAL_SHORT': serial})
 
+        # Multi-port USB serial adapters (e.g. WCH CH34x, FTDI multi) expose
+        # several ports under one USB interface, so ID_PATH / ID_SERIAL_SHORT /
+        # ID_USB_INTERFACE_NUM are identical for every port and the suggestions
+        # above are ambiguous. The kernel's per-port `port_number` sysfs attr on
+        # an ancestor is stable across re-enumeration; fold it into each
+        # suggestion (as an `@` ancestor match) so every port is unique.
+        for ancestor in self.device.ancestors:
+            if ancestor.attributes.get('port_number') is not None:
+                port_number = ancestor.attributes.asstring('port_number')
+                for suggestion in suggestions:
+                    suggestion['@port_number'] = port_number
+                meta['port_number'] = port_number
+                break
+
         return meta, suggestions
 
     def try_match(self, device):

man/labgrid-client.1

@@ -63,7 +63,7 @@ place name/alias (default: value from env variable LG_PLACE)
 .INDENT 0.0
 .TP
 .B \-s <state>, \-\-state <state>
-strategy state to switch into before command (default: value from env varibale LG_STATE)
+strategy state to switch into before command (default: value from env variable LG_STATE)
 .UNINDENT
 .INDENT 0.0
 .TP