From 20a3734c0da057a51aadc89e3dba163367611dc5 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Thu, 23 Jan 2014 13:36:37 +0200
Subject: upgrade emulator components

- kernel 3.10
- LLVM 3.3
- mesa 9.1.6

Change-Id: Ib15c6826ab480e39e4efb7a16d42030b55ad6c3b
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 classes/image-hdd.bbclass | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'classes')

diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass
index 123c417..fb59c20 100644
--- a/classes/image-hdd.bbclass
+++ b/classes/image-hdd.bbclass
@@ -29,32 +29,17 @@ SYSLINUX_PROMPT = "0"
 SYSLINUX_TIMEOUT = "1"
 SYSLINUX_LABELS = "boot"
 LABELS_append = " ${SYSLINUX_LABELS} "
+SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200"
 
 inherit image_types boot-directdisk
 
 create_hdd_image () {
-	ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
+	ln -fs ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
 }
 
 python do_hddimg() {
         bb.build.exec_func('create_hdd_image', d)
 }
 
-python build_syslinux_cfg_append () {
-    import re
-
-    try:
-        cfgfile = file(cfile, 'r+')
-    except OSError:
-        raise bb.build.funcFailed('Unable to open %s' % (cfile))
-
-    f_content = cfgfile.read()
-    f_content = re.sub('tty0', 'ttyS0,115200', f_content)
-
-    cfgfile.seek(0)
-    cfgfile.write(f_content)
-    cfgfile.close()
-}
-
 addtask hddimg after do_bootdirectdisk before do_build
 do_hddimg[nostamp] = "1"
-- 
cgit v1.2.3-54-g00ecf