diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
-rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index a0af672ae2..18028f3001 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -645,10 +645,6 @@ PCMCIA_MANAGER ?= "pcmcia-cs" | |||
645 | DEFAULT_TASK_PROVIDER ?= "task-base" | 645 | DEFAULT_TASK_PROVIDER ?= "task-base" |
646 | MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" | 646 | MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" |
647 | IMAGE_ROOTFS_SIZE ?= "65536" | 647 | IMAGE_ROOTFS_SIZE ?= "65536" |
648 | IMAGE_ROOTFS_SIZE_ext2 ?= "65536" | ||
649 | IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" | ||
650 | IMAGE_ROOTFS_SIZE_ext3 ?= "65536" | ||
651 | IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" | ||
652 | 648 | ||
653 | # Forcefully set CACHE now so future changes to things like | 649 | # Forcefully set CACHE now so future changes to things like |
654 | # MACHINE don't change the path to the cache | 650 | # MACHINE don't change the path to the cache |
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 1aa45c8898..4b68a0a54c 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc | |||
@@ -1,7 +1,5 @@ | |||
1 | QA_LOGFILE = "${TMPDIR}/qa.log" | 1 | QA_LOGFILE = "${TMPDIR}/qa.log" |
2 | 2 | ||
3 | IMAGE_ROOTFS_SIZE_ext2 ?= "131072" | ||
4 | |||
5 | OEINCLUDELOGS ?= "yes" | 3 | OEINCLUDELOGS ?= "yes" |
6 | KERNEL_CONSOLE ?= "ttyS0" | 4 | KERNEL_CONSOLE ?= "ttyS0" |
7 | 5 | ||
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 4122a882dd..9ef242f386 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
@@ -6,8 +6,6 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" | |||
6 | IMAGE_FSTYPES ?= "tar.bz2 ext3" | 6 | IMAGE_FSTYPES ?= "tar.bz2 ext3" |
7 | 7 | ||
8 | ROOT_FLASH_SIZE = "280" | 8 | ROOT_FLASH_SIZE = "280" |
9 | IMAGE_ROOTFS_SIZE_ext2 ?= "280000" | ||
10 | IMAGE_ROOTFS_SIZE_ext3 ?= "280000" | ||
11 | 9 | ||
12 | # Don't include kernels in standard images | 10 | # Don't include kernels in standard images |
13 | RDEPENDS_kernel-base = "" | 11 | RDEPENDS_kernel-base = "" |