[ptxdist] [PATCH] systemd: fix selecting SYSTEMD_HWDB from another package

[ptxdist] [PATCH] systemd: fix selecting SYSTEMD_HWDB from another package

[Roland Hieber]

Fixes: 6952664b3ac25004d6b2 (2021-03-05, "systemd-hwdb: create the hwdb in a separate package")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/systemd.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/systemd.in b/rules/systemd.in
index 854c344d5441..1342205a27ae 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -32,6 +32,7 @@ menuconfig SYSTEMD
 	select ROOTFS_VAR_LIB	if RUNTIME
 	select ROOTFS_VAR_CACHE	if RUNTIME
 	select ROOTFS_VAR_SPOOL if RUNTIME
+	select SYSTEMD_HWDB	if SYSTEMD_UDEV_HWDB
 	prompt "systemd                       "
 	help
 	  systemd is a system and session manager for Linux, compatible with SysV
@@ -164,7 +165,6 @@ config SYSTEMD_UDEV_DRIVERS_RULES
 
 config SYSTEMD_UDEV_HWDB
 	bool
-	select SYSTEMD_HWDB
 	prompt "install hardware database"
 
 config SYSTEMD_UDEV_CUST_RULES
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH] systemd: fix selecting SYSTEMD_HWDB from another package

[Michael Olbrich]

On Wed, May 26, 2021 at 02:15:30PM +0200, Roland Hieber wrote:
> Fixes: 6952664b3ac25004d6b2 (2021-03-05, "systemd-hwdb: create the hwdb in a separate package")

No, this is wrong and creates a circular dependency. systemd-hwdb must be
built _after_ systemd. And there is a manual dependency for that in
systemd.make.

Michael

> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  rules/systemd.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/systemd.in b/rules/systemd.in
> index 854c344d5441..1342205a27ae 100644
> --- a/rules/systemd.in
> +++ b/rules/systemd.in
> @@ -32,6 +32,7 @@ menuconfig SYSTEMD
>  	select ROOTFS_VAR_LIB	if RUNTIME
>  	select ROOTFS_VAR_CACHE	if RUNTIME
>  	select ROOTFS_VAR_SPOOL if RUNTIME
> +	select SYSTEMD_HWDB	if SYSTEMD_UDEV_HWDB
>  	prompt "systemd                       "
>  	help
>  	  systemd is a system and session manager for Linux, compatible with SysV
> @@ -164,7 +165,6 @@ config SYSTEMD_UDEV_DRIVERS_RULES
>  
>  config SYSTEMD_UDEV_HWDB
>  	bool
> -	select SYSTEMD_HWDB
>  	prompt "install hardware database"
>  
>  config SYSTEMD_UDEV_CUST_RULES
> -- 
> 2.29.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de