summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/htcuniversal.conf4
-rw-r--r--meta/conf/machine/hx2000.conf4
-rw-r--r--meta/conf/machine/include/qemu.inc3
-rw-r--r--meta/conf/machine/include/zaurus-2.6.inc4
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
6 files changed, 18 insertions, 1 deletions
diff --git a/meta/conf/machine/htcuniversal.conf b/meta/conf/machine/htcuniversal.conf
index 922c13c0f5..86c1d0dbb5 100644
--- a/meta/conf/machine/htcuniversal.conf
+++ b/meta/conf/machine/htcuniversal.conf
@@ -26,3 +26,7 @@ module_autoload_acx = "acx"
26module_autoload_htcuniversal_acx = "htcuniversal_acx" 26module_autoload_htcuniversal_acx = "htcuniversal_acx"
27 27
28IMAGE_FSTYPES ?= "tar.gz" 28IMAGE_FSTYPES ?= "tar.gz"
29
30# Don't include kernels in standard images for Zaurus machines
31RDEPENDS_kernel-base = ""
32KERNEL_IMAGETYPE = "zImage"
diff --git a/meta/conf/machine/hx2000.conf b/meta/conf/machine/hx2000.conf
index d7077af593..5a896c8f31 100644
--- a/meta/conf/machine/hx2000.conf
+++ b/meta/conf/machine/hx2000.conf
@@ -61,3 +61,7 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
61 61
62#FIXME: this should be controlled by a userspace utility later. 62#FIXME: this should be controlled by a userspace utility later.
63module_autoload_g_ether = "g_ether" 63module_autoload_g_ether = "g_ether"
64
65# Don't include kernels in standard images for Zaurus machines
66RDEPENDS_kernel-base = ""
67KERNEL_IMAGETYPE = "zImage"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index ed8547867b..d84f1efb26 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -9,3 +9,6 @@ IMAGE_FSTYPES ?= "tar.bz2 ext2"
9 9
10ROOT_FLASH_SIZE = "230" 10ROOT_FLASH_SIZE = "230"
11IMAGE_ROOTFS_SIZE_ext2 ?= "230000" 11IMAGE_ROOTFS_SIZE_ext2 ?= "230000"
12
13# Don't include kernels in standard images
14RDEPENDS_kernel-base = ""
diff --git a/meta/conf/machine/include/zaurus-2.6.inc b/meta/conf/machine/include/zaurus-2.6.inc
index 84221b54b0..efa1704642 100644
--- a/meta/conf/machine/include/zaurus-2.6.inc
+++ b/meta/conf/machine/include/zaurus-2.6.inc
@@ -44,4 +44,6 @@ zaurus_make_installkit () {
44 rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ 44 rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
45} 45}
46 46
47RDEPENDS_kernel-base = "" \ No newline at end of file 47# Don't include kernels in standard images for Zaurus machines
48RDEPENDS_kernel-base = ""
49KERNEL_IMAGETYPE = "zImage"
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 745928b252..6a2fe6feb9 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
8require conf/machine/include/qemu.inc 8require conf/machine/include/qemu.inc
9require conf/machine/include/tune-arm926ejs.inc 9require conf/machine/include/tune-arm926ejs.inc
10 10
11KERNEL_IMAGETYPE = "zImage"
12
11SERIAL_CONSOLE = "115200 ttyAMA0" 13SERIAL_CONSOLE = "115200 ttyAMA0"
12 14
13PREFERRED_PROVIDER_virtual/kernel = "linux-rp" 15PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index db0eb1a966..2378a9990e 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -7,6 +7,8 @@ PACKAGE_EXTRA_ARCHS = "x86"
7 7
8require conf/machine/include/qemu.inc 8require conf/machine/include/qemu.inc
9 9
10KERNEL_IMAGETYPE = "bzImage"
11
10SERIAL_CONSOLE = "115200 ttyS0" 12SERIAL_CONSOLE = "115200 ttyS0"
11 13
12PREFERRED_PROVIDER_virtual/kernel = "linux-rp" 14PREFERRED_PROVIDER_virtual/kernel = "linux-rp"