udev: hwdb: replace ID_INPUT_JOYSTICK_INTEGRATION (#40761)

Could ask to Bastien Nocera who originally commited the joysticks hwdb
integration
https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1429#note_3338386
and stated that was for use in iio-sensor but later anything was done.

As the variable was never used replace it with the new variable actually
in the process to be use in libinput. Even more at least some of the
idea that was planed for ID_INPUT_JOYSTICK_INTEGRATION could be done in
libinput.

Actually ID_INPUT_JOYSTICK_INTEGRATION was never used anywhere, replace
it with ID_INTEGRATION.

Follow up: a4381cae8b.

NEWS

@@ -149,6 +149,18 @@ CHANGES WITH 260 in spe:
           low brightness values at runtime independently of the systemd clamp
           which only applies during boot.
 
+        * A new variable ID_INTEGRATION is now exposed to devices that have
+          ID_BUS defined. This variable can be set to internal when the device
+          is integral part of the system or external otherwise. Actually,
+          internal buses like PCI, I2C, SPI... makes it to be internal and
+          external buses like bluetooth set it to external, while for USB the
+          removable attribute of the port the device is connected tells us to
+          decide, fixed is set to internal and removable or unknown to external.
+
+        * ID_INPUT_JOYSTICK_INTEGRATION variable has been dropped in favor of
+          ID_INTEGRATION because it was never used and the new variable cover
+          better the idea that variable was intended for.
+
         Changes in systemd-networkd:
 
         * MultiPathRoute= option now supports interface-bound ECMP routes.

hwdb.d/70-joystick.hwdb

@@ -26,10 +26,10 @@
 #
 # Permitted keys:
 #   Specify if a joystick is a built-in one or external:
-#   ID_INPUT_JOYSTICK_INTEGRATION=internal|external
+#   ID_INTEGRATION=internal|external
 #
 #   If the property is missing, user-space can assume:
-#   ID_INPUT_JOYSTICK_INTEGRATION=external
+#   ID_INTEGRATION=external
 #
 #   By default i8042, i2c, and rmi devices are assumed to be internal,
 #   bluetooth devices are assumed to be external, usb devices are assumed
@@ -38,4 +38,4 @@
 # Example entry; vid: ffff, pid: 0000; both must be lowercase.
 # this will make this usb joystick to behave as internal.
 #joystick:usb:vffffp0000*
-# ID_INPUT_JOYSTICK_INTEGRATION=internal
+# ID_INTEGRATION=internal

hwdb.d/parse_hwdb.py

@@ -183,7 +183,7 @@ def property_grammar():
              ('ID_MM_DEVICE_IGNORE', Or((Literal('0'), Literal('1')))),
              ('ID_NET_AUTO_LINK_LOCAL_ONLY', Or((Literal('0'), Literal('1')))),
              ('POINTINGSTICK_SENSITIVITY', INTEGER),
-             ('ID_INPUT_JOYSTICK_INTEGRATION', Or(('internal', 'external'))),
+             ('ID_INTEGRATION', Or(('internal', 'external'))),
              ('ID_INPUT_TOUCHPAD_INTEGRATION', Or(('internal', 'external'))),
              ('XKB_FIXED_LAYOUT', xkb_setting),
              ('XKB_FIXED_VARIANT', xkb_setting),

rules.d/65-integration.rules

@@ -16,10 +16,7 @@ ENV{ID_BUS}=="bluetooth", ENV{ID_INTEGRATION}="external"
 ENV{ID_BUS}=="usb", DRIVERS=="usb", ATTRS{maxchild}=="0", ATTRS{removable}=="fixed", ENV{ID_INTEGRATION}="internal"
 ENV{ID_BUS}=="usb", DRIVERS=="usb", ATTRS{maxchild}=="0", ATTRS{removable}=="removable|unknown", ENV{ID_INTEGRATION}="external"
 
-# libinput compatibility variables, must be loaded before 70-(joystick|touchpad).rules to allow hwdb quirks to override.
-ENV{ID_INPUT}=="", GOTO="integration_libinput_end"
-ENV{ID_INPUT_JOYSTICK}=="1", ENV{ID_INPUT_JOYSTICK_INTEGRATION}="$env{ID_INTEGRATION}"
+# libinput compatibility, must be loaded before 70-touchpad.rules to allow hwdb quirks to override.
 ENV{ID_INPUT_TOUCHPAD}=="1", ENV{ID_INPUT_TOUCHPAD_INTEGRATION}="$env{ID_INTEGRATION}"
-LABEL="integration_libinput_end"
 
 LABEL="integration_end"

rules.d/70-joystick.rules

@@ -8,9 +8,4 @@ KERNEL!="event*", GOTO="joystick_end"
 KERNELS=="input*", ENV{ID_BUS}!="", \
         IMPORT{builtin}="hwdb 'joystick:$env{ID_BUS}:v$attr{id/vendor}p$attr{id/product}:name:$attr{name}:'"
 
-# Spread the hwdb override to ID_INTEGRATION, in the future we could remove the
-# joystick hwdb entirely or retain it using the generic ID_INTEGRATION instead
-# specific ID_INPUT_JOYSTICK_INTEGRATION.
-ENV{ID_INPUT_JOYSTICK_INTEGRATION}!="", ENV{ID_INTEGRATION}="$env{ID_INPUT_JOYSTICK_INTEGRATION}"
-
 LABEL="joystick_end"