Re: [Buildroot] [PATCH v3 3/7] package/systemd: use current tool for generating HWDB

[Arnout Vandecappelle <arnout@mind.be>]

On 22/02/2022 11:22, Norbert Lange wrote:
> udevadm has been deprecated for a while (for building 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
> than the default /etc/udev.

  This is one thing.

> 
> The HWDB source files have drop-in directories, which means
> even if disabled in this package, other packages or users
> could drop in stuff. So always delete those

  And this is something else. So I split the patch in two.

  It also lead us to observe that:

- there's some leftover code in eudev.mk that can be removed;
- we should do the same in eudev (i.e. also delete /usr/lib/udev/hwdb.d) - or 
rather, we should do the same regardless of the device manager used.

  I'm going to send separate patches for those. Especially the second I'm not 
100% sure of, but it seems weird to not delete them if there's no hwdb.


  Regards,
  Arnout


> Signed-off-by: Norbert Lange <nolange79@gmail.com>
> 
> ---
> v1 -> v2
> -   fix removal of service
> v2 -> v3
> -   see https://lists.buildroot.org/pipermail/buildroot/2020-July/286310.html
> -   use systemd-hwdb with --strict option
> -   split removal of service in separate patch
> -   improve commit message
> -   always delete de HWDB source directories
> ---
>   package/systemd/systemd.mk | 13 +++++++------
>   1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> index b07fac27d4..d2c28b5b60 100644
> --- a/package/systemd/systemd.mk
> +++ b/package/systemd/systemd.mk
> @@ -307,13 +307,9 @@ 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
> -	rm -rf $(TARGET_DIR)/$(HOST_EUDEV_SYSCONFDIR)/udev/hwdb.d/
> -endef
> -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_HWDB_SRV
>   else
>   SYSTEMD_CONF_OPTS += -Dhwdb=false
>   endif
> @@ -725,6 +721,11 @@ endef
>   SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_UPDATE_CATALOGS
>   endif
>   
> +define SYSTEMD_RM_HWDB_DATA
> +	rm -rf $(TARGET_DIR)/usr/lib/udev/hwdb.d/ $(TARGET_DIR)/etc/udev/hwdb.d/
> +endef
> +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_HWDB_DATA
> +
>   define SYSTEMD_RM_CATALOG_UPDATE_SERVICE
>   	rm -rf $(TARGET_DIR)/usr/lib/systemd/catalog \
>   		$(TARGET_DIR)/usr/lib/systemd/system/systemd-journal-catalog-update.service \
> @@ -814,7 +815,7 @@ HOST_SYSTEMD_CONF_OPTS = \
>   	-Dsysusers=false \
>   	-Dtmpfiles=true \
>   	-Dimportd=false \
> -	-Dhwdb=false \
> +	-Dhwdb=true \
>   	-Drfkill=false \
>   	-Dman=false \
>   	-Dhtml=false \
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot