bitbake.conf: Remove old style IMAGE_FSTYPE in favour of IMAGE_FSTYPES (which is weakly set to a default allowing machines to override/append) (from poky)

6 files changed, 7 insertions, 8 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 0a141f883e..a6b995a241 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -188,8 +188,6 @@ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE
 EXTRA_IMAGECMD = ""
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 EXTRA_IMAGECMD_squashfs = "-le -b 16384"
-IMAGE_FSTYPE = "jffs2"
-IMAGE_FSTYPES = "${IMAGE_FSTYPE}"
 IMAGE_ROOTFS_SIZE_ext2 = "65536"
 IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
 
@@ -409,6 +407,7 @@ require conf/sanity.conf
 # Weak variables (usually to retain backwards compatibility)
 ##################################################################
 
+IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 
 
diff --git a/conf/distro/openmn.conf b/conf/distro/openmn.conf
index 0e3d36ed2d..8118acb1da 100644
--- a/conf/distro/openmn.conf
+++ b/conf/distro/openmn.conf
@@ -16,6 +16,6 @@ IPKG_EXTRA_ARCHS = "armv5te openmn"
 
 FEED_URIS  = "mnci54##http://www.mn-solutions.de/feed/mnci54/base"
 
-IMAGE_FSTYPE = "jffs2"
+IMAGE_FSTYPES = "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000"
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/rootfs.${MACHINE} ${EXTRA_IMAGECMD}"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 0c757edc45..da1efa9cc4 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -34,7 +34,7 @@ FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-reg
 
 INHERIT += " package_ipk nslu2-jffs2-image"
 
-IMAGE_FSTYPE = "jffs2"
+IMAGE_FSTYPES = "jffs2"
 UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
 EXTRA_IMAGECMD_jffs2 = "--no-eraseblock-headers --pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}"
 
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index dd6b0f0b93..e82da27574 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -1,7 +1,7 @@
 TARGET_ARCH = "i586"
 TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
-IMAGE_FSTYPE = "ext2.gz"
+IMAGE_FSTYPES = "ext2.gz"
 BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules"
 udevdir = "/dev"
 OLDEST_KERNEL = "2.6.5"
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 9d483d4c55..2b9b572024 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -7,13 +7,13 @@ PREFERRED_PROVIDER_xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils"
 #BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules"
-#IMAGE_FSTYPE = "cramfs"
+#IMAGE_FSTYPES = "cramfs"
 EXTRA_IMAGEDEPENDS = ""
 SERIAL_CONSOLE = "ttyS0 115200 vt100"
 
 TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
-IMAGE_FSTYPE = "ext2"
+IMAGE_FSTYPES = "ext2"
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword"
 
diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf
index 5376be0dda..36974d1336 100644
--- a/conf/machine/sun4cdm.conf
+++ b/conf/machine/sun4cdm.conf
@@ -1,6 +1,6 @@
 TARGET_ARCH = "sparc"
 
-IMAGE_FSTYPE = "cramfs"
+IMAGE_FSTYPES = "cramfs"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel module-init-tools udev"