summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-01-19 13:08:45 -0600
committerMatthew McClintock <msm@freescale.com>2012-01-19 13:26:57 -0600
commit301b6c0dfa9adbb9a70e4fe3c15372a6d0b4351c (patch)
tree64a27f6115f989cc2da005bc42bcaea3e1e21441
parent6fb3921836489ae32ff5a53ee20f7a60a2be59f6 (diff)
downloadmeta-fsl-ppc-301b6c0dfa9adbb9a70e4fe3c15372a6d0b4351c.tar.gz
Move default images types built into image recipes
Signed-off-by: Matthew McClintock <msm@freescale.com>
-rw-r--r--conf/machine/e500mc.inc1
-rw-r--r--conf/machine/e500v2.inc1
-rw-r--r--conf/machine/e5500-64b.inc1
-rw-r--r--conf/machine/e5500.inc1
-rw-r--r--images/fsl-image-lsb-sdk.bb2
-rw-r--r--images/fsl-image-lsb.bb2
-rw-r--r--images/fsl-image-minimal.bb2
7 files changed, 6 insertions, 4 deletions
diff --git a/conf/machine/e500mc.inc b/conf/machine/e500mc.inc
index e79a91a..a8eb16b 100644
--- a/conf/machine/e500mc.inc
+++ b/conf/machine/e500mc.inc
@@ -11,7 +11,6 @@ PREFERRED_VERSION_virtual/kernel = "3.0.1"
11PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers" 11PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
12 12
13KERNEL_IMAGETYPE = "uImage" 13KERNEL_IMAGETYPE = "uImage"
14IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot"
15# disable the images below for now 14# disable the images below for now
16# ext2.bz2 ext2.lzma \ 15# ext2.bz2 ext2.lzma \
17# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" 16# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/conf/machine/e500v2.inc b/conf/machine/e500v2.inc
index 2bed583..d529b3f 100644
--- a/conf/machine/e500v2.inc
+++ b/conf/machine/e500v2.inc
@@ -10,7 +10,6 @@ PREFERRED_VERSION_virtual/kernel = "3.0.1"
10PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers" 10PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
11 11
12KERNEL_IMAGETYPE = "uImage" 12KERNEL_IMAGETYPE = "uImage"
13IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot"
14# disable the images below for now 13# disable the images below for now
15# ext2.bz2 ext2.lzma \ 14# ext2.bz2 ext2.lzma \
16# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" 15# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/conf/machine/e5500-64b.inc b/conf/machine/e5500-64b.inc
index 069349a..03cb2db 100644
--- a/conf/machine/e5500-64b.inc
+++ b/conf/machine/e5500-64b.inc
@@ -11,7 +11,6 @@ PREFERRED_VERSION_virtual/kernel = "3.0.1"
11PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers" 11PREFERRED_PROVIDER_linux-libc-headers = "linux-qoriq-sdk-headers"
12 12
13KERNEL_IMAGETYPE = "uImage" 13KERNEL_IMAGETYPE = "uImage"
14IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot"
15# disable the images below for now 14# disable the images below for now
16# ext2.bz2 ext2.lzma \ 15# ext2.bz2 ext2.lzma \
17# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" 16# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/conf/machine/e5500.inc b/conf/machine/e5500.inc
index ca9cfd3..471bb22 100644
--- a/conf/machine/e5500.inc
+++ b/conf/machine/e5500.inc
@@ -11,7 +11,6 @@ PREFERRED_VERSION_virtual/kernel ?= "3.0.1"
11PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers" 11PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
12 12
13KERNEL_IMAGETYPE = "uImage" 13KERNEL_IMAGETYPE = "uImage"
14IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot"
15# disable the images below for now 14# disable the images below for now
16# ext2.bz2 ext2.lzma \ 15# ext2.bz2 ext2.lzma \
17# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" 16# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot"
diff --git a/images/fsl-image-lsb-sdk.bb b/images/fsl-image-lsb-sdk.bb
index 04b941b..c4fff42 100644
--- a/images/fsl-image-lsb-sdk.bb
+++ b/images/fsl-image-lsb-sdk.bb
@@ -14,3 +14,5 @@ IMAGE_INSTALL = "\
14 " 14 "
15 15
16inherit core-image 16inherit core-image
17
18IMAGE_FSTYPES ?= "nfsroot"
diff --git a/images/fsl-image-lsb.bb b/images/fsl-image-lsb.bb
index bb743b4..47f4c38 100644
--- a/images/fsl-image-lsb.bb
+++ b/images/fsl-image-lsb.bb
@@ -8,3 +8,5 @@ IMAGE_INSTALL = "\
8 " 8 "
9 9
10inherit core-image 10inherit core-image
11
12IMAGE_FSTYPES ?= "nfsroot"
diff --git a/images/fsl-image-minimal.bb b/images/fsl-image-minimal.bb
index 74bce63..a290d8b 100644
--- a/images/fsl-image-minimal.bb
+++ b/images/fsl-image-minimal.bb
@@ -12,3 +12,5 @@ IMAGE_ROOTFS_SIZE = "8192"
12 12
13# remove not needed ipkg informations 13# remove not needed ipkg informations
14ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " 14ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
15
16IMAGE_FSTYPES ?= "tar.gz ext2.gz.u-boot"