* The tisdk-server-rootfs-image size has exceeded HW limitations so remove ubi/ubifs from IMAGE_FSTYPES. * Remove the tisdk-server-extra-rootfs-image as this was the original intent of that image.
Signed-off-by: Jacob Stiffler <[email protected]> --- .../recipes-core/images/arago-core-tisdk-image.inc | 6 +++--- .../recipes-core/images/tisdk-server-extra-rootfs-image.bb | 13 ------------- .../recipes-core/images/tisdk-server-rootfs-image.bb | 8 ++++++++ 3 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 meta-arago-distro/recipes-core/images/tisdk-server-extra-rootfs-image.bb diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc index 45a8c1b..0125bb5 100644 --- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc +++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc @@ -38,9 +38,9 @@ TARGET_IMAGES = "arago-base-tisdk-image tisdk-rootfs-image arago-tiny-image" TARGET_IMAGES_append_dra7xx-evm = " netboot-initrd" # Some devices do not support display and use a server image instead -TARGET_IMAGES_keystone = "arago-base-tisdk-image tisdk-server-rootfs-image tisdk-server-extra-rootfs-image arago-tiny-image" -TARGET_IMAGES_omapl138 = "arago-base-tisdk-image tisdk-server-rootfs-image tisdk-server-extra-rootfs-image arago-tiny-image" -TARGET_IMAGES_j7-evm = "arago-base-tisdk-image tisdk-server-rootfs-image tisdk-server-extra-rootfs-image arago-tiny-image" +TARGET_IMAGES_keystone = "arago-base-tisdk-image tisdk-server-rootfs-image arago-tiny-image" +TARGET_IMAGES_omapl138 = "arago-base-tisdk-image tisdk-server-rootfs-image arago-tiny-image" +TARGET_IMAGES_j7-evm = "arago-base-tisdk-image tisdk-server-rootfs-image arago-tiny-image" TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk" TOOLCHAIN_SUFFIX = "-tisdk" diff --git a/meta-arago-distro/recipes-core/images/tisdk-server-extra-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-server-extra-rootfs-image.bb deleted file mode 100644 index 359dc90..0000000 --- a/meta-arago-distro/recipes-core/images/tisdk-server-extra-rootfs-image.bb +++ /dev/null @@ -1,13 +0,0 @@ -require recipes-core/images/tisdk-server-rootfs-image.bb - -IMAGE_INSTALL += "\ - packagegroup-arago-test-addons \ - packagegroup-arago-tisdk-addons-extra \ - ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \ - packagegroup-arago-tisdk-multimedia \ - packagegroup-arago-tisdk-matrix-extra \ -" - -export IMAGE_BASENAME = "tisdk-server-extra-rootfs-image" - -IMAGE_FSTYPES = "tar.xz" diff --git a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb index b64d092..09d9f9d 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb @@ -6,11 +6,19 @@ SPLASH = "" IMAGE_INSTALL += "\ packagegroup-arago-tisdk-addons \ + packagegroup-arago-tisdk-addons-extra \ ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \ packagegroup-arago-tisdk-crypto \ + packagegroup-arago-tisdk-multimedia \ packagegroup-arago-tisdk-matrix \ + packagegroup-arago-tisdk-matrix-extra \ packagegroup-arago-base-tisdk-server-extra \ packagegroup-arago-tisdk-connectivity \ " export IMAGE_BASENAME = "tisdk-server-rootfs-image" + +# Disable ubi/ubifs as the filesystem requires more space than is +# available on the HW. +IMAGE_FSTYPES_remove = "ubifs ubi" -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
