diff options
| -rw-r--r-- | meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb index e3e7245aba..4491bda934 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb @@ -4,7 +4,7 @@ d-bus objects to represent various user settings." PR = "r1" PV = "1.0+git${SRCPV}" -inherit autotools pkgconfig +inherit meson pkgconfig inherit obmc-phosphor-dbus-service inherit python3native inherit phosphor-settings-manager @@ -16,7 +16,6 @@ DBUS_SERVICE:${PN} = "xyz.openbmc_project.Settings.service" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "${PYTHON_PN}-sdbus++-native" -DEPENDS += "autoconf-archive-native" DEPENDS += "virtual/phosphor-settings-defaults" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'obmc-mrw', 'phosphor-settings-read-settings-mrw-native', '', d)}" DEPENDS += "sdbusplus" @@ -32,9 +31,9 @@ SRC_URI += "file://merge_settings.py" PACKAGECONFIG[boot_type] = "" SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'boot_type', 'file://boot_type.override.yml', '', d)}" -EXTRA_OECONF = " \ - SETTINGS_YAML=${STAGING_DIR_NATIVE}${settings_datadir}/defaults.yaml \ - " +EXTRA_OEMESON = " \ + -Dsettings_yaml=${STAGING_DIR_NATIVE}${settings_datadir}/defaults.yaml \ + " # Collect files in SRC_URI that end in ".override.yml" or ".remove.yml" and call a script that # writes/removes their contents from that of settings.yaml, which is then updated to |