diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-11-02 20:36:04 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-11-13 02:10:59 +0300 |
| commit | 209ed52b727ba1d039cecaf0c66e1b79822b70cc (patch) | |
| tree | fe2466030adc7a2c83a6946bf9156b2c8166286e /meta-phosphor/classes/image_types_phosphor.bbclass | |
| parent | 32f530459a5ef400e021965ac17c1aa04fc1fb56 (diff) | |
| download | openbmc-209ed52b727ba1d039cecaf0c66e1b79822b70cc.tar.xz | |
image-types-phosphor: depend on images
A number of tasks that depend on deployed images erroneously depend on
do_populate_sysroot instead of do_deploy.
This can have a range of side-effects such as failed image tasks because
of missing or stale sub-images in DEPLOY_DIR_IMAGE.
(From meta-phosphor rev: 1595ecbe6726f66bd40fcdde02f946a784bf7376)
Change-Id: I1d20c1a65f10ed38517b5ba5e87946c64b574eaa
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-phosphor/classes/image_types_phosphor.bbclass')
| -rw-r--r-- | meta-phosphor/classes/image_types_phosphor.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 913aae4fb..39801204b 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -181,7 +181,7 @@ do_generate_ubi[dirs] = "${S}/ubi" do_generate_ubi[depends] += " \ ${PN}:do_image_${@d.getVar('FLASH_UBI_BASETYPE', True).replace('-', '_')} \ virtual/kernel:do_deploy \ - u-boot:do_populate_sysroot \ + u-boot:do_deploy \ mtd-utils-native:do_populate_sysroot \ " @@ -216,7 +216,7 @@ do_make_ubi[dirs] = "${S}/ubi" do_make_ubi[depends] += " \ ${PN}:do_image_${@d.getVar('FLASH_UBI_BASETYPE', True).replace('-', '_')} \ virtual/kernel:do_deploy \ - u-boot:do_populate_sysroot \ + u-boot:do_deploy \ mtd-utils-native:do_populate_sysroot \ " @@ -316,7 +316,7 @@ do_generate_static[dirs] = "${S}/static" do_generate_static[depends] += " \ ${PN}:do_image_${@d.getVar('IMAGE_BASETYPE', True).replace('-', '_')} \ virtual/kernel:do_deploy \ - u-boot:do_populate_sysroot \ + u-boot:do_deploy \ " make_signatures() { @@ -397,7 +397,7 @@ do_generate_static_tar[dirs] = " ${S}/static" do_generate_static_tar[depends] += " \ ${PN}:do_image_${@d.getVar('IMAGE_BASETYPE', True).replace('-', '_')} \ virtual/kernel:do_deploy \ - u-boot:do_populate_sysroot \ + u-boot:do_deploy \ openssl-native:do_populate_sysroot \ ${SIGNING_KEY_DEPENDS} \ ${PN}:do_copy_signing_pubkey \ @@ -415,7 +415,7 @@ do_generate_ubi_tar[dirs] = " ${S}/ubi" do_generate_ubi_tar[depends] += " \ ${PN}:do_image_${@d.getVar('FLASH_UBI_BASETYPE', True).replace('-', '_')} \ virtual/kernel:do_deploy \ - u-boot:do_populate_sysroot \ + u-boot:do_deploy \ openssl-native:do_populate_sysroot \ ${SIGNING_KEY_DEPENDS} \ ${PN}:do_copy_signing_pubkey \ @@ -459,11 +459,11 @@ do_generate_ext4_tar[depends] += " \ zstd-native:do_populate_sysroot \ ${PN}:do_image_${FLASH_EXT4_BASETYPE} \ virtual/kernel:do_deploy \ - u-boot:do_populate_sysroot \ + u-boot:do_deploy \ openssl-native:do_populate_sysroot \ ${SIGNING_KEY_DEPENDS} \ ${PN}:do_copy_signing_pubkey \ - phosphor-hostfw-image:do_populate_sysroot \ + phosphor-hostfw-image:do_deploy \ " def get_pubkey_basedir(d): |