2008-09-07 Robert Millan
* conf/i386-pc.rmk (grub_mkdevicemap_SOURCES): Remove `util/i386/get_disk_name.c'. * conf/i386-efi.rmk: Likewise. * conf/x86_64-efi.rmk: Likewise. * conf/i386-coreboot.rmk: Likewise. * conf/i386-ieee1275.rmk: Likewise. * conf/powerpc-ieee1275.rmk (grub_mkdevicemap_SOURCES): Remove `util/ieee1275/get_disk_name.c'. * include/grub/util/misc.h (grub_util_get_disk_name): Remove. * util/ieee1275/get_disk_name.c: Remove file. * util/i386/get_disk_name.c: Remove file. * util/grub-mkdevicemap.c (make_device_map): Back to hardcoding "hd%d" for device.map entries, rather than using grub_util_get_disk_name(). Index: conf/i386-pc.rmk =================================================================== --- conf/i386-pc.rmk (revision 1857) +++ conf/i386-pc.rmk (working copy) @@ -108,8 +108,7 @@ grub_setup_SOURCES = util/i386/pc/grub-s grub_setup_init.c # For grub-mkdevicemap. -grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \ - util/i386/get_disk_name.c +grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c # For grub-emu. util/grub-emu.c_DEPENDENCIES = grub_emu_init.h Index: conf/i386-efi.rmk =================================================================== --- conf/i386-efi.rmk (revision 1857) +++ conf/i386-efi.rmk (working copy) @@ -28,8 +28,7 @@ util/i386/efi/grub-mkimage.c_DEPENDENCIE # kern/fs.c kern/env.c fs/fshelp.c # For grub-mkdevicemap. -grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \ - util/i386/get_disk_name.c +grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c # For grub-emu. util/grub-emu.c_DEPENDENCIES = grub_emu_init.h Index: conf/x86_64-efi.rmk =================================================================== --- conf/x86_64-efi.rmk (revision 1857) +++ conf/x86_64-efi.rmk (working copy) @@ -30,8 +30,7 @@ grub_mkimage_SOURCES = util/i386/efi/gru # kern/fs.c kern/env.c fs/fshelp.c # For grub-mkdevicemap. -grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \ - util/i386/get_disk_name.c +grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c # For grub-emu. util/grub-emu.c_DEPENDENCIES = grub_emu_init.h Index: conf/i386-coreboot.rmk =================================================================== --- conf/i386-coreboot.rmk (revision 1857) +++ conf/i386-coreboot.rmk (working copy) @@ -51,8 +51,7 @@ sbin_UTILITIES += grub-emu endif # For grub-mkdevicemap. -grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \ - util/i386/get_disk_name.c +grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c # For grub-emu. util/grub-emu.c_DEPENDENCIES = grub_emu_init.h Index: conf/powerpc-ieee1275.rmk =================================================================== --- conf/powerpc-ieee1275.rmk (revision 1856) +++ conf/powerpc-ieee1275.rmk (working copy) @@ -34,8 +34,7 @@ sbin_UTILITIES += grub-emu endif # For grub-mkdevicemap. -grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \ - util/ieee1275/get_disk_name.c +grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c # For grub-emu util/grub-emu.c_DEPENDENCIES = grub_emu_init.h Index: conf/i386-ieee1275.rmk =================================================================== --- conf/i386-ieee1275.rmk (revision 1857) +++ conf/i386-ieee1275.rmk (working copy) @@ -48,8 +48,7 @@ sbin_UTILITIES += grub-emu endif # For grub-mkdevicemap. -grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \ - util/i386/get_disk_name.c +grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c # For grub-emu. util/grub-emu.c_DEPENDENCIES = grub_emu_init.h Index: include/grub/util/misc.h =================================================================== --- include/grub/util/misc.h (revision 1856) +++ include/grub/util/misc.h (working copy) @@ -56,7 +56,6 @@ void grub_util_load_image (const char *p void grub_util_write_image (const char *img, size_t size, FILE *out); void grub_util_write_image_at (const void *img, size_t size, off_t offset, FILE *out); -char *grub_util_get_disk_name (int disk, char *name); #ifndef HAVE_ASPRINTF Index: util/ieee1275/get_disk_name.c =================================================================== --- util/ieee1275/get_disk_name.c (revision 1856) +++ util/ieee1275/get_disk_name.c (working copy) @@ -1,61 +0,0 @@ -/* get_disk_name.c */ -/* - * GRUB -- GRand Unified Bootloader - * Copyright (C) 2007 Free Software Foundation, Inc. - * - * GRUB is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * GRUB is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GRUB. If not, see