2009-05-03 Pavel Roskin <proski@gnu.org>

	* util/i386/pc/grub-mkrescue.in: Allow for the case when
	efiemu??.o doesn't exist.
	* util/i386/pc/grub-install.in: Likewise.  Use "cp -f" for
	copying.

diff --git a/ChangeLog b/ChangeLog
index 2cf8f8f298ddbd92d1c16a1596aba327d57833f3..e42bc5684ed71745956aa927fb6e79be5134f43b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-03  Pavel Roskin  <proski@gnu.org>
+
+       * util/i386/pc/grub-mkrescue.in: Allow for the case when
+       efiemu??.o doesn't exist.
+       * util/i386/pc/grub-install.in: Likewise.  Use "cp -f" for
+       copying.
+
 2009-05-03  Bean  <bean123ch@gmail.com> Vladimir Serbinenko <phcoder@gmail.com>
 
        FreeBSD 64-bit support

diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in
index 31c2dc7fdd4a6ab88d4e5a8b97a5c3ba7a4792e4..e4724f94e7fbfc73f2ace3005ec35969a553215d 100644 (file)
--- a/util/i386/pc/grub-install.in
+++ b/util/i386/pc/grub-install.in
@@ -221,7 +221,9 @@ for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst; do
 done
 if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
     for file in ${pkglibdir}/*.img ${pkglibdir}/efiemu??.o; do
-        cp -f $file ${grubdir} || exit 1
+       if test -f $file; then
+           cp -f $file ${grubdir} || exit 1
+       fi
     done
 fi
 

diff --git a/util/i386/pc/grub-mkrescue.in b/util/i386/pc/grub-mkrescue.in
index 7d28acd5196c9a6552d9b51224f68b13158f9d54..da937768b4545effc55f1536b9cb471a75817135 100644 (file)
--- a/util/i386/pc/grub-mkrescue.in
+++ b/util/i386/pc/grub-mkrescue.in
@@ -116,10 +116,13 @@ fi
 aux_dir=`mktemp -d`
 mkdir -p ${aux_dir}/boot/grub
 
-cp ${input_dir}/*.mod ${input_dir}/efiemu??.o \
+for file in ${input_dir}/*.mod ${input_dir}/efiemu??.o \
   ${input_dir}/command.lst ${input_dir}/moddep.lst ${input_dir}/fs.lst \
-  ${input_dir}/handler.lst ${input_dir}/parttool.lst  \
-  ${aux_dir}/boot/grub/
+  ${input_dir}/handler.lst ${input_dir}/parttool.lst; do
+  if test -f "$file"; then
+    cp -f "$file" ${aux_dir}/boot/grub/
+  fi
+done
 
 modules="biosdisk `cat ${input_dir}/partmap.lst` ${modules}"
 for i in ${modules} ; do