* util/grub-mkimage.c (main): Handle special naming of yeeloong

	directory.

diff --git a/ChangeLog b/ChangeLog
index bc44fb07862125436ce79f4eeeaf7ef106d71eaf..569060ec8d32c3a5210cd4095b7e6d39d8fd10fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mkimage.c (main): Handle special naming of yeeloong
+       directory.
+
 2011-04-08  Colin Watson  <cjwatson@ubuntu.com>
 
        * docs/grub-dev.texi: Fix spelling of "developer" throughout.

diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 876e9c9b289bb4403cf9d054581181bcc96af7f5..70c5ef6a92f0622044db05846ceacbc67631ce0c 100644 (file)
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -1588,9 +1588,19 @@ main (int argc, char *argv[])
                     + 1);
       memcpy (dir, GRUB_PKGLIBROOTDIR, sizeof (GRUB_PKGLIBROOTDIR) - 1);
       *(dir + sizeof (GRUB_PKGLIBROOTDIR) - 1) = '/';
-      memcpy (dir + sizeof (GRUB_PKGLIBROOTDIR), image_target->name,
-             last - image_target->name);
-      *(dir + sizeof (GRUB_PKGLIBROOTDIR) + (last - image_target->name)) = 0;
+      if (strncmp (image_target->name, "mipsel-yeeloong",
+                  last - image_target->name) == 0)
+       {
+         memcpy (dir + sizeof (GRUB_PKGLIBROOTDIR), "mips-yeeloong",
+                 sizeof ("mips-yeeloong"));      
+       }
+      else
+       {
+         memcpy (dir + sizeof (GRUB_PKGLIBROOTDIR), image_target->name,
+                 last - image_target->name);
+         *(dir + sizeof (GRUB_PKGLIBROOTDIR) + (last - image_target->name))
+           = 0;
+       }
     }
 
   generate_image (dir, prefix ? : DEFAULT_DIRECTORY, fp,