Sync to internal 8-19-2019

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/obmc-intel-pfr-image-native.bb b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/obmc-intel-pfr-image-native.bb
index ee2cc3934..307fe1829 100644
--- a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/obmc-intel-pfr-image-native.bb
+++ b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/obmc-intel-pfr-image-native.bb
@@ -9,11 +9,11 @@ inherit native
 

 PFR_KEY_NAME ?= "pfr-dev-key"

 PFR_SIGN_UTIL ?= "blocksign"

+DEPENDS += " intel-blocksign-native"

 

 SRC_URI = " \

-           file://pfr_image-manifest.json \

+           file://pfr_manifest.json \

            file://pfr_image.py \

-           file://blocksign \

            file://pfm_config.xml \

            file://bmc_config.xml \

            file://csk_prv.pem \

@@ -26,13 +26,12 @@ do_install() {
         bbplain "Copying the intel pfr image generation scripts and image signing keys"

 

         install -d ${STAGING_DIR}/intel-pfr-files

-        install -m 400 ${WORKDIR}/pfr_image-manifest.json ${STAGING_DIR}/intel-pfr-files

-        install -m 775 ${WORKDIR}/blocksign ${STAGING_DIR}/intel-pfr-files

+        install -m 400 ${WORKDIR}/pfr_manifest.json ${STAGING_DIR}/intel-pfr-files

         install -m 400 ${WORKDIR}/pfm_config.xml ${STAGING_DIR}/intel-pfr-files

         install -m 400 ${WORKDIR}/bmc_config.xml  ${STAGING_DIR}/intel-pfr-files

         install -m 775 ${WORKDIR}/pfr_image.py ${STAGING_DIR}/intel-pfr-files

-        install -m 400 ${WORKDIR}/csk_prv.pem ${STAGING_DIR}/intel-pfr-files/

-        install -m 400 ${WORKDIR}/csk_pub.pem ${STAGING_DIR}/intel-pfr-files/

-        install -m 400 ${WORKDIR}/rk_pub.pem ${STAGING_DIR}/intel-pfr-files/

-        install -m 400 ${WORKDIR}/rk_prv.pem ${STAGING_DIR}/intel-pfr-files/

+        install -m 400 ${WORKDIR}/csk_prv.pem ${STAGING_DIR}/intel-pfr-files

+        install -m 400 ${WORKDIR}/csk_pub.pem ${STAGING_DIR}/intel-pfr-files

+        install -m 400 ${WORKDIR}/rk_pub.pem ${STAGING_DIR}/intel-pfr-files

+        install -m 400 ${WORKDIR}/rk_prv.pem ${STAGING_DIR}/intel-pfr-files

 }