46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
From 46692dc0b5469f5e14becefe48f5e329caf33bd3 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
Date: Wed, 24 Apr 2013 18:56:47 +0200
|
|
Subject: [PATCH 344/482] * util/grub-mkrescue.in: Alias sashARCS as
|
|
sash.
|
|
|
|
---
|
|
ChangeLog | 4 ++++
|
|
util/grub-mkrescue.in | 4 ++--
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 6c27f76..bdaba2b 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,5 +1,9 @@
|
|
2013-04-24 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
|
+ * util/grub-mkrescue.in: Alias sashARCS as sash.
|
|
+
|
|
+2013-04-24 Vladimir Serbinenko <phcoder@gmail.com>
|
|
+
|
|
* grub-core/term/arc/console.c: Assume that console is 80x24 vt100 if
|
|
it's serial.
|
|
|
|
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
|
|
index 634318b..22b9cf0 100644
|
|
--- a/util/grub-mkrescue.in
|
|
+++ b/util/grub-mkrescue.in
|
|
@@ -484,10 +484,10 @@ fi
|
|
|
|
make_image "${arcs_dir}" mips-arc "${iso9660_dir}/boot/grub/mips-arc/core.img" ""
|
|
if [ -e "${iso9660_dir}/boot/grub/mips-arc/core.img" ]; then
|
|
- grub_mkisofs_arguments="${grub_mkisofs_arguments} /boot/grub/mips-arc/grub=${iso9660_dir}/boot/grub/mips-arc/core.img /boot/grub/mips-arc/sashARCS=${iso9660_dir}/boot/grub/mips-arc/core.img"
|
|
+ grub_mkisofs_arguments="${grub_mkisofs_arguments} /boot/grub/mips-arc/grub=${iso9660_dir}/boot/grub/mips-arc/core.img /boot/grub/mips-arc/sashARCS=${iso9660_dir}/boot/grub/mips-arc/core.img /boot/grub/mips-arc/sash=${iso9660_dir}/boot/grub/mips-arc/core.img"
|
|
fi
|
|
if [ -e "${iso9660_dir}/boot/grub/mips-arc/core.img" ] && [ "$system_area" = arcs ]; then
|
|
- grub_mkisofs_arguments="${grub_mkisofs_arguments} -mips-boot /boot/grub/mips-arc/sashARCS -mips-boot /boot/grub/mips-arc/grub"
|
|
+ grub_mkisofs_arguments="${grub_mkisofs_arguments} -mips-boot /boot/grub/mips-arc/sashARCS -mips-boot /boot/grub/mips-arc/sash -mips-boot /boot/grub/mips-arc/grub"
|
|
fi
|
|
|
|
make_image "${mipsel_qemu_dir}" mipsel-qemu_mips-elf "${iso9660_dir}/boot/mipsel-qemu_mips.elf" "pata"
|
|
--
|
|
1.8.2.1
|
|
|