summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-23 17:47:23 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-23 17:47:23 +0000
commit79414eecf72aced78d99fe67f3f4e0d6ff02c1e2 (patch)
tree21878a65ff254d9c2991f46c3abb5428048270c2
parentfa7434d685fcb505a36f1d7d715303c5fb27572d (diff)
parent4422694de042f275bb1bcf1a6ec0da5d9f2e19ac (diff)
downloadpoky-79414eecf72aced78d99fe67f3f4e0d6ff02c1e2.tar.gz
Merge branch 'marcin/pinky' of ssh://gitserver@git.pokylinux.org/poky-contrib into pinky
-rw-r--r--meta/conf/bitbake.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 59ab711a9d..c8f4b8dfe2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -563,6 +563,7 @@ IMAGE_FSTYPES ?= "jffs2"
563PCMCIA_MANAGER ?= "pcmcia-cs" 563PCMCIA_MANAGER ?= "pcmcia-cs"
564DEFAULT_TASK_PROVIDER ?= "task-base" 564DEFAULT_TASK_PROVIDER ?= "task-base"
565MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" 565MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
566IMAGE_ROOTFS_SIZE ?= "65536"
566IMAGE_ROOTFS_SIZE_ext2 ?= "65536" 567IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
567IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" 568IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
568IMAGE_ROOTFS_SIZE_ext3 ?= "65536" 569IMAGE_ROOTFS_SIZE_ext3 ?= "65536"