Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

machine: remove 'sdcard.gz' image from default IMAGE_FSTYPES 

The generation of the sdcard image takes time and resources, and
it's not involved in the Get Started.
This can be easily re-enabled by appending the variable in the
project local.conf.

Append the variable in the build scripts, to facilitate its usage
on release builds.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2025-06-13 10:44:30 +02:00
parent fc641ce680
commit 57f0575ad0
9 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/conf/machine/ccimx6qpsbc.conf
View File

@ -50,7 +50,7 @@ XBEE_TTY ?= "ttymxc4"
# Image FS types # Image FS types
IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
"boot.vfat tar.xz recovery.vfat squashfs", \ "boot.vfat tar.xz recovery.vfat squashfs", \
"boot.vfat ext4.gz sdcard.gz tar.xz recovery.vfat", d)}' "boot.vfat ext4.gz tar.xz recovery.vfat", d)}'
# Boot artifacts to be copied from the deploy dir to the installer ZIP # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \

2
meta-digi-arm/conf/machine/ccimx6sbc.conf
View File

@ -52,7 +52,7 @@ XBEE_TTY ?= "ttymxc4"
# Image FS types # Image FS types
IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
"boot.vfat tar.xz recovery.vfat squashfs", \ "boot.vfat tar.xz recovery.vfat squashfs", \
"boot.vfat ext4.gz sdcard.gz tar.xz recovery.vfat", d)}' "boot.vfat ext4.gz tar.xz recovery.vfat", d)}'
# Boot artifacts to be copied from the deploy dir to the installer ZIP # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \

2
meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
View File

@ -57,7 +57,7 @@ XBEE_TTY ?= "ttymxc3"
# Image FS types # Image FS types
IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
"boot.vfat tar.xz recovery.vfat squashfs", \ "boot.vfat tar.xz recovery.vfat squashfs", \
"boot.vfat ext4.gz sdcard.gz tar.xz recovery.vfat", d)}' "boot.vfat ext4.gz tar.xz recovery.vfat", d)}'
# Boot artifacts to be copied from the deploy dir to the installer ZIP # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mm-dvk.bin" BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mm-dvk.bin"

2
meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
View File

@ -58,7 +58,7 @@ XBEE_TTY ?= "ttymxc3"
# Image FS types # Image FS types
IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
"boot.vfat tar.xz recovery.vfat squashfs", \ "boot.vfat tar.xz recovery.vfat squashfs", \
"boot.vfat ext4.gz sdcard.gz tar.xz recovery.vfat", d)}' "boot.vfat ext4.gz tar.xz recovery.vfat", d)}'
# Boot artifacts to be copied from the deploy dir to the installer ZIP # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mn-dvk.bin" BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mn-dvk.bin"

2
meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
View File

@ -35,7 +35,7 @@ XBEE_TTY ?= "ttyLP0"
# Image FS types # Image FS types
IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
"boot.vfat tar.xz recovery.vfat squashfs", \ "boot.vfat tar.xz recovery.vfat squashfs", \
"boot.vfat ext4.gz sdcard.gz tar.xz recovery.vfat", d)}' "boot.vfat ext4.gz tar.xz recovery.vfat", d)}'
# Boot artifacts to be copied from the deploy dir to the installer ZIP # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \

2
meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
View File

@ -50,7 +50,7 @@ XBEE_TTY ?= "ttyMCA0"
# Image FS types # Image FS types
IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
"boot.vfat tar.xz recovery.vfat squashfs", \ "boot.vfat tar.xz recovery.vfat squashfs", \
"boot.vfat ext4.gz sdcard.gz tar.xz recovery.vfat", d)}' "boot.vfat ext4.gz tar.xz recovery.vfat", d)}'
# Boot artifacts to be copied from the deploy dir to the installer ZIP # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \

2
meta-digi-arm/conf/machine/include/ccimx9.inc
View File

@ -100,7 +100,7 @@ XBEE_TTY ?= "ttyLP3"
# Image FS types # Image FS types
IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
"boot.vfat recovery.vfat squashfs tar.xz", \ "boot.vfat recovery.vfat squashfs tar.xz", \
"boot.vfat recovery.vfat ext4.gz tar.xz sdcard.gz", d)}' "boot.vfat recovery.vfat ext4.gz tar.xz", d)}'
# Default overlayfs_etc mount point and type # Default overlayfs_etc mount point and type
OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data"

5
sdk/build-github.sh
View File

@ -36,6 +36,10 @@ ZIP_INSTALLER_CFG="
DEY_IMAGE_INSTALLER = \"1\" DEY_IMAGE_INSTALLER = \"1\"
" "
SDCARD_FSTYPE="
IMAGE_FSTYPES:append = \" sdcard.gz\"
"
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}"
BUILD_TIMESTAMP=" BUILD_TIMESTAMP="
SOURCE_DATE_EPOCH = \"${SOURCE_DATE_EPOCH}\" SOURCE_DATE_EPOCH = \"${SOURCE_DATE_EPOCH}\"
@ -237,6 +241,7 @@ for platform in ${DY_PLATFORMS}; do
{ {
printf "%s" "${RM_WORK_CFG}" printf "%s" "${RM_WORK_CFG}"
printf "%s" "${ZIP_INSTALLER_CFG}" printf "%s" "${ZIP_INSTALLER_CFG}"
printf "%s" "${SDCARD_FSTYPE}"
printf "%s" "${BUILD_TIMESTAMP}" printf "%s" "${BUILD_TIMESTAMP}"
} >> conf/local.conf } >> conf/local.conf
for target in ${platform_targets:?}; do for target in ${platform_targets:?}; do

5
sdk/build.sh
View File

@ -58,6 +58,10 @@ ZIP_INSTALLER_CFG="
DEY_IMAGE_INSTALLER = \"1\" DEY_IMAGE_INSTALLER = \"1\"
" "
SDCARD_FSTYPE="
IMAGE_FSTYPES:append = \" sdcard.gz\"
"
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}"
BUILD_TIMESTAMP=" BUILD_TIMESTAMP="
SOURCE_DATE_EPOCH = \"${SOURCE_DATE_EPOCH}\" SOURCE_DATE_EPOCH = \"${SOURCE_DATE_EPOCH}\"
@ -275,6 +279,7 @@ for platform in ${DY_PLATFORMS}; do
printf "%s" "${RM_WORK_CFG}" >> conf/local.conf printf "%s" "${RM_WORK_CFG}" >> conf/local.conf
fi fi
printf "%s" "${ZIP_INSTALLER_CFG}" >> conf/local.conf printf "%s" "${ZIP_INSTALLER_CFG}" >> conf/local.conf
printf "%s" "${SDCARD_FSTYPE}" >> conf/local.conf
# Append extra configuration macros if provided from build environment # Append extra configuration macros if provided from build environment
if [ -n "${DY_EXTRA_LOCAL_CONF}" ]; then if [ -n "${DY_EXTRA_LOCAL_CONF}" ]; then
printf "%s\n" "${DY_EXTRA_LOCAL_CONF}" >> conf/local.conf printf "%s\n" "${DY_EXTRA_LOCAL_CONF}" >> conf/local.conf