Merge pull request #12734 from keszybz/cpu-set-util-on-i386

[thirdparty/systemd.git] / tools / meson-hwdb-update.sh

diff --git a/tools/meson-hwdb-update.sh b/tools/meson-hwdb-update.sh
index 275d54cd17ef353856c159f6565768a8454a606d..39efd75192b2ebf6a068e3f8575411a79c75e025 100755 (executable)
--- a/tools/meson-hwdb-update.sh
+++ b/tools/meson-hwdb-update.sh
@@ -3,16 +3,28 @@ set -eu
 
 cd "$1"
 
-if [ "${2:-}" != "-n" ]; then
-        curl -L -o usb.ids 'http://www.linux-usb.org/usb.ids'
-        curl -L -o pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids'
-        curl -L -o ma-large.txt 'http://standards-oui.ieee.org/oui/oui.txt'
-        curl -L -o ma-medium.txt 'http://standards-oui.ieee.org/oui28/mam.txt'
-        curl -L -o ma-small.txt 'http://standards-oui.ieee.org/oui36/oui36.txt'
-        curl -L -o pnp_id_registry.html 'http://www.uefi.org/uefi-pnp-export'
-        curl -L -o acpi_id_registry.html 'http://www.uefi.org/uefi-acpi-export'
+unset permissive
+if [ "${2:-}" = "-p" ]; then
+    permissive=1
+    shift
+else
+    permissive=0
 fi
 
+if [ "${2:-}" != "-n" ]; then (
+    [ -z "$permissive" ] || set +e
+    set -x
+
+    curl -L -o usb.ids 'http://www.linux-usb.org/usb.ids'
+    curl -L -o pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids'
+    curl -L -o ma-large.txt 'http://standards-oui.ieee.org/oui/oui.txt'
+    curl -L -o ma-medium.txt 'http://standards-oui.ieee.org/oui28/mam.txt'
+    curl -L -o ma-small.txt 'http://standards-oui.ieee.org/oui36/oui36.txt'
+    curl -L -o pnp_id_registry.html 'https://uefi.org/uefi-pnp-export'
+    curl -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