diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-01-27 22:27:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-01-27 22:27:17 +0300 |
commit | 98cc5cd6483975b64d80e8323f7f659dd1337d75 (patch) | |
tree | 5fa64e93d57396bc4c76aa3537156205b4b424ac /meta-openpower | |
parent | 82dbc15a05125a812c140a3c8cff81c366482229 (diff) | |
parent | 8fc454f9beebdd347403145c991697019a593cff (diff) | |
download | openbmc-98cc5cd6483975b64d80e8323f7f659dd1337d75.tar.xz |
Merge tag '0.29' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openpower')
5 files changed, 13 insertions, 13 deletions
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 1116f34f4..13cef9508 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 @@ PV = "1.0+git${SRCPV}" 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,17 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-virtual-pnor', \ '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 \ + cli11 \ openssl \ phosphor-dbus-interfaces \ phosphor-logging \ @@ -56,7 +56,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "7c053c3f496c73b73e7677713f3e22fb1d3e56ab" +SRCREV = "847f54c033075af5fb4aa34864d2c07585073794" DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 1c21bad90..1fc98410d 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit autotools obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "5e5d44516abb293483a6fb80175c8858a4b1aa90" +SRCREV = "31228b9b4bc4310c97846bb35730fa96c060d47b" DEPENDS += " \ autoconf-archive-native \ diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index d311093a3..319657aff 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "fb1905453908a6cfe0136bcf39b818e7e8ece225" +SRCREV = "021dab3c73eab84d621500d8388392f85f73e4f3" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb index dac844e1c..8d15cd520 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/openpower-libhei" PV = "0.1+git${SRCPV}" -SRCREV = "ba5dc16120f605ac570666dfed546bb261476bb1" +SRCREV = "d280cca793349d2cd06efbbef5db65c9bae34b98" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 5f3152532..640107b60 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "0246a4d7d00daeebc03c96ef479df5e8441ae581" +SRCREV = "8589375ff66d10295d609cca53cdf2f9f12a5472" |