@@ -229,11 +229,13 @@ 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) --usr
endef
SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB
define SYSTEMD_RM_HWDB_SRV
- rm -rf $(TARGET_DIR)/$(HOST_EUDEV_SYSCONFDIR)/udev/hwdb.d/
+ rm -rf $(TARGET_DIR)/usr/lib/udev/hwdb.d/ $(TARGET_DIR)/etc/udev/hwdb.d/ \
+ $(TARGET_DIR)/usr/lib/systemd/system/systemd-hwdb-update.service \
+ $(TARGET_DIR)/usr/bin/systemd-hwdb
endef
SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_HWDB_SRV
else
@@ -633,7 +635,7 @@ HOST_SYSTEMD_CONF_OPTS = \
-Dsysusers=false \
-Dtmpfiles=false \
-Dimportd=false \
- -Dhwdb=false \
+ -Dhwdb=true \
-Drfkill=false \
-Dman=false \
-Dhtml=false \
udevadm has been deprecated for a while(for bulding the DB), 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. Also remove the config files from both paths (rootfs overlay could add stuff) aswell as the service and tool from the target fs. Signed-off-by: Norbert Lange <nolange79@gmail.com> --- package/systemd/systemd.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)