From 153225252046a697fc3ba1c662db617194a66b36 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Tue, 22 Feb 2022 11:22:06 +0100 Subject: [PATCH] package/systemd: use systemd-hwdb for generating HWDB udevadm has been deprecated for a while for building the HWDB, systemd-hwdb should be used in its place. This tool further has a switch to generate the database in /usr which is a better place for a one-time created file than the default /etc/udev. The systemd-hwdb wasn't enabled yet in the host build, so do that. Signed-off-by: Norbert Lange [Arnout: split in two separate commits] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/systemd/systemd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 47aaddf849..45140cb042 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -307,7 +307,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true define SYSTEMD_BUILD_HWDB - $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) + $(HOST_DIR)/bin/systemd-hwdb update --root $(TARGET_DIR) --strict --usr endef SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB define SYSTEMD_RM_HWDB_SRV @@ -819,7 +819,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dsysusers=false \ -Dtmpfiles=true \ -Dimportd=false \ - -Dhwdb=false \ + -Dhwdb=true \ -Drfkill=false \ -Dman=false \ -Dhtml=false \