systemd: fix missing path separator in firmware-path

From: Andy Kling <[email protected]>

udev fails to load firmware for CONFIG_FW_LOADER_USER_HELPER systemd-udevd[158]: did not find firmware file 'xxx'

function builtin_firmware currently assumes FIRMWARE_PATH ends with "/" fixing the path passed to meson allows the firmware loader to succeed. systemd-udevd[145]: writing '/lib/firmware/xxx'

Signed-off-by Andy Kling <[email protected]>

---
  meta/recipes-core/systemd/systemd_237.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-core/systemd/systemd_237.bb +1 -1

index 3efca33e73..8ff049160b 100644
@@ -185,7 +185,7 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \
                    -Drootlibdir=${rootlibdir} \
                    -Drootprefix=${rootprefix} \
                    -Dsysvrcnd-path=${sysconfdir} \
-                  -Dfirmware-path=${nonarch_base_libdir}/firmware \
+                  -Dfirmware-path=${nonarch_base_libdir}/firmware/ \
                    "
 
  # Hardcode target binary paths to avoid using paths from sysroot

Hi Andreas,

I'm OK with this patch.

I'm interested in your environment. Could you please give me some more details about why you need this userspace firmware loading mechanism?

I'm upgrading systemd to 239, and I'm going to remove this option in 239. The reason is that systemd's minimal kernel requirement is 3.13, and userspace firmware loading is needed before kernel 3.7. I just checked 237, its minimal requirement is also 3.13.

The userspace firmware loading support has been removed from udev for several years. It's said that using userspace firmware loading is slow, and kernel has been able to do this for a long time.

So could you please give me some details about your environment? Is there some compelling reason to use userspace firmware loading mechanism? This would help me to check if we should keep local patches with more details updated in them.

Best Regards,
Chen Qi

Quoted 26 lines · On 07/07/2018 08:28 PM, [email protected] wrote:

From: Andy Kling <[email protected]>

udev fails to load firmware for CONFIG_FW_LOADER_USER_HELPER systemd-udevd[158]: did not find firmware file 'xxx'

function builtin_firmware currently assumes FIRMWARE_PATH ends with "/" fixing the path passed to meson allows the firmware loader to succeed. systemd-udevd[145]: writing '/lib/firmware/xxx'

Signed-off-by Andy Kling <[email protected]>

---
  meta/recipes-core/systemd/systemd_237.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-core/systemd/systemd_237.bb +1 -1

index 3efca33e73..8ff049160b 100644
@@ -185,7 +185,7 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \
                    -Drootlibdir=${rootlibdir} \
                    -Drootprefix=${rootprefix} \
                    -Dsysvrcnd-path=${sysconfdir} \
-                  -Dfirmware-path=${nonarch_base_libdir}/firmware \
+                  -Dfirmware-path=${nonarch_base_libdir}/firmware/ \
                    "
 

meta/recipes-core/systemd/systemd_237.bb EXTRA_OEMESON += "-Dnobody-user=nobody \ · line 191

Quoted 1 line

meta/recipes-core/systemd/systemd_237.bb +0 -0

  # Hardcode target binary paths to avoid using paths from sysroot