From f697ac6494f7fdc05edbd09bf678f5608f04df32 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Thu, 19 Jan 2012 13:08:45 -0600 Subject: [PATCH] Move default images types built into image recipes Signed-off-by: Matthew McClintock --- meta-fsl-ppc/conf/machine/e500mc.inc | 1 - meta-fsl-ppc/conf/machine/e500v2.inc | 1 - meta-fsl-ppc/conf/machine/e5500-64b.inc | 1 - meta-fsl-ppc/conf/machine/e5500.inc | 1 - meta-fsl-ppc/images/fsl-image-lsb-sdk.bb | 2 ++ meta-fsl-ppc/images/fsl-image-lsb.bb | 2 ++ meta-fsl-ppc/images/fsl-image-minimal.bb | 2 ++ 7 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meta-fsl-ppc/conf/machine/e500mc.inc b/meta-fsl-ppc/conf/machine/e500mc.inc index e79a91a9..a8eb16b3 100644 --- a/meta-fsl-ppc/conf/machine/e500mc.inc +++ b/meta-fsl-ppc/conf/machine/e500mc.inc @@ -11,7 +11,6 @@ PREFERRED_VERSION_virtual/kernel = "3.0.1" PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers" KERNEL_IMAGETYPE = "uImage" -IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot" # disable the images below for now # ext2.bz2 ext2.lzma \ # ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" diff --git a/meta-fsl-ppc/conf/machine/e500v2.inc b/meta-fsl-ppc/conf/machine/e500v2.inc index 2bed583d..d529b3f9 100644 --- a/meta-fsl-ppc/conf/machine/e500v2.inc +++ b/meta-fsl-ppc/conf/machine/e500v2.inc @@ -10,7 +10,6 @@ PREFERRED_VERSION_virtual/kernel = "3.0.1" PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers" KERNEL_IMAGETYPE = "uImage" -IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot" # disable the images below for now # ext2.bz2 ext2.lzma \ # ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" diff --git a/meta-fsl-ppc/conf/machine/e5500-64b.inc b/meta-fsl-ppc/conf/machine/e5500-64b.inc index 069349aa..03cb2dbc 100644 --- a/meta-fsl-ppc/conf/machine/e5500-64b.inc +++ b/meta-fsl-ppc/conf/machine/e5500-64b.inc @@ -11,7 +11,6 @@ PREFERRED_VERSION_virtual/kernel = "3.0.1" PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers" KERNEL_IMAGETYPE = "uImage" -IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot" # disable the images below for now # ext2.bz2 ext2.lzma \ # ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" diff --git a/meta-fsl-ppc/conf/machine/e5500.inc b/meta-fsl-ppc/conf/machine/e5500.inc index ca9cfd32..471bb22d 100644 --- a/meta-fsl-ppc/conf/machine/e5500.inc +++ b/meta-fsl-ppc/conf/machine/e5500.inc @@ -11,7 +11,6 @@ PREFERRED_VERSION_virtual/kernel ?= "3.0.1" PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers" KERNEL_IMAGETYPE = "uImage" -IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot" # disable the images below for now # ext2.bz2 ext2.lzma \ # ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" diff --git a/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb b/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb index 04b941b1..c4fff429 100644 --- a/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb +++ b/meta-fsl-ppc/images/fsl-image-lsb-sdk.bb @@ -14,3 +14,5 @@ IMAGE_INSTALL = "\ " inherit core-image + +IMAGE_FSTYPES ?= "nfsroot" diff --git a/meta-fsl-ppc/images/fsl-image-lsb.bb b/meta-fsl-ppc/images/fsl-image-lsb.bb index bb743b49..47f4c38d 100644 --- a/meta-fsl-ppc/images/fsl-image-lsb.bb +++ b/meta-fsl-ppc/images/fsl-image-lsb.bb @@ -8,3 +8,5 @@ IMAGE_INSTALL = "\ " inherit core-image + +IMAGE_FSTYPES ?= "nfsroot" diff --git a/meta-fsl-ppc/images/fsl-image-minimal.bb b/meta-fsl-ppc/images/fsl-image-minimal.bb index 74bce63f..a290d8be 100644 --- a/meta-fsl-ppc/images/fsl-image-minimal.bb +++ b/meta-fsl-ppc/images/fsl-image-minimal.bb @@ -12,3 +12,5 @@ IMAGE_ROOTFS_SIZE = "8192" # remove not needed ipkg informations ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " + +IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot" -- 2.40.1