diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-08-10 13:37:45 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-08-10 13:37:45 +0000 |
| commit | a26f74c11909cdf7b4da8e0e2ac2766385bb7ccc (patch) | |
| tree | a2caa460eb0ab5398a7424c79f4e057d7e0cb387 /meta/conf | |
| parent | e35e618fba5a5b759aba57d62718c16481092b52 (diff) | |
| download | poky-a26f74c11909cdf7b4da8e0e2ac2766385bb7ccc.tar.gz | |
Remove IMAGE_FSTYPE, allow anything to override the default IMAGE_FSTYPES
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@600 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 759f1381ec..9151ee71d2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -187,8 +187,7 @@ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE | |||
| 187 | EXTRA_IMAGECMD = "" | 187 | EXTRA_IMAGECMD = "" |
| 188 | EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" | 188 | EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" |
| 189 | EXTRA_IMAGECMD_squashfs = "-le -b 16384" | 189 | EXTRA_IMAGECMD_squashfs = "-le -b 16384" |
| 190 | IMAGE_FSTYPE = "jffs2" | 190 | |
| 191 | IMAGE_FSTYPES = "${IMAGE_FSTYPE}" | ||
| 192 | IMAGE_ROOTFS_SIZE_ext2 = "65536" | 191 | IMAGE_ROOTFS_SIZE_ext2 = "65536" |
| 193 | IMAGE_ROOTFS_SIZE_ext2.gz = "65536" | 192 | IMAGE_ROOTFS_SIZE_ext2.gz = "65536" |
| 194 | 193 | ||
| @@ -408,6 +407,7 @@ require conf/sanity.conf | |||
| 408 | # Weak variables (usually to retain backwards compatibility) | 407 | # Weak variables (usually to retain backwards compatibility) |
| 409 | ################################################################## | 408 | ################################################################## |
| 410 | 409 | ||
| 410 | IMAGE_FSTYPES ?= "jffs2" | ||
| 411 | PCMCIA_MANAGER ?= "pcmcia-cs" | 411 | PCMCIA_MANAGER ?= "pcmcia-cs" |
| 412 | 412 | ||
| 413 | 413 | ||