Merge remote-tracking branch 'origin/parched/OP-1451_udev_change_plugdev_to_uaccess' into next

2024-11-29 07:24:13 +01:00 · 2014-08-28 09:59:36 +10:00 · 2014-08-28 09:59:36 +10:00 · 3edbb71bfd
commit 3edbb71bfd
parent 6e86b3f157 7b10fbc5c4
2 changed files with 82 additions and 40 deletions
--- a/package/linux/45-openpilot-permissions.rules
+++ b/package/linux/45-openpilot-permissions.rules
@ -1,22 +1,41 @@
-    # OpenPilot openpilot flight control board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4117", MODE="0664", GROUP="plugdev"
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415a", MODE="0664", GROUP="plugdev"
-    # OpenPilot coptercontrol flight control board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415b", MODE="0664", GROUP="plugdev"
-    # OpenPilot OPLink Mini radio modem board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415c", MODE="0664", GROUP="plugdev"
-    # OpenPilot Revolution board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415e", MODE="0664", GROUP="plugdev"
+# Skip this section below if this device is not connected by USB
+SUBSYSTEM!="usb", GOTO="op_rules_end"

-    # Other OpenPilot reserved pids
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415d", MODE="0664", GROUP="plugdev" 
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4194", MODE="0664", GROUP="plugdev"
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4195", MODE="0664", GROUP="plugdev"
+# OpenPilot openpilot flight control board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4117", GOTO="op_rules"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415a", GOTO="op_rules"
+
+# OpenPilot coptercontrol flight control board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415b", GOTO="op_rules"
+
+# OpenPilot OPLink Mini radio modem board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415c", GOTO="op_rules"
+
+# OpenPilot Revolution board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415e", GOTO="op_rules"
+
+# Other OpenPilot reserved pids
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415d", GOTO="op_rules" 
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4194", GOTO="op_rules"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4195", GOTO="op_rules"


-    # unprogrammed openpilot flight control board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5750", MODE="0664", GROUP="plugdev"
-    # FTDI FT2232C Dual USB-UART/FIFO IC
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", MODE="0664", GROUP="plugdev"
-    # Olimex Ltd. OpenOCD JTAG TINY
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="0004", MODE="0664", GROUP="plugdev"
+# unprogrammed openpilot flight control board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5750", GOTO="op_rules"
+# FTDI FT2232C Dual USB-UART/FIFO IC
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", GOTO="op_rules"
+# Olimex Ltd. OpenOCD JTAG TINY
+SUBSYSTEM=="usb", ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="0004", GOTO="op_rules"
+
+GOTO="op_rules_end"
+
+LABEL="op_rules"
+# Allow any seated user to access the board.
+# uaccess: modern ACL-enabled udev
+# udev-acl: for Ubuntu 12.10 and older
+TAG+="uaccess", TAG+="udev-acl"
+
+# Grant members of the "plugdev" group access to receiver (useful for SSH users)
+#MODE="0664", GROUP="plugdev"
+
+LABEL="op_rules_end"
--- a/package/linux/deb_common/openpilot.udev
+++ b/package/linux/deb_common/openpilot.udev
@ -1,18 +1,41 @@
-    # OpenPilot Flight Control board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4117", MODE="0664", GROUP="plugdev"
-    # OpenPilot OP board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415a", MODE="0664", GROUP="plugdev"
-    # OpenPilot CopterControl flight control board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415b", MODE="0664", GROUP="plugdev"
-    # OpenPilot OPlink Mini radio modem board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415c", MODE="0664", GROUP="plugdev"
-    # OpenPilot CopterControl3D flight control board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415d", MODE="0664", GROUP="plugdev"
-    # OpenPilot Revolution flight control board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415e", MODE="0664", GROUP="plugdev"
-    # unprogrammed openpilot flight control board
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5750", MODE="0664", GROUP="plugdev"
-    # FTDI FT2232C Dual USB-UART/FIFO IC
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", MODE="0664", GROUP="plugdev"
-    # Olimex Ltd. OpenOCD JTAG TINY
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="0004", MODE="0664", GROUP="plugdev"
+# Skip this section below if this device is not connected by USB
+SUBSYSTEM!="usb", GOTO="op_rules_end"
+
+# OpenPilot openpilot flight control board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4117", GOTO="op_rules"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415a", GOTO="op_rules"
+
+# OpenPilot coptercontrol flight control board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415b", GOTO="op_rules"
+
+# OpenPilot OPLink Mini radio modem board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415c", GOTO="op_rules"
+
+# OpenPilot Revolution board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415e", GOTO="op_rules"
+
+# Other OpenPilot reserved pids
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415d", GOTO="op_rules" 
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4194", GOTO="op_rules"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4195", GOTO="op_rules"
+
+
+# unprogrammed openpilot flight control board
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5750", GOTO="op_rules"
+# FTDI FT2232C Dual USB-UART/FIFO IC
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", GOTO="op_rules"
+# Olimex Ltd. OpenOCD JTAG TINY
+SUBSYSTEM=="usb", ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="0004", GOTO="op_rules"
+
+GOTO="op_rules_end"
+
+LABEL="op_rules"
+# Allow any seated user to access the board.
+# uaccess: modern ACL-enabled udev
+# udev-acl: for Ubuntu 12.10 and older
+TAG+="uaccess", TAG+="udev-acl"
+
+# Grant members of the "plugdev" group access to receiver (useful for SSH users)
+#MODE="0664", GROUP="plugdev"
+
+LABEL="op_rules_end"