scottk/meta-tegra
1
0
Fork 0
mirror of https://github.com/lingble/meta-tegra.git synced 2025-10-29 11:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

meta: rework image name usage for IMAGE_NAME_SUFFIX changes

Browse Source 
OE-Core has reworked how the IMAGE_NAME and IMAGE_NAME_SUFFIX
variables are used - the suffix now gets embedded in IMAGE_NAME.
To account for this, adjust the tegra-specific image bbclasses
to drop ${IMAGE_NAME_SUFFIX} references, and adjust the recipes
for the ESP and initrd images to nullify IMAGE_NAME_SUFFIX, since
we don't really want '.rootfs' in the resultant artifact names
in those cases.

Signed-off-by: Matt Madison <matt@madison.systems>
This commit is contained in:
Matt Madison
2023-07-04 07:51:51 -07:00
parent bdd1f53b4d
commit 75960efc44
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/image_types_cboot.bbclass
View File

@@ -32,7 +32,7 @@ oe_cbootimg:tegra() {
make_cboot_image() { make_cboot_image() {
local type="$1" local type="$1"
oe_cbootimg ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} oe_cbootimg ${IMAGE_NAME}.${type}
} }
make_cboot_image[vardepsexclude] += "DATETIME" make_cboot_image[vardepsexclude] += "DATETIME"

2
classes/image_types_tegra.bbclass
View File

@@ -761,7 +761,7 @@ EOF
create_bup_payload_image() { create_bup_payload_image() {
local type="$1" local type="$1"
oe_make_bup_payload ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} oe_make_bup_payload ${IMGDEPLOYDIR}/${IMAGE_NAME}.${type}
for f in ${WORKDIR}/bup-payload/*_only_payload; do for f in ${WORKDIR}/bup-payload/*_only_payload; do
[ -e $f ] || continue [ -e $f ] || continue
sfx=$(basename $f _payload) sfx=$(basename $f _payload)

14
classes/image_types_tegra_esp.bbclass
View File

@@ -9,15 +9,15 @@ oe_mkespfs() {
fi fi
# Create a sparse image block. ESP partition must be 64K blocks. # Create a sparse image block. ESP partition must be 64K blocks.
bbdebug 1 Executing "dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype seek=65536 count=0 bs=1024" bbdebug 1 Executing "dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype seek=65536 count=0 bs=1024"
dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype seek=65536 count=0 bs=1024 dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype seek=65536 count=0 bs=1024
bbdebug 1 "Actual Rootfs size: `du -s ${IMAGE_ROOTFS}`" bbdebug 1 "Actual Rootfs size: `du -s ${IMAGE_ROOTFS}`"
bbdebug 1 "Actual Partition size: `stat -c '%s' ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype`" bbdebug 1 "Actual Partition size: `stat -c '%s' ${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype`"
bbdebug 1 Executing "mkfs.vfat -F 32 -I $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype " bbdebug 1 Executing "mkfs.vfat -F 32 -I $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype "
mkfs.vfat -F 32 -I $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype mkfs.vfat -F 32 -I $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype
mcopy -i ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype -s ${IMAGE_ROOTFS}/* ::/ mcopy -i ${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype -s ${IMAGE_ROOTFS}/* ::/
# Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected) # Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected)
fsck.vfat -pvfV ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype fsck.vfat -pvfV ${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype
} }
do_image_esp[depends] += "dosfstools-native:do_populate_sysroot mtools-native:do_populate_sysroot" do_image_esp[depends] += "dosfstools-native:do_populate_sysroot mtools-native:do_populate_sysroot"
IMAGE_TYPES += "esp" IMAGE_TYPES += "esp"

1
recipes-bsp/uefi/tegra-espimage.bb
View File

@@ -10,6 +10,7 @@ IMAGE_ROOTFS_SIZE = "65536"
IMAGE_ROOTFS_MAXSIZE = "65536" IMAGE_ROOTFS_MAXSIZE = "65536"
IMAGE_ROOTFS_EXTRA_SPACE = "0" IMAGE_ROOTFS_EXTRA_SPACE = "0"
FORCE_RO_REMOVE = "1" FORCE_RO_REMOVE = "1"
IMAGE_NAME_SUFFIX = ""
EFI_PROVIDER ??= "l4t-launcher" EFI_PROVIDER ??= "l4t-launcher"

1
recipes-core/images/tegra-initrd-flash-initramfs.bb
View File

@@ -23,6 +23,7 @@ COMPATIBLE_MACHINE = "(tegra)"
IMAGE_ROOTFS_SIZE = "32768" IMAGE_ROOTFS_SIZE = "32768"
IMAGE_ROOTFS_EXTRA_SPACE = "0" IMAGE_ROOTFS_EXTRA_SPACE = "0"
IMAGE_NAME_SUFFIX = ""
FORCE_RO_REMOVE ?= "1" FORCE_RO_REMOVE ?= "1"

1
recipes-core/images/tegra-minimal-initramfs.bb
View File

@@ -25,6 +25,7 @@ KERNELDEPMODDEPEND = ""
IMAGE_ROOTFS_SIZE = "32768" IMAGE_ROOTFS_SIZE = "32768"
IMAGE_ROOTFS_EXTRA_SPACE = "0" IMAGE_ROOTFS_EXTRA_SPACE = "0"
IMAGE_NAME_SUFFIX = ""
FORCE_RO_REMOVE ?= "1" FORCE_RO_REMOVE ?= "1"