diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2025-07-14 15:46:57 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-07-15 07:49:27 -0700 |
commit | 536572f862dc443a73768820a19b7fa403190432 (patch) | |
tree | b8c3f348241c71fb494db3c60a0bd9f8c407440b | |
parent | 804abb58c60d23acbbbf0eee735e870d4231f9d1 (diff) | |
download | meta-openembedded-536572f862dc443a73768820a19b7fa403190432.tar.gz |
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 <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb | 2 |
1 files changed, 2 insertions, 0 deletions
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' | |||
37 | GIR_MESON_ENABLE_FLAG = 'enabled' | 37 | GIR_MESON_ENABLE_FLAG = 'enabled' |
38 | GIR_MESON_DISABLE_FLAG = 'disabled' | 38 | GIR_MESON_DISABLE_FLAG = 'disabled' |
39 | 39 | ||
40 | EXTRA_OEMESON = "-Dvendor_ids_dir=${datadir}/hwdata" | ||
41 | |||
40 | PACKAGECONFIG ??= "\ | 42 | PACKAGECONFIG ??= "\ |
41 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 43 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
42 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ | 44 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ |