diff options
author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-03 13:43:33 +0200 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-03 13:43:45 +0200 |
commit | 9267402ba44b7a68f871a6161736732e78d6c04d (patch) | |
tree | db194934f710eb905d36dbd4ef7406680c15342c /classes | |
parent | 43102d40e3d72d8ec26e243a3cf8584dd4336cfe (diff) | |
parent | 4caaf27fd9b82092b0e4f378806be348b9aa61fe (diff) | |
download | meta-boot2qt-9267402ba44b7a68f871a6161736732e78d6c04d.tar.gz |
Merge branch 'dev' into stable
Change-Id: If10d6f6512c79e1ede5a308a100e7f43b757a3ab
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image-hdd.bbclass | 19 |
1 files changed, 2 insertions, 17 deletions
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" | |||
29 | SYSLINUX_TIMEOUT = "1" | 29 | SYSLINUX_TIMEOUT = "1" |
30 | SYSLINUX_LABELS = "boot" | 30 | SYSLINUX_LABELS = "boot" |
31 | LABELS_append = " ${SYSLINUX_LABELS} " | 31 | LABELS_append = " ${SYSLINUX_LABELS} " |
32 | SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" | ||
32 | 33 | ||
33 | inherit image_types boot-directdisk | 34 | inherit image_types boot-directdisk |
34 | 35 | ||
35 | create_hdd_image () { | 36 | create_hdd_image () { |
36 | ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd | 37 | ln -fs ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd |
37 | } | 38 | } |
38 | 39 | ||
39 | python do_hddimg() { | 40 | python do_hddimg() { |
40 | bb.build.exec_func('create_hdd_image', d) | 41 | bb.build.exec_func('create_hdd_image', d) |
41 | } | 42 | } |
42 | 43 | ||
43 | python build_syslinux_cfg_append () { | ||
44 | import re | ||
45 | |||
46 | try: | ||
47 | cfgfile = file(cfile, 'r+') | ||
48 | except OSError: | ||
49 | raise bb.build.funcFailed('Unable to open %s' % (cfile)) | ||
50 | |||
51 | f_content = cfgfile.read() | ||
52 | f_content = re.sub('tty0', 'ttyS0,115200', f_content) | ||
53 | |||
54 | cfgfile.seek(0) | ||
55 | cfgfile.write(f_content) | ||
56 | cfgfile.close() | ||
57 | } | ||
58 | |||
59 | addtask hddimg after do_bootdirectdisk before do_build | 44 | addtask hddimg after do_bootdirectdisk before do_build |
60 | do_hddimg[nostamp] = "1" | 45 | do_hddimg[nostamp] = "1" |