[oe-commits] org.oe.dev 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)

[rpurdie commit]

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)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 0e722bfb30c859abd6a69c00c62b662a92f2d11e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0e722bfb30c859abd6a69c00c62b662a92f2d11e
Files:
1
conf/bitbake.conf
conf/distro/openmn.conf
conf/distro/unslung.conf
conf/machine/epia.conf
conf/machine/netvista.conf
conf/machine/sun4cdm.conf
Diffs:

#
# mt diff -r9cef20f401d3c1ee6db7289d2837c3eabf33896c -r0e722bfb30c859abd6a69c00c62b662a92f2d11e
#
# 
# 
# patch "conf/bitbake.conf"
#  from [cd74d6948d7801b56b032158399303126a16904a]
#    to [ef170ceffbe47cab0e112a70d6733cc8688be12f]
# 
# patch "conf/distro/openmn.conf"
#  from [727bb80c69ea78551d2ea8e60f288808428b6013]
#    to [9a78b7afdd948cba7c16ce5fe611ef6aa7eb2a53]
# 
# patch "conf/distro/unslung.conf"
#  from [8de36fe0b836dd9bcbe03da25ced98b66cb93b1f]
#    to [a9a889d3925cad855f6b3be28b5ad0fa52b39f95]
# 
# patch "conf/machine/epia.conf"
#  from [d01a79bd6043a78a38d208c342becd5f29d4c28e]
#    to [5b6bd5afa186e48457f343d364de977d25d6160f]
# 
# patch "conf/machine/netvista.conf"
#  from [458e73b838e8990a0942712ea2f051d3226be3ac]
#    to [94a0990ddb7103bb03bd5e6eec79513414cd0df0]
# 
# patch "conf/machine/sun4cdm.conf"
#  from [f2255c1f236059f6890d1b874744afdb6c8fa7d4]
#    to [6e16aa2a31bfd4fdf7e46f32a02fe1e6028fdabd]
# 
============================================================
--- conf/bitbake.conf	cd74d6948d7801b56b032158399303126a16904a
+++ conf/bitbake.conf	ef170ceffbe47cab0e112a70d6733cc8688be12f
@@ -188,8 +188,6 @@ EXTRA_IMAGECMD_squashfs = "-le -b 16384"
 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"
 
 
============================================================
--- conf/distro/openmn.conf	727bb80c69ea78551d2ea8e60f288808428b6013
+++ conf/distro/openmn.conf	9a78b7afdd948cba7c16ce5fe611ef6aa7eb2a53
@@ -16,6 +16,6 @@ FEED_URIS  = "mnci54##http://www.mn-solu
 
 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}"
============================================================
--- conf/distro/unslung.conf	8de36fe0b836dd9bcbe03da25ced98b66cb93b1f
+++ conf/distro/unslung.conf	a9a889d3925cad855f6b3be28b5ad0fa52b39f95
@@ -34,7 +34,7 @@ INHERIT += " package_ipk nslu2-jffs2-ima
 
 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}"
 
============================================================
--- conf/machine/epia.conf	d01a79bd6043a78a38d208c342becd5f29d4c28e
+++ conf/machine/epia.conf	5b6bd5afa186e48457f343d364de977d25d6160f
@@ -1,7 +1,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 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"
============================================================
--- conf/machine/netvista.conf	458e73b838e8990a0942712ea2f051d3226be3ac
+++ conf/machine/netvista.conf	94a0990ddb7103bb03bd5e6eec79513414cd0df0
@@ -7,13 +7,13 @@ BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciut
 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"
 
============================================================
--- conf/machine/sun4cdm.conf	f2255c1f236059f6890d1b874744afdb6c8fa7d4
+++ conf/machine/sun4cdm.conf	6e16aa2a31bfd4fdf7e46f32a02fe1e6028fdabd
@@ -1,6 +1,6 @@ TARGET_ARCH = "sparc"
 TARGET_ARCH = "sparc"
 
-IMAGE_FSTYPE = "cramfs"
+IMAGE_FSTYPES = "cramfs"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel module-init-tools udev"