On Fri, May 11, 2007 at 06:03:14PM +0200, Robert Millan wrote: > diff -Nur grub2-1.95+20070507.old/conf/i386-efi.rmk > grub2-1.95+20070507/conf/i386-efi.rmk > --- grub2-1.95+20070507.old/conf/i386-efi.rmk 2007-05-11 17:45:18.000000000 > +0200 > +++ grub2-1.95+20070507/conf/i386-efi.rmk 2007-05-11 17:57:19.000000000 > +0200 > @@ -6,7 +6,7 @@ > > # Utilities. > bin_UTILITIES = grub-mkimage > -#sbin_UTILITIES = grub-setup grub-mkdevicemap grub-probe > +sbin_UTILITIES = grub-mkdevicemap grub-probe
grub-probe is needed to check partmap (so we don't have to assume gpt). grub-mkdevicemap is needed to create device.map, without which grub-probe won't work. > diff -Nur grub2-1.95+20070507.old/util/i386/efi/grub-install.in > grub2-1.95+20070507/util/i386/efi/grub-install.in > --- grub2-1.95+20070507.old/util/i386/efi/grub-install.in 1970-01-01 > 01:00:00.000000000 +0100 > +++ grub2-1.95+20070507/util/i386/efi/grub-install.in 2007-05-11 > 18:00:44.000000000 +0200 Note: this grub-install.in is based on the i386/pc version. I tried to keep changes minimal, so if you diff them it'll produce readable output. One thing that I'm not sure about is the CLI inconsistency. Perhaps it shouldn't take the directory as a standalone parameter, and instead use --root-directory? > diff -Nur grub2-1.95+20070507.old/util/i386/pc/biosdisk.c > grub2-1.95+20070507/util/i386/pc/biosdisk.c > --- grub2-1.95+20070507.old/util/i386/pc/biosdisk.c 2007-05-11 > 17:45:18.000000000 +0200 > +++ grub2-1.95+20070507/util/i386/pc/biosdisk.c 2007-05-11 > 17:57:19.000000000 +0200 > @@ -18,7 +18,7 @@ > * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > -#include <grub/machine/biosdisk.h> > +#include <grub/i386/pc/biosdisk.h> > #include <grub/disk.h> > #include <grub/partition.h> > #include <grub/pc_partition.h> > diff -Nur grub2-1.95+20070507.old/util/i386/pc/grub-probe.c > grub2-1.95+20070507/util/i386/pc/grub-probe.c > --- grub2-1.95+20070507.old/util/i386/pc/grub-probe.c 2007-05-11 > 17:45:18.000000000 +0200 > +++ grub2-1.95+20070507/util/i386/pc/grub-probe.c 2007-05-11 > 17:57:19.000000000 +0200 > @@ -26,7 +26,7 @@ > #include <grub/fs.h> > #include <grub/partition.h> > #include <grub/pc_partition.h> > -#include <grub/machine/util/biosdisk.h> > +#include <grub/i386/pc/util/biosdisk.h> > #include <grub/util/getroot.h> > #include <grub/term.h> Not really sure about these. Seems ugly, but biosdisk.h has the grub_util_biosdisk_get_grub_dev definition, which is not really i386/pc-specific. Also, note that powerpc needs them as well if we want update-grub to work there (haven't submitted this part, because it grub-probe on powerpc has other issues that I cannot debug). -- Robert Millan My spam trap is [EMAIL PROTECTED] Note: this address is only intended for spam harvesters. Writing to it will get you added to my black list. _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel
