diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index 5f9488515..f843091da 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -50,7 +50,7 @@ XBEE_TTY ?= "ttymxc4" # Image FS types IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "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 BOOTABLE_ARTIFACTS = " \ diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index 0f38026c2..0eca09ba6 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -52,7 +52,7 @@ XBEE_TTY ?= "ttymxc4" # Image FS types IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "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 BOOTABLE_ARTIFACTS = " \ diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf index 5795adf16..1de9b6bce 100644 --- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf @@ -57,7 +57,7 @@ XBEE_TTY ?= "ttymxc3" # Image FS types IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "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 BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mm-dvk.bin" diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index b546c00bc..7b2a6788e 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -58,7 +58,7 @@ XBEE_TTY ?= "ttymxc3" # Image FS types IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "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 BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mn-dvk.bin" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index 1644cb6c7..9040b7bdb 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -35,7 +35,7 @@ XBEE_TTY ?= "ttyLP0" # Image FS types IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "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 BOOTABLE_ARTIFACTS = " \ diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 073faefe4..c7b38fc5a 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -50,7 +50,7 @@ XBEE_TTY ?= "ttyMCA0" # Image FS types IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "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 BOOTABLE_ARTIFACTS = " \ diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc index c6bc929d5..b2ed62b54 100644 --- a/meta-digi-arm/conf/machine/include/ccimx9.inc +++ b/meta-digi-arm/conf/machine/include/ccimx9.inc @@ -100,7 +100,7 @@ XBEE_TTY ?= "ttyLP3" # Image FS types IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ "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 OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" diff --git a/sdk/build-github.sh b/sdk/build-github.sh index 4e42df27c..f2a3ef172 100755 --- a/sdk/build-github.sh +++ b/sdk/build-github.sh @@ -36,6 +36,10 @@ ZIP_INSTALLER_CFG=" DEY_IMAGE_INSTALLER = \"1\" " +SDCARD_FSTYPE=" +IMAGE_FSTYPES:append = \" sdcard.gz\" +" + SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}" BUILD_TIMESTAMP=" SOURCE_DATE_EPOCH = \"${SOURCE_DATE_EPOCH}\" @@ -237,6 +241,7 @@ for platform in ${DY_PLATFORMS}; do { printf "%s" "${RM_WORK_CFG}" printf "%s" "${ZIP_INSTALLER_CFG}" + printf "%s" "${SDCARD_FSTYPE}" printf "%s" "${BUILD_TIMESTAMP}" } >> conf/local.conf for target in ${platform_targets:?}; do diff --git a/sdk/build.sh b/sdk/build.sh index 57626cdd4..fb83dbbfa 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -58,6 +58,10 @@ ZIP_INSTALLER_CFG=" DEY_IMAGE_INSTALLER = \"1\" " +SDCARD_FSTYPE=" +IMAGE_FSTYPES:append = \" sdcard.gz\" +" + SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}" BUILD_TIMESTAMP=" SOURCE_DATE_EPOCH = \"${SOURCE_DATE_EPOCH}\" @@ -275,6 +279,7 @@ for platform in ${DY_PLATFORMS}; do printf "%s" "${RM_WORK_CFG}" >> conf/local.conf fi printf "%s" "${ZIP_INSTALLER_CFG}" >> conf/local.conf + printf "%s" "${SDCARD_FSTYPE}" >> conf/local.conf # Append extra configuration macros if provided from build environment if [ -n "${DY_EXTRA_LOCAL_CONF}" ]; then printf "%s\n" "${DY_EXTRA_LOCAL_CONF}" >> conf/local.conf