From 4095cff07e1db4c220ff150e77287b8f4f6bc3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 27 Jan 2021 09:17:26 +0100 Subject: meson: rename target to update-hwdb The goal is to have all "update-*" targets named uniformly so that tab-completion works. The script is renamed to match. --- tools/hwdb-update.sh | 32 -------------------------------- tools/update-hwdb.sh | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) delete mode 100755 tools/hwdb-update.sh create mode 100755 tools/update-hwdb.sh (limited to 'tools') diff --git a/tools/hwdb-update.sh b/tools/hwdb-update.sh deleted file mode 100755 index 42251612dd..0000000000 --- a/tools/hwdb-update.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -set -eu - -cd "$1" - -unset permissive -if [ "${2:-}" = "-p" ]; then - permissive=1 - shift -else - permissive=0 -fi - -if [ "${2:-}" != "-n" ]; then ( - [ -z "$permissive" ] || set +e - set -x - - curl --fail -L -o usb.ids 'http://www.linux-usb.org/usb.ids' - curl --fail -L -o pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' - curl --fail -L -o ma-large.txt 'http://standards-oui.ieee.org/oui/oui.txt' - curl --fail -L -o ma-medium.txt 'http://standards-oui.ieee.org/oui28/mam.txt' - curl --fail -L -o ma-small.txt 'http://standards-oui.ieee.org/oui36/oui36.txt' - curl --fail -L -o pnp_id_registry.html 'https://uefi.org/uefi-pnp-export' - curl --fail -L -o acpi_id_registry.html 'https://uefi.org/uefi-acpi-export' -) fi - -set -x -./acpi-update.py >20-acpi-vendor.hwdb.base -patch -p0 -o- 20-acpi-vendor.hwdb.base <20-acpi-vendor.hwdb.patch >20-acpi-vendor.hwdb -! diff -u 20-acpi-vendor.hwdb.base 20-acpi-vendor.hwdb >20-acpi-vendor.hwdb.patch - -./ids_parser.py diff --git a/tools/update-hwdb.sh b/tools/update-hwdb.sh new file mode 100755 index 0000000000..42251612dd --- /dev/null +++ b/tools/update-hwdb.sh @@ -0,0 +1,32 @@ +#!/bin/sh +set -eu + +cd "$1" + +unset permissive +if [ "${2:-}" = "-p" ]; then + permissive=1 + shift +else + permissive=0 +fi + +if [ "${2:-}" != "-n" ]; then ( + [ -z "$permissive" ] || set +e + set -x + + curl --fail -L -o usb.ids 'http://www.linux-usb.org/usb.ids' + curl --fail -L -o pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' + curl --fail -L -o ma-large.txt 'http://standards-oui.ieee.org/oui/oui.txt' + curl --fail -L -o ma-medium.txt 'http://standards-oui.ieee.org/oui28/mam.txt' + curl --fail -L -o ma-small.txt 'http://standards-oui.ieee.org/oui36/oui36.txt' + curl --fail -L -o pnp_id_registry.html 'https://uefi.org/uefi-pnp-export' + curl --fail -L -o acpi_id_registry.html 'https://uefi.org/uefi-acpi-export' +) fi + +set -x +./acpi-update.py >20-acpi-vendor.hwdb.base +patch -p0 -o- 20-acpi-vendor.hwdb.base <20-acpi-vendor.hwdb.patch >20-acpi-vendor.hwdb +! diff -u 20-acpi-vendor.hwdb.base 20-acpi-vendor.hwdb >20-acpi-vendor.hwdb.patch + +./ids_parser.py -- cgit v1.2.1