openpower-software: use meson build system
Because meson is the de-facto build system for OpenBMC.
Fix a typo that results in mtd-utils-ubifs being added as an extra
build time dependency rather than a runtime dependency.
(From meta-openpower rev: 6122e25bb867d10bd2e7e92ddb36bed5b691b548)
Change-Id: I0d1bfc0912484fd86eb6523dcc0bebd18417fe65
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb
index 1116f34..a761547 100644
--- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb
+++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb
@@ -8,7 +8,7 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-inherit autotools pkgconfig systemd
+inherit meson pkgconfig systemd
inherit obmc-phosphor-dbus-service
# Static configuration. This is the default if no other layout is specified.
@@ -31,17 +31,16 @@
'openpower-software-manager-virtual-pnor', \
'', d)}
-PACKAGECONFIG[verify_pnor_signature] = "--enable-verify_pnor_signature,--disable-verify_pnor_signature"
-PACKAGECONFIG[ubifs_layout] = "--enable-ubifs_layout,--disable-ubifs_layout,,mtd-utils-ubifs"
-PACKAGECONFIG[mmc_layout] = "--enable-mmc_layout,--disable-mmc_layout"
-PACKAGECONFIG[virtual_pnor] = "--enable-virtual_pnor,--disable-virtual_pnor"
+PACKAGECONFIG[verify_pnor_signature] = "-Dverify-signature=enabled, -Dverify-signature=disabled"
+PACKAGECONFIG[ubifs_layout] = "-Ddevice-type=ubi,,,mtd-utils-ubifs"
+PACKAGECONFIG[mmc_layout] = "-Ddevice-type=mmc"
+PACKAGECONFIG[virtual_pnor] = "-Dvpnor=enabled, -Dvpnor=disabled"
-EXTRA_OECONF += " \
- PNOR_MSL="v2.0.10 v2.2" \
+EXTRA_OEMESON += " \
+ -Dmsl="v2.0.10 v2.2" \
"
DEPENDS += " \
- autoconf-archive-native \
openssl \
phosphor-dbus-interfaces \
phosphor-logging \