diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2019-07-30 19:31:50 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-23 15:52:32 +0300 |
| commit | e67e9dba7a42bb87ab06f4bb8245ebb2c3cb705e (patch) | |
| tree | 250118f9af8bdbff9cba06db2ad62fb3e6d91eaa | |
| parent | 661cf398d55957e6edc8f0cdd32770ac5c86b93f (diff) | |
| download | openbmc-e67e9dba7a42bb87ab06f4bb8245ebb2c3cb705e.tar.xz | |
image_types_phosphor: Remove mtd from make_tar_of_images()
The make_tar_of_images() function was adding an mtd suffix to the
tarball name. Make the caller pass the suffix instead so that this
function can be used to create tarballs intended for non-mtd systems
such as systems based on a mmc chip.
(From meta-phosphor rev: 7bdbb7a6adaa655ba56ae2e289a59e13c9428b14)
Change-Id: I80ee15337f99ec59cce119668ef7f5afb2313189
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
| -rw-r--r-- | meta-phosphor/classes/image_types_phosphor.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index d5ace1610..3d919df0f 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -314,11 +314,11 @@ make_tar_of_images() { extra_files="$@" # Create the tar archive - tar -h -cvf ${IMGDEPLOYDIR}/${IMAGE_NAME}.$type.mtd.tar \ + tar -h -cvf ${IMGDEPLOYDIR}/${IMAGE_NAME}.$type.tar \ image-u-boot image-kernel image-rofs image-rwfs $extra_files cd ${IMGDEPLOYDIR} - ln -sf ${IMAGE_NAME}.$type.mtd.tar ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type.mtd.tar + ln -sf ${IMAGE_NAME}.$type.tar ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$type.tar } do_generate_static_tar() { @@ -326,7 +326,7 @@ do_generate_static_tar() { ln -sf ${S}/publickey publickey make_image_links ${OVERLAY_BASETYPE} ${IMAGE_BASETYPE} make_signatures image-u-boot image-kernel image-rofs image-rwfs MANIFEST publickey - make_tar_of_images static MANIFEST publickey ${signature_files} + make_tar_of_images static.mtd MANIFEST publickey ${signature_files} # Maintain non-standard legacy link. cd ${IMGDEPLOYDIR} @@ -348,7 +348,7 @@ do_generate_ubi_tar() { ln -sf ${S}/publickey publickey make_image_links ${FLASH_UBI_OVERLAY_BASETYPE} ${FLASH_UBI_BASETYPE} make_signatures image-u-boot image-kernel image-rofs image-rwfs MANIFEST publickey - make_tar_of_images ubi MANIFEST publickey ${signature_files} + make_tar_of_images ubi.mtd MANIFEST publickey ${signature_files} } do_generate_ubi_tar[dirs] = " ${S}/ubi" do_generate_ubi_tar[depends] += " \ |