aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-21 14:48:16 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 23:59:17 +0000
commit1284230ad554f8607cb02b054fdd74017ae7c861 (patch)
treef70d52e0fdd8c8298fd2d21a8750e838f8b5af6d /meta
parente03d5cbdfc39a835576b16a0beeea6858e983f56 (diff)
downloadopenembedded-core-contrib-1284230ad554f8607cb02b054fdd74017ae7c861.tar.gz
openembedded-core-contrib-1284230ad554f8607cb02b054fdd74017ae7c861.tar.bz2
openembedded-core-contrib-1284230ad554f8607cb02b054fdd74017ae7c861.zip
boot-directdisk: Use correct SYSLINUX_TIMEOUT and SYSLINUX_ROOT instead of APPEND
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/boot-directdisk.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 8879ba8ebf..893164f853 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -38,8 +38,9 @@ BOOTDD_EXTRA_SPACE ?= "16384"
AUTO_SYSLINUXCFG = "1"
LABELS = "boot"
-APPEND = "root=/dev/sda2"
-TIMEOUT = "10"
+SYSLINUX_ROOT ?= "root=/dev/sda2"
+SYSLINUX_TIMEOUT = "10" # 1 second
+
SYSLINUXCFG = "${HDDDIR}/syslinux.cfg"
SYSLINUXMENU = "${HDDDIR}/menu"
@@ -50,6 +51,7 @@ build_boot_dd() {
install -d ${HDDDIR}
install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${HDDDIR}/vmlinuz
+ install -m 0644 ${S}/syslinux.cfg ${HDDDIR}/syslinux.cfg
install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
BLOCKS=`du -bks ${HDDDIR} | cut -f 1`