[oe-commits] Michael Kurz : om-gta0{1, 2}.conf: set IMAGE_FSTYPES to defaults only when it was not set before.

git version control git at git.openembedded.org
Sat Nov 7 13:09:48 UTC 2009


Module: openembedded.git
Branch: shr/merge
Commit: 35bde65df8e1f5b28e1a310f1e2de74799c87bbe
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=35bde65df8e1f5b28e1a310f1e2de74799c87bbe

Author: Michael Kurz <betheg at bitcloner.org>
Date:   Fri Nov  6 11:25:19 2009 +0000

om-gta0{1, 2}.conf: set IMAGE_FSTYPES to defaults only when it was not set before.

Signed-off-by: Michael Kurz <betheg at bitcloner.org>
Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/machine/om-gta01.conf |    3 ++-
 conf/machine/om-gta02.conf |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index b0b14c8..c2facc8 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -35,8 +35,9 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 # used by some images
 ROOT_FLASH_SIZE = "60"
 
+IMAGE_FSTYPES ?= "jffs2"
+
 # extra jffs2 tweaks
-IMAGE_FSTYPES += "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 
 # build / upload tools
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 51badd6..1775829 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -31,8 +31,9 @@ USE_VT = "0"
 # used by some images
 ROOT_FLASH_SIZE = "256"
 
+IMAGE_FSTYPES ?= "tar.gz jffs2 ubifs"
+
 # extra jffs2 tweaks
-IMAGE_FSTYPES += "tar.gz jffs2 ubifs"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
   --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
   --littleendian --pad \





More information about the Openembedded-commits mailing list