summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-07-29 00:05:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-02 09:26:13 +0100
commite517b082425b45500952a5429f2df26b01304d6a (patch)
tree4438c4411ada2dffc22debfb42c99453ea4da947 /meta/classes
parent2ca9406701e4b957c115eba37e77832252351e81 (diff)
downloadpoky-e517b082425b45500952a5429f2df26b01304d6a.tar.gz
image-vmdk.bbclass: use sda rather than hda
The modern kernels may not support IDE (CONFIG_IDE=y), but it should support SCSI in most of the cases. The boot-directdisk.bbclass uses sda, too. Remove an extra space from image-live.bbclass and image-vmdk.bbclass to not confuse the user. (From OE-Core rev: 842a797460cd07b779ab588a4ece7e5d4d97417b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image-live.bbclass2
-rw-r--r--meta/classes/image-vmdk.bbclass2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index c7e6937fa9..7b770fb353 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -2,7 +2,7 @@
2AUTO_SYSLINUXCFG = "1" 2AUTO_SYSLINUXCFG = "1"
3INITRD_IMAGE ?= "core-image-minimal-initramfs" 3INITRD_IMAGE ?= "core-image-minimal-initramfs"
4INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz" 4INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz"
5SYSLINUX_ROOT = "root=/dev/ram0 " 5SYSLINUX_ROOT = "root=/dev/ram0"
6SYSLINUX_TIMEOUT ?= "10" 6SYSLINUX_TIMEOUT ?= "10"
7SYSLINUX_LABELS ?= "boot install" 7SYSLINUX_LABELS ?= "boot install"
8LABELS_append = " ${SYSLINUX_LABELS} " 8LABELS_append = " ${SYSLINUX_LABELS} "
diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass
index 703c00ea3c..77b7facd41 100644
--- a/meta/classes/image-vmdk.bbclass
+++ b/meta/classes/image-vmdk.bbclass
@@ -1,7 +1,7 @@
1 1
2#NOISO = "1" 2#NOISO = "1"
3 3
4SYSLINUX_ROOT = "root=/dev/hda2 " 4SYSLINUX_ROOT ?= "root=/dev/sda2"
5SYSLINUX_PROMPT ?= "0" 5SYSLINUX_PROMPT ?= "0"
6SYSLINUX_TIMEOUT ?= "10" 6SYSLINUX_TIMEOUT ?= "10"
7SYSLINUX_LABELS = "boot" 7SYSLINUX_LABELS = "boot"