|
 |
31004e6 |
From d6ab257f56d41f230ba4a5697177ba9c0e8c685a Mon Sep 17 00:00:00 2001
|
|
|
31004e6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
Date: Fri, 12 Apr 2013 14:52:05 +0200
|
|
|
f74b50e |
Subject: [PATCH 288/482] * tests/util/grub-shell.in: Fix it on powerpc.
|
|
|
31004e6 |
|
|
|
31004e6 |
---
|
|
|
31004e6 |
ChangeLog | 4 ++++
|
|
|
31004e6 |
tests/util/grub-shell.in | 9 +++++++--
|
|
|
31004e6 |
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
31004e6 |
index 1c77abf..109bb4c 100644
|
|
|
31004e6 |
--- a/ChangeLog
|
|
|
31004e6 |
+++ b/ChangeLog
|
|
|
31004e6 |
@@ -1,5 +1,9 @@
|
|
|
31004e6 |
2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
|
|
|
31004e6 |
+ * tests/util/grub-shell.in: Fix it on powerpc.
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
+
|
|
|
31004e6 |
Turn off QEMU ACPI-way since new releases don't have shutdown port
|
|
|
31004e6 |
anymore.
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
|
|
|
31004e6 |
index c6d1cd7..e467b4a 100644
|
|
|
31004e6 |
--- a/tests/util/grub-shell.in
|
|
|
31004e6 |
+++ b/tests/util/grub-shell.in
|
|
|
31004e6 |
@@ -198,8 +198,13 @@ cfgfile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
|
|
|
31004e6 |
cat <<EOF >${cfgfile}
|
|
|
31004e6 |
grubshell=yes
|
|
|
31004e6 |
insmod serial
|
|
|
31004e6 |
+EOF
|
|
|
31004e6 |
+if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ]; then
|
|
|
31004e6 |
+ echo insmod escc >>${cfgfile}
|
|
|
31004e6 |
+fi
|
|
|
31004e6 |
+cat <<EOF >>${cfgfile}
|
|
|
31004e6 |
serial ${serial_port}
|
|
|
31004e6 |
-terminfo serial_${serial_port} dumb
|
|
|
31004e6 |
+terminfo -g 255x255 serial_${serial_port} dumb
|
|
|
31004e6 |
terminal_input serial_${serial_port}
|
|
|
31004e6 |
terminal_output serial_${serial_port}
|
|
|
31004e6 |
EOF
|
|
|
31004e6 |
@@ -228,7 +233,7 @@ echo "${halt_cmd}" >>${cfgfile}
|
|
|
31004e6 |
|
|
|
31004e6 |
isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
|
|
|
31004e6 |
if [ x$boot != xnet ]; then
|
|
|
31004e6 |
- pkgdatadir="@builddir@" sh "@builddir@/grub-mkrescue" "--grub-mkimage=${builddir}/grub-mkimage" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \
|
|
|
31004e6 |
+ pkgdatadir="@builddir@" sh "@builddir@/grub-mkrescue" "--grub-mkimage=${builddir}/grub-mkimage" "--grub-render-label=${builddir}/grub-render-label" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \
|
|
|
31004e6 |
--rom-directory="${rom_directory}" \
|
|
|
31004e6 |
"/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \
|
|
|
31004e6 |
${files} >/dev/null 2>&1
|
|
|
31004e6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
31004e6 |
|