diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-02-03 09:26:33 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-02-15 13:41:15 +0200 |
| commit | 4b6cb75604acc3502bc80c8d49006949a885553c (patch) | |
| tree | 007761b468bdacf87e1d78f3afb693c98bfc0a5a | |
| parent | 481b4745be0c8d475409226487eb062f8480f9dd (diff) | |
meta-tegra: update layer
Switch from kirkstone to kirkstone-l4t-r32.7.x
branch to keep using R32.7.x (main kirkstone branch
moved to R35.x) and update to latest revision.
image_types_tegra_b2qt.bbclass updated to match
updated meta-tegra layer functuonality.
Updates:
L4T R32.7.2 -> R32.7.3
Jetpack 4.6.2 -> 4.6.3
Pick-to: 6.2
Change-Id: I98a2eba18d0af8b689bb7e339b755cab705c977b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | meta-boot2qt/classes/image_types_tegra_b2qt.bbclass | 10 | ||||
| -rw-r--r-- | scripts/manifest.xml | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass b/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass index 5a451cbb..a4c03d11 100644 --- a/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass +++ b/meta-boot2qt/classes/image_types_tegra_b2qt.bbclass @@ -31,22 +31,22 @@ tegraflash_custom_post:tegra186() { cat > prepare-image.sh <<END #!/bin/sh -e -if [ ! -e "${IMAGE_BASENAME}.img" ]; then +if [ ! -e "${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE}" ]; then xz -dc ../${IMAGE_LINK_NAME}.wic.xz | dd of=${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} iflag=fullblock skip=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) count=$(expr ${ROOTFS_SIZE} / 1024) - ./mksparse -v --fillpattern=0 ${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} ${IMAGE_BASENAME}.img + ./mksparse -v --fillpattern=0 ${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} ${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE} rm -f ${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} fi echo "Flash image ready" END chmod +x prepare-image.sh - rm ${IMAGE_BASENAME}.img + rm ${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE} } tegraflash_custom_post() { cat > prepare-image.sh <<END #!/bin/sh -e -if [ ! -e "${IMAGE_BASENAME}.img" ]; then - xz -dc ../${IMAGE_LINK_NAME}.wic.xz | dd of=${IMAGE_LINK_NAME}.${IMAGE_TEGRAFLASH_FS_TYPE} iflag=fullblock skip=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) count=$(expr ${ROOTFS_SIZE} / 1024) +if [ ! -e "${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE}" ]; then + xz -dc ../${IMAGE_LINK_NAME}.wic.xz | dd of=${IMAGE_BASENAME}.${IMAGE_TEGRAFLASH_FS_TYPE} iflag=fullblock skip=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) count=$(expr ${ROOTFS_SIZE} / 1024) fi echo "Flash image ready" END diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 95430b92..b33b2ea7 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -70,8 +70,8 @@ fetch="https://github.com/OE4T"/> <project name="meta-tegra" remote="OE4T" - revision="d60193750012074a5726e879eeca117dc26e6951" - upstream="kirkstone" + revision="583f839ccf2c7b8e90dbf74975399c92551747b2" + upstream="kirkstone-l4t-r32.7.x" path="sources/meta-tegra"/> <!-- Toradex --> |