commit 563b6de10292988358a7b8f54766fef13697375b
author George Liu <liuxiwei@inspur.com> Mon May 23 10:36:40 2022 +0800
committer George Liu <liuxiwei@inspur.com> Tue Jun 14 13:35:11 2022 +0800
tree 3435dc121b4cfd70a36bcad3d347ff628cd315fc
parent 5acac4eb09e343576a5400845a7fd9fa0c3ab529

phosphor-inventory-manager: switch to meson build

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I1042902f6eafbf8094de2fe8a922ba8ac29ef21e

meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb

diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb
index 16790a3..ee839cc 100644
--- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb
@@ -5,7 +5,7 @@
 PR = "r1"
 PV = "1.0+git${SRCPV}"
 
-inherit autotools \
+inherit meson \
         pkgconfig \
         python3native \
         phosphor-dbus-yaml \
@@ -20,11 +20,11 @@
         phosphor-logging \
         sdbusplus \
         ${PYTHON_PN}-sdbus++-native \
-        autoconf-archive-native \
         libcereal \
         ${PYTHON_PN}-native \
         ${PYTHON_PN}-pyyaml-native \
         ${PYTHON_PN}-mako-native \
+        nlohmann-json \
         "
 
 OBMC_INVENTORY_PATH="${OBMC_DBUS_PATH_ROOT}/inventory"
@@ -34,13 +34,11 @@
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF = " \
-        YAML_PATH=${STAGING_DIR_HOST}${base_datadir} \
-        BUSNAME=${OBMC_INVENTORY_MGR_IFACE} \
-        INVENTORY_ROOT=${OBMC_INVENTORY_PATH} \
-        IFACE=${OBMC_INVENTORY_MGR_IFACE} \
-        IFACES_PATH=${STAGING_DIR_TARGET}${yaml_dir} \
+EXTRA_OEMESON = " \
+        -Dtests=disabled \
+        -DYAML_PATH=${STAGING_DIR_HOST}${base_datadir} \
+        -DIFACES_PATH=${STAGING_DIR_TARGET}${yaml_dir} \
         "
 
 PACKAGECONFIG ??= ""
-PACKAGECONFIG[associations] = "--enable-associations, --disable-associations,nlohmann-json,"
+PACKAGECONFIG[associations] = "-Dassociations=enabled, -Dassociations=disabled"