Re: [ptxdist] [PATCH] systemd/udev: fix hardware database generating

2016-06-14 Thread Michael Olbrich
On Tue, Jun 07, 2016 at 08:13:59PM +0200, Juergen Borleis wrote:
> Without this fix systemd fails at run-time with:
> 
>   systemd-hwdb-update.service - Rebuild Hardware Database
>Loaded: loaded (/lib/systemd/system/systemd-hwdb-update.service; static; 
> vendor preset: enabled)
>Active: failed (Result: exit-code) since Tue 2016-06-07 15:45:38 UTC; 
> 16min ago
> Condition: start condition failed at Tue 2016-06-07 15:45:55 UTC; 16min ago
>ConditionNeedsUpdate=/etc was not met
>  Docs: man:hwdb(7)
>   man:systemd-hwdb(8)
>  Main PID: 413 (code=exited, status=203/EXEC)
> 
> Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Main process 
> exited, code=exited, status=203/EXEC
> Jun 07 15:45:38 qemu systemd[1]: Failed to start Rebuild Hardware Database.
> Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Unit entered 
> failed state.
> Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Failed with 
> result 'exit-code'.
> 
> Signed-off-by: Juergen Borleis 

Thanks, applied.

Michael

> 
> diff --git a/rules/systemd.make b/rules/systemd.make
> index 29ddbd84f793..c5ac60843dde 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -156,7 +156,7 @@ $(STATEDIR)/systemd.install:
>   @$(call targetinfo)
>   @$(call world/install, SYSTEMD)
>  ifdef PTXCONF_UDEV_HWDB
> - @systemd-hwdb update --root $(SYSTEMD_PKGDIR)
> + @systemd-hwdb update --usr --root $(SYSTEMD_PKGDIR)
>  endif
>  ifndef PTXCONF_SYSTEMD_VCONSOLE
>   @rm -v 
> $(SYSTEMD_PKGDIR)/etc/systemd/system/getty.target.wants/getty@tty1.service
> diff --git a/rules/udev.make b/rules/udev.make
> index 2ad990b70e56..c6df5c5b90fb 100644
> --- a/rules/udev.make
> +++ b/rules/udev.make
> @@ -186,7 +186,7 @@ ifdef PTXCONF_UDEV_ETC_CONF
>   @$(call install_alternative, udev, 0, 0, 0644, /etc/udev/udev.conf)
>  endif
>  ifdef PTXCONF_UDEV_HWDB
> - @$(call install_copy, udev, 0, 0, 0644, -, /etc/udev/hwdb.bin)
> + @$(call install_copy, udev, 0, 0, 0644, -, /lib/udev/hwdb.bin)
>  endif
>  
>  ifdef PTXCONF_UDEV_LEGACY
> 
> -- 
> Pengutronix e.K.                              | Juergen Borleis             |
> Industrial Linux Solutions                    | http://www.pengutronix.de/  |
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.   | |
Industrial Linux Solutions | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] systemd/udev: fix hardware database generating

2016-06-07 Thread Ladislav Michl
On Tue, Jun 07, 2016 at 08:13:59PM +0200, Juergen Borleis wrote:
> Without this fix systemd fails at run-time with:
> 
>   systemd-hwdb-update.service - Rebuild Hardware Database
>Loaded: loaded (/lib/systemd/system/systemd-hwdb-update.service; static; 
> vendor preset: enabled)
>Active: failed (Result: exit-code) since Tue 2016-06-07 15:45:38 UTC; 
> 16min ago
> Condition: start condition failed at Tue 2016-06-07 15:45:55 UTC; 16min ago
>ConditionNeedsUpdate=/etc was not met
>  Docs: man:hwdb(7)
>   man:systemd-hwdb(8)
>  Main PID: 413 (code=exited, status=203/EXEC)
> 
> Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Main process 
> exited, code=exited, status=203/EXEC
> Jun 07 15:45:38 qemu systemd[1]: Failed to start Rebuild Hardware Database.
> Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Unit entered 
> failed state.
> Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Failed with 
> result 'exit-code'.
> 
> Signed-off-by: Juergen Borleis 

Indeed, it was annoying, but never that much to look for cause myself... Thank 
you.

Tested-by: Ladislav Michl 

> diff --git a/rules/systemd.make b/rules/systemd.make
> index 29ddbd84f793..c5ac60843dde 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -156,7 +156,7 @@ $(STATEDIR)/systemd.install:
>   @$(call targetinfo)
>   @$(call world/install, SYSTEMD)
>  ifdef PTXCONF_UDEV_HWDB
> - @systemd-hwdb update --root $(SYSTEMD_PKGDIR)
> + @systemd-hwdb update --usr --root $(SYSTEMD_PKGDIR)
>  endif
>  ifndef PTXCONF_SYSTEMD_VCONSOLE
>   @rm -v 
> $(SYSTEMD_PKGDIR)/etc/systemd/system/getty.target.wants/getty@tty1.service
> diff --git a/rules/udev.make b/rules/udev.make
> index 2ad990b70e56..c6df5c5b90fb 100644
> --- a/rules/udev.make
> +++ b/rules/udev.make
> @@ -186,7 +186,7 @@ ifdef PTXCONF_UDEV_ETC_CONF
>   @$(call install_alternative, udev, 0, 0, 0644, /etc/udev/udev.conf)
>  endif
>  ifdef PTXCONF_UDEV_HWDB
> - @$(call install_copy, udev, 0, 0, 0644, -, /etc/udev/hwdb.bin)
> + @$(call install_copy, udev, 0, 0, 0644, -, /lib/udev/hwdb.bin)
>  endif
>  
>  ifdef PTXCONF_UDEV_LEGACY
> 

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] systemd/udev: fix hardware database generating

2016-06-07 Thread Juergen Borleis
Without this fix systemd fails at run-time with:

  systemd-hwdb-update.service - Rebuild Hardware Database
   Loaded: loaded (/lib/systemd/system/systemd-hwdb-update.service; static; 
vendor preset: enabled)
   Active: failed (Result: exit-code) since Tue 2016-06-07 15:45:38 UTC; 16min 
ago
Condition: start condition failed at Tue 2016-06-07 15:45:55 UTC; 16min ago
   ConditionNeedsUpdate=/etc was not met
 Docs: man:hwdb(7)
  man:systemd-hwdb(8)
 Main PID: 413 (code=exited, status=203/EXEC)

Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Main process 
exited, code=exited, status=203/EXEC
Jun 07 15:45:38 qemu systemd[1]: Failed to start Rebuild Hardware Database.
Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Unit entered 
failed state.
Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Failed with 
result 'exit-code'.

Signed-off-by: Juergen Borleis 

diff --git a/rules/systemd.make b/rules/systemd.make
index 29ddbd84f793..c5ac60843dde 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -156,7 +156,7 @@ $(STATEDIR)/systemd.install:
@$(call targetinfo)
@$(call world/install, SYSTEMD)
 ifdef PTXCONF_UDEV_HWDB
-   @systemd-hwdb update --root $(SYSTEMD_PKGDIR)
+   @systemd-hwdb update --usr --root $(SYSTEMD_PKGDIR)
 endif
 ifndef PTXCONF_SYSTEMD_VCONSOLE
@rm -v 
$(SYSTEMD_PKGDIR)/etc/systemd/system/getty.target.wants/getty@tty1.service
diff --git a/rules/udev.make b/rules/udev.make
index 2ad990b70e56..c6df5c5b90fb 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -186,7 +186,7 @@ ifdef PTXCONF_UDEV_ETC_CONF
@$(call install_alternative, udev, 0, 0, 0644, /etc/udev/udev.conf)
 endif
 ifdef PTXCONF_UDEV_HWDB
-   @$(call install_copy, udev, 0, 0, 0644, -, /etc/udev/hwdb.bin)
+   @$(call install_copy, udev, 0, 0, 0644, -, /lib/udev/hwdb.bin)
 endif
 
 ifdef PTXCONF_UDEV_LEGACY

-- 
Pengutronix e.K.                              | Juergen Borleis             |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |

___
ptxdist mailing list
ptxdist@pengutronix.de