diff options
| author | Tom Joseph <tomjoseph@in.ibm.com> | 2017-02-24 01:06:54 -0600 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-02-24 16:50:45 +0000 |
| commit | ae46d563088822a0100cae5f5d9a6192afc1d5c8 (patch) | |
| tree | 527ec8faab64c2a7294798b67f196fdebfb3f9d6 | |
| parent | 69f645f20f5e7cd55f8e621570a596f6c7b5a340 (diff) | |
| download | talos-openbmc-ae46d563088822a0100cae5f5d9a6192afc1d5c8.tar.gz talos-openbmc-ae46d563088822a0100cae5f5d9a6192afc1d5c8.zip | |
phosphor-ipmi-host.bb: bump version
Fix dependency between whitelists and ipmi-host by adding an
explicit recipe-task dependency.
Resolves openbmc/openbmc#1197.
Change-Id: Ic33fa3e9b3519935500c718f203b989b6c423684
Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
3 files changed, 15 insertions, 3 deletions
diff --git a/meta-phosphor/classes/phosphor-ipmi-host-whitelist.bbclass b/meta-phosphor/classes/phosphor-ipmi-host-whitelist.bbclass index 7db71d5c3..a13b0b157 100644 --- a/meta-phosphor/classes/phosphor-ipmi-host-whitelist.bbclass +++ b/meta-phosphor/classes/phosphor-ipmi-host-whitelist.bbclass @@ -24,4 +24,4 @@ python phosphor_ipmi_host_whitelist_postinstall() { install_whitelist(d) } -do_install[postfuncs] += "phosphor_ipmi_host_whitelist_postinstall"
\ No newline at end of file +do_populate_sysroot[postfuncs] += "phosphor_ipmi_host_whitelist_postinstall" diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb index 285df5e8d..641aa4d6a 100644 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb +++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb @@ -23,7 +23,7 @@ RDEPENDS_${PN} += "phosphor-time-manager" RRECOMMENDS_${PN} += "virtual-obmc-settings-mgmt" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "513d68e11cf6d392e847d39c743ce54ccaa0ebf7" +SRCREV = "51cb8eef48ffc2bbe165cb276a38c391b4185704" # Setup IPMI Whitelist Conf files WHITELIST_CONF = " \ diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb index 476ad5037..375e38620 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb @@ -15,4 +15,16 @@ RDEPENDS_${PN}-libs = "${OBMC_IPMID_PROVIDERS}" WHITELIST_FORMAT = "{0}-whitelist-native" OBMC_IPMID_WHITELISTS = "${@compose_list(d, 'WHITELIST_FORMAT', 'OBMC_IPMID_PROVIDERS')}" -DEPENDS_append = "${OBMC_IPMID_WHITELISTS}"
\ No newline at end of file +DEPENDS_append = "${OBMC_IPMID_WHITELISTS}" + +# Normally the dependency is between do_configure and +# DEPENDS:do_populate_sysroot, but when a package is in the SSTATE cache the +# do_configure step is not re-ran. The do_populate_sysroot tasks can themselves +# be performed in parallel by bitbake. +# Since the do_populate_sysroot task of this recipe doesn't provide the +# whitelists itself, we need an explicit dependency on the whitelist's +# do_populate_sysroot task so that the whitelists are present in time for an +# application that needs them to be do_configured. + +WHITELIST_TASK_FORMAT = "{0}:do_populate_sysroot" +do_populate_sysroot[depends] = "${@compose_list(d, 'WHITELIST_TASK_FORMAT', 'OBMC_IPMID_WHITELISTS')}" |
