Remove leftover embedding of font objects.

	* include/grub/kernel.h (OBJ_TYPE_FONT): Removed.
	* util/grub-install.in (font): Removed.
	* util/grub-mkimage.c (generate_image): Remove font support. All users
	updated.

diff --git a/ChangeLog b/ChangeLog
index 1a0085d9a67bd4d82c19d91e01064d66a24a0107..869bd420b062c10cb2f2e00e8aaa5f8b3a0c163b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Remove leftover embedding of font objects.
+
+       * include/grub/kernel.h (OBJ_TYPE_FONT): Removed.
+       * util/grub-install.in (font): Removed.
+       * util/grub-mkimage.c (generate_image): Remove font support. All users
+       updated.
+
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * docs/grub.texi (Network): Fix reference to pxe_blksize.

diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index fed875db15334ce1c9c31c789cbd3c2458c51614..2ecc73df4fe2e02b63d33232ab61770e283048c1 100644 (file)
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -26,8 +26,7 @@ enum
 {
   OBJ_TYPE_ELF,
   OBJ_TYPE_MEMDISK,
-  OBJ_TYPE_CONFIG,
-  OBJ_TYPE_FONT
+  OBJ_TYPE_CONFIG
 };
 
 /* The module header.  */

diff --git a/util/grub-install.in b/util/grub-install.in
index 4a5b5a1c3ad04766612d9db2f622c1324a55924c..e6521f069e9f7e017571cac94432d46baf54d9f3 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -30,7 +30,6 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 platform=@platform@
 host_os=@host_os@
-font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 localedir=@datadir@/locale
 
@@ -84,11 +83,6 @@ if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
     cat <<EOF
   --disk-module=MODULE    disk module to use
 EOF
-fi
-if [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
-    cat <<EOF
-  --font=FILE             font file to use
-EOF
 fi
     cat <<EOF
 
@@ -134,10 +128,11 @@ do
     --modules=*)
        modules=`echo "$option" | sed 's/--modules=//'` ;;
 
+# Accept and ignore for compatibility
     --font)
-       font=`argument $option "$@"`; shift;;
+        shift;;
     --font=*)
-       font=`echo "$option" | sed 's/--font=//'` ;;
+       ;;
 
     --root-directory)
        rootdir=`argument $option "$@"`; shift;;
@@ -415,7 +410,7 @@ if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}"
     $grub_setup ${setup_verbose} ${setup_force} --directory=${grubdir} --device-map=${device_map} \
         ${install_device} || exit 1
 elif [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
-    $grub_mkimage ${config_opt} -f ${font} -d ${pkglibdir} -O ${mkimage_target} --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
+    $grub_mkimage ${config_opt} -d ${pkglibdir} -O ${mkimage_target} --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 else
     $grub_mkimage -O ${mkimage_target} ${config_opt} -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 fi

diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 38c530b91714e2c105b852bb06461bdda341a46a..0e82afae9e00c925910427a7fc6517d787d4e85b 100644 (file)
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -507,12 +507,12 @@ struct fixup_block_list
 
 static void
 generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
-               char *memdisk_path, char *font_path, char *config_path,
+               char *memdisk_path, char *config_path,
                struct image_target_desc *image_target, int note)
 {
   char *kernel_img, *core_img;
   size_t kernel_size, total_module_size, core_size, exec_size;
-  size_t memdisk_size = 0, font_size = 0, config_size = 0, config_size_pure = 0;
+  size_t memdisk_size = 0, config_size = 0, config_size_pure = 0;
   char *kernel_path;
   size_t offset;
   struct grub_util_path_list *path_list, *p, *next;
@@ -536,12 +536,6 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       total_module_size += memdisk_size + sizeof (struct grub_module_header);
     }
 
-  if (font_path)
-    {
-      font_size = ALIGN_ADDR (grub_util_get_image_size (font_path));
-      total_module_size += font_size + sizeof (struct grub_module_header);
-    }
-
   if (config_path)
     {
       config_size_pure = grub_util_get_image_size (config_path) + 1;
@@ -625,20 +619,6 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       offset += memdisk_size;
     }
 
-  if (font_path)
-    {
-      struct grub_module_header *header;
-
-      header = (struct grub_module_header *) (kernel_img + offset);
-      memset (header, 0, sizeof (struct grub_module_header));
-      header->type = grub_host_to_target32 (OBJ_TYPE_FONT);
-      header->size = grub_host_to_target32 (font_size + sizeof (*header));
-      offset += sizeof (*header);
-
-      grub_util_load_image (font_path, kernel_img + offset);
-      offset += font_size;
-    }
-
   if (config_path)
     {
       struct grub_module_header *header;
@@ -1241,7 +1221,6 @@ Make a bootable image of GRUB.\n\
   -d, --directory=DIR     use images and modules under DIR [default=%s/@platform@]\n\
   -p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
   -m, --memdisk=FILE      embed FILE as a memdisk image\n\
-  -f, --font=FILE         embed FILE as a boot font\n\
   -c, --config=FILE       embed FILE as boot config\n\
   -n, --note              add NOTE segment for CHRP Open Firmware\n\
   -o, --output=FILE       output a generated image to FILE [default=stdout]\n\
@@ -1330,13 +1309,6 @@ main (int argc, char *argv[])
            prefix = xstrdup ("(memdisk)/boot/grub");
            break;
 
-         case 'f':
-           if (font)
-             free (font);
-
-           font = xstrdup (optarg);
-           break;
-
          case 'c':
            if (config)
              free (config);
@@ -1401,7 +1373,7 @@ main (int argc, char *argv[])
     }
 
   generate_image (dir, prefix ? : DEFAULT_DIRECTORY, fp,
-                 argv + optind, memdisk, font, config,
+                 argv + optind, memdisk, config,
                  image_target, note);
 
   fclose (fp);