CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fwupd: set vendor_ids_dir

Browse Source 
* 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>
This commit is contained in:
Martin Jansa 2025-07-14 15:46:57 +02:00 committed by Khem Raj
parent 804abb58c6
commit 536572f862
No known key found for this signature in database
GPG Key ID: BB053355919D3314
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb
View File

@ -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)} \