diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-23 17:47:23 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-23 17:47:23 +0000 |
commit | 79414eecf72aced78d99fe67f3f4e0d6ff02c1e2 (patch) | |
tree | 21878a65ff254d9c2991f46c3abb5428048270c2 /meta | |
parent | fa7434d685fcb505a36f1d7d715303c5fb27572d (diff) | |
parent | 4422694de042f275bb1bcf1a6ec0da5d9f2e19ac (diff) | |
download | poky-79414eecf72aced78d99fe67f3f4e0d6ff02c1e2.tar.gz |
Merge branch 'marcin/pinky' of ssh://gitserver@git.pokylinux.org/poky-contrib into pinky
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/bitbake.conf | 1 |
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" | |||
563 | PCMCIA_MANAGER ?= "pcmcia-cs" | 563 | PCMCIA_MANAGER ?= "pcmcia-cs" |
564 | DEFAULT_TASK_PROVIDER ?= "task-base" | 564 | DEFAULT_TASK_PROVIDER ?= "task-base" |
565 | MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" | 565 | MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" |
566 | IMAGE_ROOTFS_SIZE ?= "65536" | ||
566 | IMAGE_ROOTFS_SIZE_ext2 ?= "65536" | 567 | IMAGE_ROOTFS_SIZE_ext2 ?= "65536" |
567 | IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" | 568 | IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" |
568 | IMAGE_ROOTFS_SIZE_ext3 ?= "65536" | 569 | IMAGE_ROOTFS_SIZE_ext3 ?= "65536" |