Rename udev's hwdb/ to hwdb.d/

As in the parent commit, this makes the name consistent with the
rest of the source tree and the actuall installation path.

diff --git a/hwdb/.gitattributes b/hwdb.d/.gitattributes
similarity index 100%
rename from hwdb/.gitattributes
rename to hwdb.d/.gitattributes

diff --git a/hwdb/.gitignore b/hwdb.d/.gitignore
similarity index 100%
rename from hwdb/.gitignore
rename to hwdb.d/.gitignore

diff --git a/hwdb/20-OUI.hwdb b/hwdb.d/20-OUI.hwdb
similarity index 100%
rename from hwdb/20-OUI.hwdb
rename to hwdb.d/20-OUI.hwdb

diff --git a/hwdb/20-acpi-vendor.hwdb b/hwdb.d/20-acpi-vendor.hwdb
similarity index 100%
rename from hwdb/20-acpi-vendor.hwdb
rename to hwdb.d/20-acpi-vendor.hwdb

diff --git a/hwdb/20-acpi-vendor.hwdb.patch b/hwdb.d/20-acpi-vendor.hwdb.patch
similarity index 100%
rename from hwdb/20-acpi-vendor.hwdb.patch
rename to hwdb.d/20-acpi-vendor.hwdb.patch

diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb.d/20-bluetooth-vendor-product.hwdb
similarity index 100%
rename from hwdb/20-bluetooth-vendor-product.hwdb
rename to hwdb.d/20-bluetooth-vendor-product.hwdb

diff --git a/hwdb/20-net-ifname.hwdb b/hwdb.d/20-net-ifname.hwdb
similarity index 100%
rename from hwdb/20-net-ifname.hwdb
rename to hwdb.d/20-net-ifname.hwdb

diff --git a/hwdb/20-pci-classes.hwdb b/hwdb.d/20-pci-classes.hwdb
similarity index 100%
rename from hwdb/20-pci-classes.hwdb
rename to hwdb.d/20-pci-classes.hwdb

diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb.d/20-pci-vendor-model.hwdb
similarity index 100%
rename from hwdb/20-pci-vendor-model.hwdb
rename to hwdb.d/20-pci-vendor-model.hwdb

diff --git a/hwdb/20-sdio-classes.hwdb b/hwdb.d/20-sdio-classes.hwdb
similarity index 95%
rename from hwdb/20-sdio-classes.hwdb
rename to hwdb.d/20-sdio-classes.hwdb
index eceb773ae3365944bf6706fffb1ad95c3e9bacf8..3bf56bbf90973e38825df99c6ee0daefa9906290 100644 (file)
--- a/hwdb/20-sdio-classes.hwdb
+++ b/hwdb.d/20-sdio-classes.hwdb
@@ -1,6 +1,6 @@
 # This file is part of systemd.
 #
-# Data imported from: hwdb/sdio.ids
+# Data imported from: hwdb.d/sdio.ids
 
 sdio:c00v*d*
  ID_SDIO_CLASS_FROM_DATABASE=Non-standard SDIO interface

diff --git a/hwdb/20-sdio-vendor-model.hwdb b/hwdb.d/20-sdio-vendor-model.hwdb
similarity index 99%
rename from hwdb/20-sdio-vendor-model.hwdb
rename to hwdb.d/20-sdio-vendor-model.hwdb
index 489dab433e9e2c9c2e393addeea1f6f3692020e7..8d3e72439a87b28d2bd63dadf7daa861f4649d36 100644 (file)
--- a/hwdb/20-sdio-vendor-model.hwdb
+++ b/hwdb.d/20-sdio-vendor-model.hwdb
@@ -1,6 +1,6 @@
 # This file is part of systemd.
 #
-# Data imported from: hwdb/sdio.ids
+# Data imported from: hwdb.d/sdio.ids
 
 sdio:c*v0020*
  ID_VENDOR_FROM_DATABASE=ST-Ericsson

diff --git a/hwdb/20-usb-classes.hwdb b/hwdb.d/20-usb-classes.hwdb
similarity index 100%
rename from hwdb/20-usb-classes.hwdb
rename to hwdb.d/20-usb-classes.hwdb

diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb.d/20-usb-vendor-model.hwdb
similarity index 100%
rename from hwdb/20-usb-vendor-model.hwdb
rename to hwdb.d/20-usb-vendor-model.hwdb

diff --git a/hwdb/20-vmbus-class.hwdb b/hwdb.d/20-vmbus-class.hwdb
similarity index 100%
rename from hwdb/20-vmbus-class.hwdb
rename to hwdb.d/20-vmbus-class.hwdb

diff --git a/hwdb/60-evdev.hwdb b/hwdb.d/60-evdev.hwdb
similarity index 100%
rename from hwdb/60-evdev.hwdb
rename to hwdb.d/60-evdev.hwdb

diff --git a/hwdb/60-input-id.hwdb b/hwdb.d/60-input-id.hwdb
similarity index 100%
rename from hwdb/60-input-id.hwdb
rename to hwdb.d/60-input-id.hwdb

diff --git a/hwdb/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb
similarity index 100%
rename from hwdb/60-keyboard.hwdb
rename to hwdb.d/60-keyboard.hwdb

diff --git a/hwdb/60-sensor.hwdb b/hwdb.d/60-sensor.hwdb
similarity index 100%
rename from hwdb/60-sensor.hwdb
rename to hwdb.d/60-sensor.hwdb

diff --git a/hwdb/70-joystick.hwdb b/hwdb.d/70-joystick.hwdb
similarity index 100%
rename from hwdb/70-joystick.hwdb
rename to hwdb.d/70-joystick.hwdb

diff --git a/hwdb/70-mouse.hwdb b/hwdb.d/70-mouse.hwdb
similarity index 100%
rename from hwdb/70-mouse.hwdb
rename to hwdb.d/70-mouse.hwdb

diff --git a/hwdb/70-pointingstick.hwdb b/hwdb.d/70-pointingstick.hwdb
similarity index 100%
rename from hwdb/70-pointingstick.hwdb
rename to hwdb.d/70-pointingstick.hwdb

diff --git a/hwdb/70-touchpad.hwdb b/hwdb.d/70-touchpad.hwdb
similarity index 100%
rename from hwdb/70-touchpad.hwdb
rename to hwdb.d/70-touchpad.hwdb

diff --git a/hwdb/acpi-update.py b/hwdb.d/acpi-update.py
similarity index 100%
rename from hwdb/acpi-update.py
rename to hwdb.d/acpi-update.py

diff --git a/hwdb/acpi_id_registry.html b/hwdb.d/acpi_id_registry.html
similarity index 100%
rename from hwdb/acpi_id_registry.html
rename to hwdb.d/acpi_id_registry.html

diff --git a/hwdb/ids_parser.py b/hwdb.d/ids_parser.py
similarity index 99%
rename from hwdb/ids_parser.py
rename to hwdb.d/ids_parser.py
index 58ecc73ae16a2cdb89a0b1a87ebae860dea2a5c6..6f3a88f840ab1e0d7f0d96eee7dcdb208c4ca5d9 100755 (executable)
--- a/hwdb/ids_parser.py
+++ b/hwdb.d/ids_parser.py
@@ -275,7 +275,7 @@ def sdio_vendor_model(p):
             add_item(items, (vendor, device), text)
 
     with open('20-sdio-vendor-model.hwdb', 'wt') as out:
-        header(out, 'hwdb/sdio.ids')
+        header(out, 'hwdb.d/sdio.ids')
 
         for key in sorted(items):
             if len(key) == 1:
@@ -296,7 +296,7 @@ def sdio_classes(p):
         add_item(items, klass, text)
 
     with open('20-sdio-classes.hwdb', 'wt') as out:
-        header(out, 'hwdb/sdio.ids')
+        header(out, 'hwdb.d/sdio.ids')
 
         for klass in sorted(items):
             print(f'',

diff --git a/hwdb/ma-large.txt b/hwdb.d/ma-large.txt
similarity index 100%
rename from hwdb/ma-large.txt
rename to hwdb.d/ma-large.txt

diff --git a/hwdb/ma-medium.txt b/hwdb.d/ma-medium.txt
similarity index 100%
rename from hwdb/ma-medium.txt
rename to hwdb.d/ma-medium.txt

diff --git a/hwdb/ma-small.txt b/hwdb.d/ma-small.txt
similarity index 100%
rename from hwdb/ma-small.txt
rename to hwdb.d/ma-small.txt

diff --git a/hwdb/meson.build b/hwdb.d/meson.build
similarity index 100%
rename from hwdb/meson.build
rename to hwdb.d/meson.build

diff --git a/hwdb/parse_hwdb.py b/hwdb.d/parse_hwdb.py
similarity index 100%
rename from hwdb/parse_hwdb.py
rename to hwdb.d/parse_hwdb.py

diff --git a/hwdb/pci.ids b/hwdb.d/pci.ids
similarity index 100%
rename from hwdb/pci.ids
rename to hwdb.d/pci.ids

diff --git a/hwdb/pnp_id_registry.html b/hwdb.d/pnp_id_registry.html
similarity index 100%
rename from hwdb/pnp_id_registry.html
rename to hwdb.d/pnp_id_registry.html

diff --git a/hwdb/sdio.ids b/hwdb.d/sdio.ids
similarity index 100%
rename from hwdb/sdio.ids
rename to hwdb.d/sdio.ids

diff --git a/hwdb/usb.ids b/hwdb.d/usb.ids
similarity index 100%
rename from hwdb/usb.ids
rename to hwdb.d/usb.ids

diff --git a/meson.build b/meson.build
index 763ff55dd4de5e8ad6b699cf6e129ae1279f74b7..1e27be78373c5bea63436618bfe38178be368d6c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2907,12 +2907,12 @@ make_man_index_py = find_program('tools/make-man-index.py')
 xml_helper_py = find_program('tools/xml_helper.py')
 hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
 
-subdir('units')
 subdir('sysctl.d')
 subdir('sysusers.d')
 subdir('tmpfiles.d')
+subdir('hwdb.d')
+subdir('units')
 subdir('presets')
-subdir('hwdb')
 subdir('network')
 subdir('man')
 subdir('shell-completion/bash')

diff --git a/test/hwdb-test.sh b/test/hwdb-test.sh
index 05363e9ad6b445de3d52a07bd019340abd8156aa..d12f82fa2d7997c0b3f215e477a373dd97e9888f 100755 (executable)
--- a/test/hwdb-test.sh
+++ b/test/hwdb-test.sh
@@ -21,7 +21,7 @@ fi
 D=$(mktemp --directory)
 trap "rm -rf '$D'" EXIT INT QUIT PIPE
 mkdir -p "$D/etc/udev"
-ln -s "$ROOTDIR/hwdb" "$D/etc/udev/hwdb.d"
+ln -s "$ROOTDIR/hwdb.d" "$D/etc/udev/hwdb.d"
 
 # Test "good" properties" — no warnings or errors allowed
 err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$?
@@ -42,7 +42,7 @@ fi
 # Test "bad" properties" — warnings required, errors not allowed
 rm -f "$D/etc/udev/hwdb.bin" "$D/etc/udev/hwdb.d"
 
-ln -s "$ROOTDIR/test/hwdb" "$D/etc/udev/hwdb.d"
+ln -s "$ROOTDIR/test/hwdb.d" "$D/etc/udev/hwdb.d"
 err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$?
 if [ -n "$rc" ]; then
     echo "$SYSTEMD_HWDB returned $rc"

diff --git a/test/hwdb/10-bad.hwdb b/test/hwdb.d/10-bad.hwdb
similarity index 100%
rename from test/hwdb/10-bad.hwdb
rename to test/hwdb.d/10-bad.hwdb

diff --git a/test/meson.build b/test/meson.build
index 36d9df729c7d3931773129d700ef5157075a9df8..24ab4d1deef400c7b066e7b3d5d5e120d9e5b7cc 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -26,7 +26,7 @@ test_data_files = '''
         h.service
         hello-after-sleep.target
         hello.service
-        hwdb/10-bad.hwdb
+        hwdb.d/10-bad.hwdb
         i.service
         journal-data/journal-1.txt
         journal-data/journal-2.txt