mirror of
https://github.com/systemd/systemd
synced 2024-10-07 00:30:59 +00:00
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.
This commit is contained in:
parent
ef2ad30aee
commit
4f10b80786
0
hwdb/.gitignore → hwdb.d/.gitignore
vendored
0
hwdb/.gitignore → hwdb.d/.gitignore
vendored
|
@ -1,6 +1,6 @@
|
||||||
# This file is part of systemd.
|
# This file is part of systemd.
|
||||||
#
|
#
|
||||||
# Data imported from: hwdb/sdio.ids
|
# Data imported from: hwdb.d/sdio.ids
|
||||||
|
|
||||||
sdio:c00v*d*
|
sdio:c00v*d*
|
||||||
ID_SDIO_CLASS_FROM_DATABASE=Non-standard SDIO interface
|
ID_SDIO_CLASS_FROM_DATABASE=Non-standard SDIO interface
|
|
@ -1,6 +1,6 @@
|
||||||
# This file is part of systemd.
|
# This file is part of systemd.
|
||||||
#
|
#
|
||||||
# Data imported from: hwdb/sdio.ids
|
# Data imported from: hwdb.d/sdio.ids
|
||||||
|
|
||||||
sdio:c*v0020*
|
sdio:c*v0020*
|
||||||
ID_VENDOR_FROM_DATABASE=ST-Ericsson
|
ID_VENDOR_FROM_DATABASE=ST-Ericsson
|
|
@ -275,7 +275,7 @@ def sdio_vendor_model(p):
|
||||||
add_item(items, (vendor, device), text)
|
add_item(items, (vendor, device), text)
|
||||||
|
|
||||||
with open('20-sdio-vendor-model.hwdb', 'wt') as out:
|
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):
|
for key in sorted(items):
|
||||||
if len(key) == 1:
|
if len(key) == 1:
|
||||||
|
@ -296,7 +296,7 @@ def sdio_classes(p):
|
||||||
add_item(items, klass, text)
|
add_item(items, klass, text)
|
||||||
|
|
||||||
with open('20-sdio-classes.hwdb', 'wt') as out:
|
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):
|
for klass in sorted(items):
|
||||||
print(f'',
|
print(f'',
|
|
@ -2907,12 +2907,12 @@ make_man_index_py = find_program('tools/make-man-index.py')
|
||||||
xml_helper_py = find_program('tools/xml_helper.py')
|
xml_helper_py = find_program('tools/xml_helper.py')
|
||||||
hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
|
hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
|
||||||
|
|
||||||
subdir('units')
|
|
||||||
subdir('sysctl.d')
|
subdir('sysctl.d')
|
||||||
subdir('sysusers.d')
|
subdir('sysusers.d')
|
||||||
subdir('tmpfiles.d')
|
subdir('tmpfiles.d')
|
||||||
|
subdir('hwdb.d')
|
||||||
|
subdir('units')
|
||||||
subdir('presets')
|
subdir('presets')
|
||||||
subdir('hwdb')
|
|
||||||
subdir('network')
|
subdir('network')
|
||||||
subdir('man')
|
subdir('man')
|
||||||
subdir('shell-completion/bash')
|
subdir('shell-completion/bash')
|
||||||
|
|
|
@ -21,7 +21,7 @@ fi
|
||||||
D=$(mktemp --directory)
|
D=$(mktemp --directory)
|
||||||
trap "rm -rf '$D'" EXIT INT QUIT PIPE
|
trap "rm -rf '$D'" EXIT INT QUIT PIPE
|
||||||
mkdir -p "$D/etc/udev"
|
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
|
# Test "good" properties" — no warnings or errors allowed
|
||||||
err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$?
|
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
|
# Test "bad" properties" — warnings required, errors not allowed
|
||||||
rm -f "$D/etc/udev/hwdb.bin" "$D/etc/udev/hwdb.d"
|
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=$?
|
err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$?
|
||||||
if [ -n "$rc" ]; then
|
if [ -n "$rc" ]; then
|
||||||
echo "$SYSTEMD_HWDB returned $rc"
|
echo "$SYSTEMD_HWDB returned $rc"
|
||||||
|
|
|
@ -26,7 +26,7 @@ test_data_files = '''
|
||||||
h.service
|
h.service
|
||||||
hello-after-sleep.target
|
hello-after-sleep.target
|
||||||
hello.service
|
hello.service
|
||||||
hwdb/10-bad.hwdb
|
hwdb.d/10-bad.hwdb
|
||||||
i.service
|
i.service
|
||||||
journal-data/journal-1.txt
|
journal-data/journal-1.txt
|
||||||
journal-data/journal-2.txt
|
journal-data/journal-2.txt
|
||||||
|
|
Loading…
Reference in a new issue