meta: go back to hyphenated suffix name for BUP payloads

for consistency with the earlier naming we used.

Signed-off-by: Matt Madison <matt@madison.systems>
This commit is contained in:
Matt Madison
2023-06-26 09:42:45 -07:00
parent b2074dc365
commit 80ba0cd590
4 changed files with 8 additions and 8 deletions

View File

@@ -765,8 +765,8 @@ create_bup_payload_image() {
for f in ${WORKDIR}/bup-payload/*_only_payload; do
[ -e $f ] || continue
sfx=$(basename $f _payload)
install -m 0644 $f ${IMGDEPLOYDIR}/${IMAGE_NAME}.$sfx.bup_payload
ln -sf ${IMAGE_NAME}.$sfx.bup_payload ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$sfx.bup_payload
install -m 0644 $f ${IMGDEPLOYDIR}/${IMAGE_NAME}.$sfx.bup-payload
ln -sf ${IMAGE_NAME}.$sfx.bup-payload ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$sfx.bup-payload
done
}
create_bup_payload_image[vardepsexclude] += "DATETIME"

View File

@@ -64,7 +64,7 @@ IMAGE_FSTYPES += "tegraflash"
INITRAMFS_IMAGE ?= "tegra-minimal-initramfs"
INITRAMFS_IMAGE_BUNDLE ?= "0"
TEGRA_INITRAMFS_FSTYPES ?= "${@'' if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' else ' cpio.gz.cboot cpio.gz.cboot.bup_payload'}"
TEGRA_INITRAMFS_FSTYPES ?= "${@'' if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' else ' cpio.gz.cboot cpio.gz.cboot.bup-payload'}"
INITRAMFS_FSTYPES:append = "${TEGRA_INITRAMFS_FSTYPES}"
TEGRA_INITRD_FLASH_INITRAMFS_FSTYPES ?= "${@'' if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' else ' cpio.gz.cboot'}"
TEGRAFLASH_INITRD_FLASH_IMAGE ?= "tegra-initrd-flash-initramfs"

View File

@@ -20,11 +20,11 @@ BUPFILENAME = "${@bupfile_basename(d)}"
do_install() {
install -d ${D}/opt/ota_package/
if [ -e ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.bl_only.bup_payload ]; then
install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.bl_only.bup_payload ${D}/opt/ota_package/bl_only_payload
if [ -e ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.bl_only.bup-payload ]; then
install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.bl_only.bup-payload ${D}/opt/ota_package/bl_only_payload
fi
if [ -e ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.kernel_only.bup_payload ]; then
install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.kernel_only.bup_payload ${D}/opt/ota_package/kernel_only_payload
if [ -e ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.kernel_only.bup-payload ]; then
install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.kernel_only.bup-payload ${D}/opt/ota_package/kernel_only_payload
fi
}

View File

@@ -27,7 +27,7 @@ do_deploy() {
for f in ${WORKDIR}/bup-payload/*_only_payload; do
[ -e $f ] || continue
sfx=$(basename $f _payload)
install -m 0644 $f ${DEPLOYDIR}/${initramfs_symlink_name}.$sfx.bup_payload
install -m 0644 $f ${DEPLOYDIR}/${initramfs_symlink_name}.$sfx.bup-payload
done
done
fi