]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
* configure.ac: Check for Linux device-mapper support.
authorColin Watson <cjwatson@ubuntu.com>
Tue, 18 May 2010 11:33:35 +0000 (12:33 +0100)
committerColin Watson <cjwatson@ubuntu.com>
Tue, 18 May 2010 11:33:35 +0000 (12:33 +0100)
* util/hostdisk.c (device_is_mapped): New function.
(find_partition_start): New function, partly broken out from
linux_find_partition and grub_util_biosdisk_get_grub_dev but with
device-mapper support added.
(linux_find_partition): Use find_partition_start.
(convert_system_partition_to_system_disk): Add `st' argument.
Support Linux /dev/mapper/* devices if device-mapper support is
available; only DM-RAID devices are understood at present.
(find_system_device): Add `st' argument.  Pass it to
convert_system_partition_to_system_disk.
(grub_util_biosdisk_get_grub_dev): Pass stat result to
find_system_device and convert_system_partition_to_system_disk.  Use
find_partition_start.
* conf/common.rmk (grub_mkdevicemap_SOURCES): Add kern/env.c,
kern/err.c, kern/list.c, kern/misc.c, and kern/emu/mm.c.
* util/deviceiter.c [__linux__]: Define MINOR.
(grub_util_iterate_devices): Add support for DM-RAID disk devices.
* util/mkdevicemap.c (grub_putchar): New function.
(grub_getkey): New function.
(grub_refresh): New function.
(main): Set debug=all if -v -v is used.

1  2 
ChangeLog
conf/common.rmk
configure.ac

diff --cc ChangeLog
index a3050ee079d6bded60810a88cf7e6cef196aa1f7,8c3bd0ed4ca1f607b89c21cd393af18c2b739fda..89526d020cbf4810bacbc4fad677738572b2bbbe
+++ b/ChangeLog
++2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
++
++      * configure.ac: Check for Linux device-mapper support.
++
++      * util/hostdisk.c (device_is_mapped): New function.
++      (find_partition_start): New function, partly broken out from
++      linux_find_partition and grub_util_biosdisk_get_grub_dev but with
++      device-mapper support added.
++      (linux_find_partition): Use find_partition_start.
++      (convert_system_partition_to_system_disk): Add `st' argument.
++      Support Linux /dev/mapper/* devices if device-mapper support is
++      available; only DM-RAID devices are understood at present.
++      (find_system_device): Add `st' argument.  Pass it to
++      convert_system_partition_to_system_disk.
++      (grub_util_biosdisk_get_grub_dev): Pass stat result to
++      find_system_device and convert_system_partition_to_system_disk.  Use
++      find_partition_start.
++
++      * conf/common.rmk (grub_mkdevicemap_SOURCES): Add kern/env.c,
++      kern/err.c, kern/list.c, kern/misc.c, and kern/emu/mm.c.
++      * util/deviceiter.c [__linux__]: Define MINOR.
++      (grub_util_iterate_devices): Add support for DM-RAID disk devices.
++      * util/mkdevicemap.c (grub_putchar): New function.
++      (grub_getkey): New function.
++      (grub_refresh): New function.
++      (main): Set debug=all if -v -v is used.
++
 +2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
 +
 +      Fix build with non-GNU libcs.
 +
 +      * util/misc.c (canonicalize_file_name): Move to ...
 +      * kern/emu/misc.c (canonicalize_file_name): ... here.  Needed by
 +      grub_make_system_path_relative_to_its_root.
 +
 +2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
 +
 +      * util/grub-mkrescue.in: Sync up with grub-install in terms of how
 +      we handle finding grub-mkimage.  Default to finding grub-mkimage in
 +      ${bindir} with program_transform_name applied, and provide a
 +      --grub-mkimage option to override this.
 +
 +2010-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Remove grub-mkisofs.
 +
 +      * conf/common.rmk (bin_UTILITIES): Remove grub-mkisofs.
 +      (grub_mkisofs_SOURCES): Removed.
 +      (grub_mkisofs_CFLAGS): Removed.
 +      * util/mkisofs/defaults.h: Removed.
 +      * util/mkisofs/eltorito.c: Likewise.
 +      * util/mkisofs/exclude.h: Likewise.
 +      * util/mkisofs/hash.c: Likewise.
 +      * util/mkisofs/include/: Likewise.
 +      * util/mkisofs/include/fctldefs.h: Likewise.
 +      * util/mkisofs/include/mconfig.h: Likewise.
 +      * util/mkisofs/include/prototyp.h: Likewise.
 +      * util/mkisofs/include/statdefs.h: Likewise.
 +      * util/mkisofs/iso9660.h: Likewise.
 +      * util/mkisofs/joliet.c: Likewise.
 +      * util/mkisofs/match.c: Likewise.
 +      * util/mkisofs/match.h: Likewise.
 +      * util/mkisofs/mkisofs.c: Likewise.
 +      * util/mkisofs/mkisofs.h: Likewise.
 +      * util/mkisofs/msdos_partition.h: Likewise.
 +      * util/mkisofs/multi.c: Likewise.
 +      * util/mkisofs/name.c: Likewise.
 +      * util/mkisofs/rock.c: Likewise.
 +      * util/mkisofs/tree.c: Likewise.
 +      * util/mkisofs/write.c: Likewise.
 +
 +2010-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Unify grub-mkimage accross platforms.
 +
 +      * Makefile.in (CPPFLAGS): Set GRUB_LIBDIR to $(libdir).
 +      * conf/common.rmk (bin_UTILITIES): Removed grub-mkelfimage.
 +      (grub_mkelfimage_SOURCES): Removed.
 +      (util/elf/grub-mkimage.c_DEPENDENCIES): Renamed to ..
 +      (util/grub-mkimage.c_DEPENDENCIES): .. this.
 +      (bin_UTILITIES): Add grub-mkimage.
 +      (grub_mkimage_SOURCES): New variable.
 +      (kernel_img_HEADERS): Remove machine/kernel.h.
 +      * conf/i386-pc.rmk (pkglib_IMAGES): Remove kernel.img.
 +      (pkglib_PROGRAMS): Add kernel.img.
 +      (kernel_img_HEADERS): Add machine/kernel.h.
 +      (kernel_img_FORMAT): Removed.
 +      (bin_UTILITIES): Remove grub-mkimage.
 +      (grub_mkimage_SOURCES): Removed.
 +      (grub_mkimage_CFLAGS): Likewise.
 +      (util/grub-mkrawimage.c_DEPENDENCIES): Likewise.
 +      * conf/i386-qemu.rmk (pkglib_IMAGES): Remove kernel.img.
 +      (pkglib_PROGRAMS): Add kernel.img.
 +      (bin_UTILITIES): Remove grub-mkimage.
 +      (grub_mkimage_SOURCES): Removed.
 +      (grub_mkimage_CFLAGS): Likewise.
 +      (util/grub-mkrawimage.c_DEPENDENCIES): Likewise.
 +      * conf/mips-qemu-mips.rmk (pkglib_IMAGES): Remove kernel.img.
 +      (pkglib_PROGRAMS): Add kernel.img.
 +      * conf/mips-yeeloong.rmk (pkglib_IMAGES): Remove kernel.img.
 +      (pkglib_PROGRAMS): Add kernel.img.
 +      * conf/mips.rmk (bin_UTILITIES): Remove grub-mkimage.
 +      (grub_mkimage_SOURCES): Removed.
 +      (grub_mkimage_CFLAGS): Likewise.
 +      (util/grub-mkrawimage.c_DEPENDENCIES): Likewise.
 +      * conf/sparc64-ieee1275.rmk (pkglib_IMAGES): Remove kernel.img.
 +      (pkglib_PROGRAMS): Add kernel.img.
 +      (bin_UTILITIES): Remove grub-mkimage.
 +      (grub_mkimage_SOURCES): Removed.
 +      (grub_mkimage_CFLAGS): Likewise.
 +      (util/grub-mkrawimage.c_DEPENDENCIES): Likewise.
 +      * conf/x86-efi.rmk (bin_UTILITIES): Remove grub-mkimage.
 +      (grub_mkimage_SOURCES): Removed.
 +      (grub_mkimage_CFLAGS): Likewise.
 +      (util/grub-mkrawimage.c_DEPENDENCIES): Likewise.
 +      * configure.ac (machine_CFLAGS): Add "-DMACHINE".
 +      * include/grub/efi/pe32.h (grub_pe32_optional_header): Split into ...
 +      (grub_pe32_optional_header): ... this.
 +      (grub_pe64_optional_header): ... and this. All users updated.
 +      (GRUB_PE32_PE32_MAGIC): Split into ..
 +      (GRUB_PE32_PE32_MAGIC): .. this.
 +      (GRUB_PE32_PE64_MAGIC): .. and this.
 +      (GRUB_PE32_SIGNATURE_SIZE): New definition.
 +      * include/grub/elf.h (PT_GNU_STACK): New definition.
 +      * include/grub/i386/coreboot/kernel.h: Merged into include/grub/offsets.h. All users updated.
 +      * include/grub/i386/efi/kernel.h: Likewise.
 +      * include/grub/i386/kernel.h: Likewise.
 +      * include/grub/i386/pc/kernel.h: Likewise.
 +      * include/grub/i386/qemu/boot.h: Likewise.
 +      * include/grub/mips/kernel.h: Likewise.
 +      * include/grub/mips/qemu-mips/kernel.h: Likewise.
 +      * include/grub/powerpc/ieee1275/kernel.h: Likewise.
 +      * include/grub/powerpc/kernel.h: Likewise.
 +      * include/grub/sparc64/ieee1275/boot.h: Likewise.
 +      * include/grub/sparc64/ieee1275/kernel.h: Likewise.
 +      * include/grub/sparc64/kernel.h: Likewise.
 +      * include/grub/x86_64/efi/kernel.h: Likewise.
 +      * include/grub/x86_64/kernel.h: Likewise.
 +      * include/grub/offsets.h: New file.
 +      * include/grub/kernel.h (grub_module_info): Split into ...
 +      (grub_module_info32): ... this.
 +      (grub_module_info64): ... and this.
 +      * include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_KERNEL_SEG): Moved from here ...
 +      * include/grub/offsets.h (GRUB_BOOT_I386_PC_KERNEL_SEG): ... here.
 +      (grub_boot_blocklist): Moved from here ...
 +      * include/grub/offsets.h (grub_pc_bios_boot_blocklist): ... here.
 +      * include/grub/i386/pc/memory.h (GRUB_MEMORY_MACHINE_UPPER): Moved from here.
 +      * include/grub/offsets.h (GRUB_MEMORY_I386_PC_UPPER): .. here.
 +      * include/grub/types.h (grub_target_to_host16): Removed.
 +      (grub_target_to_host32): Likewise.
 +      (grub_target_to_host64): Likewise.
 +      (grub_host_to_target16): Likewise.
 +      (grub_host_to_target32): Likewise.
 +      (grub_host_to_target64): Likewise.
 +      (grub_host_to_target_addr): Likewise.
 +
 +      Support grub-mkrescue for efi, coreboot and qemu.
 +
 +      * conf/x86-efi.rmk (bin_SCRIPTS): Add grub-mkrescue.
 +      * kern/efi/init.c (grub_efi_set_prefix): Handle baked in prefix.
 +      * util/elf/grub-mkimage.c: Merged into util/grub-mkimage.c.
 +      * util/grub-mkrawimage.c: Moved from here ...
 +      * util/grub-mkimage.c: ... here. All users updated.
 +      (ALIGN_ADDR): Use image_target.
 +      (TARGET_NO_FIELD): New const.
 +      (image_target_desc): New type.
 +      (image_targets): New array.
 +      (grub_target_to_host64): Use image_target.
 +      (grub_target_to_host32): Likewise.
 +      (grub_target_to_host16): Likewise.
 +      (grub_host_to_target64): Likewise.
 +      (grub_host_to_target32): Likewise.
 +      (grub_host_to_target16): Likewise.
 +      (grub_host_to_target_addr): Likewise.
 +      (generate_image): Handle multiimage.
 +      (main): Require -O parameter. All users updated.
 +      * util/grub-mkimagexx.c: New file. Based on util/grub-mkrawimage.c and
 +      util/efi/grub-mkimage.c
 +      * util/grub-mkrescue.in: Handle coreboot, efi and qemu.
 +      New option --rom-directory.
 +      Use xorriso.
 +      * util/i386/efi/grub-mkimage.c: Removed.
 +      * util/i386/pc/grub-setup.c (grub_target_to_host16): New definition.
 +      (grub_target_to_host32): Likewise.
 +      (grub_target_to_host64): Likewise.
 +      (grub_host_to_target16): Likewise.
 +      (grub_host_to_target32): Likewise.
 +      (grub_host_to_target64): Likewise.
 +      * util/sparc64/ieee1275/grub-setup.c (grub_target_to_host16): New definition.
 +      (grub_target_to_host32): Likewise.
 +      (grub_target_to_host64): Likewise.
 +      (grub_host_to_target16): Likewise.
 +      (grub_host_to_target32): Likewise.
 +      (grub_host_to_target64): Likewise.
 +
  2010-05-17  BVK Chaitanya  <bvk.groups@gmail.com>
  
        Source tree is reorganized for emu build.
diff --cc conf/common.rmk
Simple merge
diff --cc configure.ac
Simple merge