From 218610081a48f3cbaf2e42441cfe7182f1242fe5 Mon Sep 17 00:00:00 2001
From: Luigi Capriotti <l.capriotti@tiscali.it>
Date: Mon, 17 Jan 2011 09:55:29 +0100
Subject: Support for newer grub-common package.

A recent change in grub-common package (#584415) has mandated
the use of a destination format in calls to grub-mkimage, a
parameter that was not previously supported.
---
 scripts/build/lb_binary_iso | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index ca460c4..ad7357e 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -163,7 +163,14 @@ input_dir=/usr/lib/grub/i386-pc
 
 # build core.img
 core_img=\$(mktemp)
-grub-mkimage -d \${input_dir} -o \${core_img} biosdisk iso9660
+
+# first version requiring -O is 1.98+20100527, see #584415
+if [ "$(grub-mkimage --help | grep '\-O')" ]
+then
+	grub-mkimage -d \${input_dir} -o \${core_img} -O i386-pc biosdisk iso9660
+else
+	grub-mkimage -d \${input_dir} -o \${core_img} biosdisk iso9660
+fi
 
 # build grub_eltorito image
 cat \${input_dir}/cdboot.img \${core_img} > binary/boot/grub/grub_eltorito
-- 
cgit v1.0