summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/conf/machine/include/qemu.inc2
2 files changed, 0 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5f4a41227a..b1c8dac035 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -721,9 +721,6 @@ OES_BITBAKE_CONF = "1"
721 721
722DISTRO_FEATURES ?= "" 722DISTRO_FEATURES ?= ""
723 723
724# This is used to limit what packages goes into images built, so set big by default
725ROOT_FLASH_SIZE ?= "256"
726
727DISTRO_EXTRA_RDEPENDS ?= "" 724DISTRO_EXTRA_RDEPENDS ?= ""
728DISTRO_EXTRA_RRECOMMENDS ?= "" 725DISTRO_EXTRA_RRECOMMENDS ?= ""
729MACHINE_EXTRA_RDEPENDS ?= "" 726MACHINE_EXTRA_RDEPENDS ?= ""
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index f68bf32d16..52215b3930 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -16,8 +16,6 @@ MACHINEOVERRIDES .= ":qemuall"
16 16
17IMAGE_FSTYPES += "tar.bz2 ext3" 17IMAGE_FSTYPES += "tar.bz2 ext3"
18 18
19ROOT_FLASH_SIZE = "280"
20
21# Don't include kernels in standard images 19# Don't include kernels in standard images
22RDEPENDS_kernel-base = "" 20RDEPENDS_kernel-base = ""
23 21