From 536572f862dc443a73768820a19b7fa403190432 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 14 Jul 2025 15:46:57 +0200 Subject: fwupd: set vendor_ids_dir * it's in RSS as fwupd/2.0.12/recipe-sysroot/usr/share/hwdata/usb.ids but meson is searching the paths on host with: # look for usb.ids in both of the Debian and Fedora locations, # and fall back to the system datadir in case we're building in a venv or prefix vendor_ids_dir = get_option('vendor_ids_dir') if vendor_ids_dir == '' vendor_ids_dir = join_paths(datadir, 'misc') if not fs.is_file(join_paths(vendor_ids_dir, 'usb.ids')) vendor_ids_dir = join_paths(datadir, 'hwdata') endif if not fs.is_file(join_paths(vendor_ids_dir, 'usb.ids')) vendor_ids_dir = '/usr/share/hwdata' endif if not fs.is_file(join_paths(vendor_ids_dir, 'usb.ids')) vendor_ids_dir = '/usr/share/misc' endif if not fs.is_file(join_paths(vendor_ids_dir, 'usb.ids')) vendor_ids_dir = '/usr/local/var/homebrew/linked/usb.ids/share/misc' endif if not fs.is_file(join_paths(vendor_ids_dir, 'usb.ids')) error('could not auto-detect -Dvendor_ids_dir=') endif endif conf.set_quoted ('FWUPD_DATADIR_VENDOR_IDS', vendor_ids_dir) it shouldn't be looking at host's paths and and on hosts without usb.ids in one of these locations it fails with: ../sources/fwupd-2.0.12/meson.build:323:4: ERROR: Problem encountered: could not auto-detect -Dvendor_ids_dir= Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb index e25fbe1f54..eb43c3d865 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb @@ -37,6 +37,8 @@ GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' +EXTRA_OEMESON = "-Dvendor_ids_dir=${datadir}/hwdata" + PACKAGECONFIG ??= "\ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ -- cgit v1.2.3-54-g00ecf