diff options
3 files changed, 3 insertions, 15 deletions
diff --git a/meta-phosphor/classes/phosphor-ipmi-host-whitelist.bbclass b/meta-phosphor/classes/phosphor-ipmi-host-whitelist.bbclass index a13b0b157..f2b041fe9 100644 --- a/meta-phosphor/classes/phosphor-ipmi-host-whitelist.bbclass +++ b/meta-phosphor/classes/phosphor-ipmi-host-whitelist.bbclass @@ -2,7 +2,7 @@ # packages WHITELIST ?= "${PN}.conf" -INSTALLDIR = "${sysconfdir}/phosphor-ipmi-host/" +INSTALLDIR = "${D}${datadir}/phosphor-ipmi-host/" python phosphor_ipmi_host_whitelist_postinstall() { def install_whitelist(d): @@ -24,4 +24,4 @@ python phosphor_ipmi_host_whitelist_postinstall() { install_whitelist(d) } -do_populate_sysroot[postfuncs] += "phosphor_ipmi_host_whitelist_postinstall" +do_install[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 641aa4d6a..2b400651d 100644 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb +++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb @@ -27,7 +27,7 @@ SRCREV = "51cb8eef48ffc2bbe165cb276a38c391b4185704" # Setup IPMI Whitelist Conf files WHITELIST_CONF = " \ - ${STAGING_ETCDIR_NATIVE}/phosphor-ipmi-host/*.conf \ + ${STAGING_DATADIR_NATIVE}/phosphor-ipmi-host/*.conf \ ${S}/host-ipmid-whitelist.conf \ " EXTRA_OECONF = " \ 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 375e38620..87d17f967 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 @@ -16,15 +16,3 @@ WHITELIST_FORMAT = "{0}-whitelist-native" OBMC_IPMID_WHITELISTS = "${@compose_list(d, 'WHITELIST_FORMAT', 'OBMC_IPMID_PROVIDERS')}" 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')}" |