summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/conf/distro/include/default-distrovars.inc2
-rw-r--r--meta/conf/machine/include/qemu.inc2
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"
645DEFAULT_TASK_PROVIDER ?= "task-base" 645DEFAULT_TASK_PROVIDER ?= "task-base"
646MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" 646MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
647IMAGE_ROOTFS_SIZE ?= "65536" 647IMAGE_ROOTFS_SIZE ?= "65536"
648IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
649IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
650IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
651IMAGE_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 @@
1QA_LOGFILE = "${TMPDIR}/qa.log" 1QA_LOGFILE = "${TMPDIR}/qa.log"
2 2
3IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
4
5OEINCLUDELOGS ?= "yes" 3OEINCLUDELOGS ?= "yes"
6KERNEL_CONSOLE ?= "ttyS0" 4KERNEL_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"
6IMAGE_FSTYPES ?= "tar.bz2 ext3" 6IMAGE_FSTYPES ?= "tar.bz2 ext3"
7 7
8ROOT_FLASH_SIZE = "280" 8ROOT_FLASH_SIZE = "280"
9IMAGE_ROOTFS_SIZE_ext2 ?= "280000"
10IMAGE_ROOTFS_SIZE_ext3 ?= "280000"
11 9
12# Don't include kernels in standard images 10# Don't include kernels in standard images
13RDEPENDS_kernel-base = "" 11RDEPENDS_kernel-base = ""