From b3f2bb8d832e4dc7873eaeef23be2fd38409d6f9 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Wed, 6 May 2020 13:14:28 -0500 Subject: phosphor-software-manager: Move to meson (From meta-phosphor rev: 2badcf923f4666c9c83842d0c0bc08132c6ef1c5) Change-Id: I124b014509e2370f65c24a1c3b3672932f156717 Signed-off-by: Adriana Kobylak Signed-off-by: Andrew Geissler --- .../classes/phosphor-software-manager-ubi-fs.bbclass | 12 ++---------- .../flash/phosphor-software-manager_git.bb | 15 +++++---------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index cc1ad3738..6ca1fb162 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -6,17 +6,9 @@ RDEPENDS_phosphor-software-manager-updater-ubi += " \ mtd-utils-ubifs \ " -# Remove default configs -EXTRA_OECONF_remove_df-obmc-ubi-fs += " \ - ACTIVE_BMC_MAX_ALLOWED=1 \ - MEDIA_DIR=/run/media \ -" - # Add ubi-fs configs -EXTRA_OECONF_append_df-obmc-ubi-fs += " \ - ACTIVE_BMC_MAX_ALLOWED=2 \ - MEDIA_DIR=/media \ -" +EXTRA_OEMESON += "-Dactive-bmc-max-allowed=2" +EXTRA_OEMESON += "-Dmedia-dir='/media'" SYSTEMD_SERVICE_phosphor-software-manager-updater-ubi += " \ obmc-flash-bmc-ubirw.service \ diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index d83945ea4..e0314c050 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -23,18 +23,17 @@ DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}" # handles the rest. SYSTEMD_PACKAGES = "" -PACKAGECONFIG[verify_signature] = "--enable-verify_signature,--disable-verify_signature" -PACKAGECONFIG[sync_bmc_files] = "--enable-sync_bmc_files,--disable-sync_bmc_files" -PACKAGECONFIG[ubifs_layout] = "--enable-ubifs_layout" -PACKAGECONFIG[flash_bios] = "--enable-host_bios_upgrade" +PACKAGECONFIG[verify_signature] = "-Dverify-signature=enabled, -Dverify-signature=disabled" +PACKAGECONFIG[sync_bmc_files] = "-Dsync-bmc-files=enabled, -Dsync-bmc-files=disabled" +PACKAGECONFIG[ubifs_layout] = "-Dbmc-layout=ubi" +PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled" -inherit autotools pkgconfig +inherit meson pkgconfig inherit obmc-phosphor-dbus-service inherit python3native inherit ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'phosphor-software-manager-ubi-fs', '', d)} DEPENDS += " \ - autoconf-archive-native \ openssl \ phosphor-dbus-interfaces \ phosphor-logging \ @@ -46,10 +45,6 @@ RDEPENDS_${PN}-updater += " \ bash \ virtual-obmc-image-manager \ " -EXTRA_OECONF += " \ - ACTIVE_BMC_MAX_ALLOWED=1 \ - MEDIA_DIR=/run/media \ -" RPROVIDES_${PN}-version += " \ virtual-obmc-image-manager \ -- cgit v1.2.3