vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
7118 commits 7 branches 0 tags 72 MiB
Commit graph

352 commits

Author SHA1 Message Date
Vladimir 'phcoder' Serbinenko
9f915872ef * configure.ac: Clean LIBS variable after tests. 2010-09-03 03:26:22 +02:00
Vladimir 'phcoder' Serbinenko
61d720e535 * configure.ac: Check for dm_log_with_errno_init in libdevmapper and 
echo if libdevmapper will be used.
 2010-09-03 00:53:41 +02:00
Vladimir 'phcoder' Serbinenko
6585de4c0c merge mainline into ia64 2010-08-31 21:47:26 +02:00
Vladimir 'phcoder' Serbinenko
16bd6cfab2 Merge mainline into newreloc. For now without boot tests 2010-08-25 03:25:18 +02:00
BVK Chaitanya
f7711f5ef1 final touches 2010-08-23 13:23:56 +05:30
BVK Chaitanya
5815f2c19a picks 10_${host_kernel} script 2010-08-21 21:03:26 +05:30
BVK Chaitanya
c721825b4f build fixes for mips and ieee1275 platforms 2010-08-21 17:11:40 +05:30
BVK Chaitanya
bdf0d62321 review comments 2010-08-21 09:48:27 +05:30
BVK Chaitanya
771111e53d fix COND_APPLE_CC definition 2010-08-20 13:00:11 +05:30
BVK Chaitanya
07daa815af better fix for setjmp module 2010-08-20 11:39:47 +05:30
BVK Chaitanya
34980574fc minor cleanups 2010-08-19 17:50:05 +05:30
BVK Chaitanya
16c7cb32c8 merge with mainline 2010-08-19 16:54:00 +05:30
BVK Chaitanya
62f7d20835 fixed grub-emu build 2010-08-18 20:25:16 +05:30
BVK Chaitanya
019be613d0 fixed distcheck 2010-08-18 16:53:11 +05:30
Colin Watson
51f1f5afab * configure.ac: Move AM_INIT_AUTOMAKE after AC_CANONICAL_TARGET to 
fix warnings from Autoconf.
 2010-08-18 11:15:08 +01:00
BVK Chaitanya
2b6c00842d distcheck almost done 2010-08-18 11:57:51 +05:30
BVK Chaitanya
76ed06b921 moved configure.common back to configure.ac 2010-08-17 19:41:43 +05:30
BVK Chaitanya
6304d29255 working copy, wo nested packaging 2010-08-17 19:03:22 +05:30
Robert Millan
d3dd9e80f6 2010-08-04 Robert Millan <rmh@gnu.org> 
* configure.ac: Remove checks for getfsstat() and getmntany().
	Add checks for `<sys/param.h>' and `<sys/mount.h>'.
	* kern/emu/misc.c [HAVE_GETMNTANY]: Remove `<sys/mnttab.h>'.
	[HAVE_SYS_PARAM_H]: Include `<sys/param.h>'.
	[HAVE_SYS_MOUNT_H]: Include `<sys/mount.h>'.
	[HAVE_LIBZFS && HAVE_LIBNVPAIR] (find_mount_point_from_dir): Remove
	function.
	(grub_find_zpool_from_dir): Use statfs() instead of indirect matching
	via find_mount_point_from_dir() and getfsstat() / getmntany().
 2010-08-04 14:45:58 +02:00
Robert Millan
62858144fe 2010-08-04 Robert Millan <rmh@gnu.org> 
Support OpenSolaris in ZFS device resolution.
	
	* configure.ac: Check for getmntany().
	* kern/emu/misc.c [HAVE_GETMNTANY]: Include `<sys/mnttab.h>'.
	[HAVE_GETMNTANY] (grub_find_zpool_from_mount_point): Add OpenSolaris
	support.
 2010-08-04 00:15:29 +02:00
Robert Millan
3169f4c76a 2010-07-31 Robert Millan <rmh@gnu.org> 
* configure.ac: Check for `libzfs.h' and `libnvpair.h'.
	
	* include/grub/util/libnvpair.h: Include `<config.h>'.
	[HAVE_LIBNVPAIR_H]: Include `<libnvpair.h>' instead of
	declaring libnvpair prototypes ourselves.
	* include/grub/util/libzfs.h: Include `<config.h>'.
	[HAVE_LIBZFS_H]: Include `<libzfs.h>' instead of
	declaring libzfs prototypes ourselves.
	
	(libzfs_handle): Moved to ...
	* include/grub/util/misc.h (libzfs_handle): ... here.
	Include `<grub/util/libzfs.h>'.
 2010-07-31 12:22:01 +02:00
Robert Millan
a184f9c801 2010-07-30 Robert Millan <rmh@gnu.org> 
Enable `grub-probe -t device' resolution on ZFS.
	
	* configure.ac: Check for getfsstat(), libzfs and libnvpair.
	* include/grub/util/libnvpair.h: New file.
	* include/grub/util/libzfs.h: New file.
	
	* kern/emu/getroot.c: Include `<assert.h>' and `<error.h>'.
	[HAVE_LIBZFS && HAVE_LIBNVPAIR]: Include `<grub/util/libzfs.h>' and
	`<grub/util/libnvpair.h>'.
	[HAVE_GETFSSTAT]: Include `<sys/mount.h>'.
	
	(find_mount_point_from_dir): New static function.
	[HAVE_LIBZFS && HAVE_LIBNVPAIR] (find_root_device_from_libzfs): New
	function.
	[HAVE_LIBZFS && HAVE_LIBNVPAIR] (grub_guess_root_device): Use
	find_root_device_from_libzfs() before ressorting to find_root_device().
	
	* include/grub/util/misc.h (grub_util_init_libzfs): New function
	prototype.
	* util/misc.c: Include `<grub/util/libzfs.h>'.
	(grub_util_init_libzfs): New function.
	[HAVE_LIBZFS] (libzfs_handle): New global variable.
	[HAVE_LIBZFS] (fini_libzfs): New static function.
	(grub_util_init_libzfs): New function.
	* util/grub-probe.c (main): Call grub_util_init_libzfs().
 2010-07-30 21:43:12 +02:00
Robert Millan
9f841f5cbf 2010-07-29 Robert Millan <rmh@gnu.org> 
* configure.ac: Remove grub-mkisofs checks.
 2010-07-29 15:06:39 +02:00
Grégoire Sutre
57ebd41ef1 Avoid == in test command, it's not portable. 2010-07-05 00:45:14 +02:00
Vladimir 'phcoder' Serbinenko
2a1d16154d Merge mainline into newreloc 2010-06-24 21:22:40 +02:00
Vladimir 'phcoder' Serbinenko
8e50ec9f05 Merge mainline into cirrus 2010-06-21 02:15:49 +02:00
Vladimir 'phcoder' Serbinenko
4d88b9aec7 Init cirrus ourselves instead of calling videobios 2010-06-21 01:02:48 +02:00
Grégoire Sutre
f4d095d77d Add . to the directories searched for unifont. 2010-06-08 12:09:34 +02:00
BVK Chaitanya
2d465fb052 cygwin fixes 2010-06-07 17:23:54 +05:30
BVK Chaitanya
d3ff5a05eb fix for cygwin build 2010-06-04 16:48:42 +05:30
BVK Chaitanya
a60f6ee1ac cleanup 2010-06-03 11:52:33 +05:30
Colin Watson
c7c75cf4cb * configure.ac: AC_PROG_LEX sets LEX to ":" if lex is missing, not 
to the empty string.
 2010-05-28 18:13:48 +01:00
Vladimir 'phcoder' Serbinenko
5779bae94c merge mainline into newreloc 2010-05-18 14:30:07 +02:00
Colin Watson
74cbf5bdcb * 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 12:33:35 +01:00
Colin Watson
e6127bed25 merge from trunk 2010-05-18 11:14:13 +01:00
Vladimir 'phcoder' Serbinenko
918405fd8c merge mainline into rescue-efi 2010-05-17 21:26:16 +02:00
BVK Chaitanya
8c41176882 automake commit without merge history 2010-05-06 11:34:04 +05:30
Vladimir 'phcoder' Serbinenko
cfdcef121f Fix efiemu compilation condition 2010-05-03 23:00:49 +02:00
Vladimir 'phcoder' Serbinenko
05f602fc51 enable xnu on all platforms 2010-05-02 22:06:44 +02:00
Vladimir 'phcoder' Serbinenko
c6fb51295b merge mainline into newreloc 2010-05-01 15:10:44 +02:00
Vladimir 'phcoder' Serbinenko
7210dca942 Split coreboot and multiboot ports. 
* conf/i386-multiboot.rmk: New file.
	* configure.ac: Add multiboot port.
	* include/grub/i386/multiboot/boot.h: New file.
	* include/grub/i386/multiboot/console.h: Likewise.
	* include/grub/i386/multiboot/init.h: Likewise.
	* include/grub/i386/multiboot/kernel.h: Likewise.
	* include/grub/i386/multiboot/loader.h: Likewise.
	* include/grub/i386/multiboot/memory.h: Likewise.
	* include/grub/i386/multiboot/serial.h: Likewise.
	* include/grub/i386/multiboot/time.h: Likewise.
	* include/grub/multiboot.h: Add GRUB_MACHINE_MULTIBOOT to ifdef.
	* loader/multiboot.c: Likewise.
	* loader/multiboot_mbi2.c: Likewise.
	* util/grub-mkrescue.in: Generate multiboot rescue.
 2010-05-01 14:06:53 +02:00
Vladimir 'phcoder' Serbinenko
94ac790645 Fix various issues created by previous commits 2010-04-26 10:56:12 +02:00
Christian Franke
2aec1692d9 * configure.ac: Do not CHECK_BSS_START_SYMBOL 
and CHECK_END_SYMBOL if grub-emu is built.
	Unset TARGET_OBJ2ELF if grub-emu is built
	without module support.
 2010-04-24 22:41:52 +02:00
Vladimir 'phcoder' Serbinenko
4ba8d3540a * configure.ac: Refuse to compile for x86_64-efi is mcmodel=large 
is not supported.
 2010-04-21 21:26:56 +02:00
Grégoire Sutre
38e55e9058 TARGET_IMG_LDFLAGS_AC now always expects a number appended to it. Fixed 
grub_prefix in grub-mkconfig for NetBSD and OpenBSD.
 2010-04-18 19:57:50 +02:00
Vladimir 'phcoder' Serbinenko
4b0cd8f813 Fix cygwin compilation. 
* configure.ac: Define NEED_REGISTER_FRAME_INFO.
	* include/grub/misc.h (__register_frame_info)
	[NEED_REGISTER_FRAME_INFO && !UTIL]: New export.
	(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
	* kern/misc.c (__register_frame_info)
	[NEED_REGISTER_FRAME_INFO && !UTIL]: New empty function.
	(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
 2010-04-11 21:24:21 +02:00
Vladimir 'phcoder' Serbinenko
01fcf061ea * configure.ac: Respect grub_cv_asm_uscore when defining dummy symbols. 2010-04-11 16:14:51 +02:00
Grégoire Sutre
2c7031b135 Add grub-probe support for NetBSD. 
* util/getroot.c (find_root_device): Convert block device to
	character device on NetBSD.
	* util/probe.c (probe): Require character device on NetBSD.
	* util/hostdisk.c: NetBSD specific headers.
	(configure_device_driver): new function to tune device driver
	parameters (currently only for NetBSD floppy driver).
	(grub_util_biosdisk_open): NetBSD specific code (get disk size
	via disklabel ioctl).
	(open_device): call configure_device_driver on NetBSD.
	(convert_system_partition_to_system_disk): NetBSD specific code.
	(device_is_wholedisk): Likewise.
	(grub_util_biosdisk_get_grub_dev): Likewise.
	(make_device_name): Fixed a typo in bsd_part_str.
	* configure.ac: check for opendisk() and getrawpartition() on
	NetBSD and set LIBUTIL.
	* Makefile.in: add LIBUTIL to LIBS.
 2010-04-10 17:07:33 +02:00
BVK Chaitanya
d8dcc0dff8 Fix FreeBSD build. 
* configure.ac: Flex version check.
	* conf/common.rmk: Add -Wno-error to sh.mod.
	* script/yylex.l: Remove all #pragma.
 2010-04-10 19:11:32 +05:30
BVK Chaitanya
20072d3ad5 merged with mainline 2010-04-10 18:09:56 +05:30
BVK Chaitanya
2663fb5f04 flex version check is now done by awk alone 2010-04-10 18:06:45 +05:30
Vladimir 'phcoder' Serbinenko
a29e902132 Merge mainline into emu-modload 2010-04-10 01:25:46 +02:00
BVK Chaitanya
4ee717e12b fix freebsd build 2010-04-06 14:39:11 +05:30
BVK Chaitanya
b777c18e38 fixed version canonicalization 2010-04-05 21:47:19 +05:30
BVK Chaitanya
0922019068 added flex version check in configure.ac 2010-04-05 21:08:30 +05:30
BVK Chaitanya
8622549153 merged in mainline 2010-03-14 22:20:55 +05:30
Vladimir 'phcoder' Serbinenko
120cc3eebc Merge mainline into cleanbuild 2010-03-14 16:41:57 +01:00
Vladimir 'phcoder' Serbinenko
dae79b6b05 Merge mainline into emu-mod 2010-03-14 16:27:54 +01:00
Vladimir 'phcoder' Serbinenko
016a671b51 Merge mainline into cleanbuild 2010-03-14 16:01:31 +01:00
Vladimir 'phcoder' Serbinenko
313df2f552 Merge mainline into sparc-mkimage 2010-03-14 15:21:04 +01:00
Vladimir 'phcoder' Serbinenko
d1e8a02f11 2010-03-06 Vladimir Serbinenko <phcoder@gmail.com> 
* configure.ac: Update CPPFLAGS and not CFLAGS when checking for
	ft2build.h.
 2010-03-06 21:27:04 +01:00
Vladimir 'phcoder' Serbinenko
8f9a632b96 2010-03-05 Vladimir Serbinenko <phcoder@gmail.com> 
Fix FreeBSD compilation.

	* Makefile.in (TARGET_CPPFLAGS): Remove -nostdinc -isystem.
	* configure.ac: Add -nostdinc -isystem to TARGET_CPPFLAGS if it works.
 2010-03-06 17:22:04 +01:00
Vladimir 'phcoder' Serbinenko
c7ef54aab1 2010-03-04 Vladimir Serbinenko <phcoder@gmail.com> 
* configure.ac: Alias amd64 to x86_64.
 2010-03-04 22:33:49 +01:00
Vladimir 'phcoder' Serbinenko
14532662ee merge mainline into sparc-mkimage 2010-03-03 11:24:36 +01:00
Vladimir 'phcoder' Serbinenko
5519963bf6 2010-03-01 Vladimir Serbinenko <phcoder@gmail.com> 
* configure.ac: Update version to 1.98.
 2010-03-01 19:07:48 +01:00
Vladimir 'phcoder' Serbinenko
6bea3f8983 merge sparc grub-mkimage into grub-mkrawimage 2010-02-12 20:08:56 +01:00
Vladimir 'phcoder' Serbinenko
abac2bf4db merge cleanbuild int emu-modload 2010-02-10 02:03:04 +01:00
Vladimir 'phcoder' Serbinenko
5c2ee77128 Share common compilation flags 2010-02-10 01:39:23 +01:00
Vladimir 'phcoder' Serbinenko
660960d697 2010-02-09 Vladimir Serbinenko <phcoder@gmail.com> 
* configure.ac: Check for ft2build.h.
 2010-02-09 14:09:08 +01:00
Vladimir 'phcoder' Serbinenko
f38873b80b Build system support for grub-emu modules 2010-02-07 15:17:26 +01:00
Vladimir 'phcoder' Serbinenko
19a9fb834b merge mainline into emu-mod 2010-02-07 03:06:33 +01:00
Vladimir 'phcoder' Serbinenko
909301af11 First try at generating grub-emu from modules 2010-02-07 02:07:35 +01:00
Colin Watson
a800277e8d remove left-over LIBDEVMAPPER substitution 2010-02-05 09:08:22 -08:00
Vladimir 'phcoder' Serbinenko
1f534b6908 Merge mainline into gfxmenu 2010-02-03 01:24:07 +01:00
Grégoire Sutre
42e0cba3af Reset LIBS after check for libgcc symbols in configure.ac. 2010-01-26 01:57:56 +01:00
Colin Watson
7181e2281f 2010-01-25 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.
 2010-01-25 17:47:51 +00:00
Grégoire Sutre
ea4a7e35eb 2010-01-25 Grégoire Sutre <gregoire.sutre@gmail.com> 
* configure.ac: Check for `limits.h'.
	* util/misc.c: Include `<limits.h>' (for PATH_MAX).
 2010-01-25 10:06:55 +01:00
Vladimir 'phcoder' Serbinenko
69be5b74be 2010-01-23 Vladimir Serbinenko <phcoder@gmail.com> 
* configure.ac: Check for libgcc symbols with -nostdlib.
 2010-01-23 22:56:08 +01:00
Vladimir 'phcoder' Serbinenko
6c624ae848 MErge mainline into lexer-rewrite 2010-01-23 19:37:13 +01:00
Vladimir 'phcoder' Serbinenko
454fcd1c9b 2010-01-22 Vladimir Serbinenko <phcoder@gmail.com> 
* configure.ac: Check for _restgpr_14_x.
	* include/grub/powerpc/libgcc.h [HAVE__RESTGPR_14_X]: Add _restgpr_*_x
	and _savegpr_* prototypes.
 2010-01-22 20:40:21 +01:00
BVK Chaitanya
547e494f1b lexer-rewrite rebase commit 2010-01-22 19:07:27 +05:30
Vladimir 'phcoder' Serbinenko
02cf98ca8d 2010-01-20 Vladimir Serbinenko <phcoder@gmail.com> 
* configure.ac: Add /usr/share/fonts/unifont/unifont.pcf.gz
	as possible unifont location (Gentoo).
	Reported by: Alexander Brüning
 2010-01-20 13:27:23 +01:00
Robert Millan
e68d3b243f Resync with trunk 2010-01-18 15:02:21 +00:00
Robert Millan
2c40cc7868 Import Tristan Gingold's ia64 port 
(based on patch sent to grub-devel by Tristan in 2008-01-28)
 2010-01-18 14:17:47 +00:00
Vladimir 'phcoder' Serbinenko
85a2cf749f merge mainline into mips 2010-01-10 13:34:48 +01:00
Vladimir 'phcoder' Serbinenko
e6e86df1de Merge multiterm into gfxmenu+multiterm 2010-01-05 16:34:10 +01:00
Yves Blusseau
2f1a3acf75 2009-01-01 Yves Blusseau <yves.blusseau@zetam.org> 
* configure.ac: check external intl library
	* Makefile.in: add compiler and linker flags to properly compile with
	intl library
	* include/grub/i18n.h: add a check to disable NLS
	* util/misc.c (grub_util_init_nls): new function
	* include/grub/util/misc.h: likewise
	* util/elf/grub-mkimage.c: use the new function below to initialize NLS
	* util/grub-editenv.c: likewise
	* util/grub-emu.c: likewise
	* util/grub-fstest.c: likewise
	* util/grub-mkdevicemap.c: likewise
	* util/grub-mkfont.c: likewise
	* util/grub-mkrelpath.c: likewise
	* util/grub-probe.c: likewise
	* util/i386/pc/grub-mkimage.c: likewise
	* util/i386/pc/grub-setup.c: likewise
	* util/sparc64/ieee1275/grub-mkimage.c: likewise
	* util/sparc64/ieee1275/grub-ofpathname.c: likewise
	* util/sparc64/ieee1275/grub-setup.c: likewise
	* util/mkisofs/mkisofs.h: add a check to disable NLS
	* util/mkisofs/mkisofs.c: likewise
 2010-01-01 21:32:30 +01:00
Robert Millan
90d1e8797a 2009-12-29 Robert Millan <rmh.grub@aybabtu.com> 
* configure.ac: Check for TARGET_CFLAGS initialization before we
	initialize it ourselves (sigh).
	Move a few modifications to TARGET_CFLAGS to be unconditional
	(extra warning flags, loop alignment, i386 CPU extensions, GCC 4.4
	eh_frame)
	
	* gettext/gettext.c (grub_gettext_delete_list): Add `void' argument.
	* term/i386/pc/at_keyboard.c
	(keyboard_controller_wait_untill_ready): Likewise.
	(keyboard_controller_led): Rename `led_status' paramter to avoid
	name conflict.
 2009-12-29 14:04:18 +00:00
Vladimir 'phcoder' Serbinenko
9f293ab0df merge mainline into gfxmenu 2009-12-25 21:32:46 +01:00
Robert Millan
838114b687 Merge from trunk 2009-12-11 21:15:58 +00:00
Robert Millan
2a3aa4d570 Merge pciaccess branch 2009-12-11 21:12:57 +00:00
Colin Watson
d6ceebf1d9 2009-12-07 Colin Watson <cjwatson@ubuntu.com> 
* configure.ac: Check for vasprintf.
	* util/misc.c (asprintf): Move allocation from here ...
	(vasprintf): ... to here.  New function.
	(xasprintf): New function.
	* include/grub/util/misc.h (vasprintf, xasprintf): Add
	prototypes.
	* util/getroot.c (grub_util_get_grub_dev): Use xasprintf.
	* util/grub-mkfont.c (write_font): Likewise.
	* util/grub-probe.c (probe): Likewise.
	* util/hostdisk.c (make_device_name): Likewise.
 2009-12-07 16:46:24 +00:00
Vladimir 'phcoder' Serbinenko
df2e3593f3 merge mainline into mips 2009-12-05 18:37:15 +01:00
Vladimir 'phcoder' Serbinenko
f616f51c3c 2009-12-05 Vladimir Serbinenko <phcoder@gmail.com> 
* configure.ac (TARGET_ASFLAGS): Add "-D<MACHINE>".
 2009-12-05 11:08:26 +01:00
Vladimir 'phcoder' Serbinenko
4f41a23d4e merge mainline into mips 2009-12-02 09:51:36 +01:00
Vladimir 'phcoder' Serbinenko
7b5f334bc0 Rename qemu-r4k to qemu-mips 2009-12-02 08:49:36 +01:00
Vladimir 'phcoder' Serbinenko
e6b9873356 Remove qemu-mipssim 2009-12-02 08:40:51 +01:00
Vladimir 'phcoder' Serbinenko
3e5c7dc3d8 Fix qemu-r4k 2009-12-02 08:39:17 +01:00
Vladimir 'phcoder' Serbinenko
e45f7848e6 merged mainline into pci 2009-11-30 16:39:59 +01:00
Robert Millan
3df1f5113a Merge from trunk. 2009-11-27 00:03:09 +00:00
Vladimir 'phcoder' Serbinenko
bde358ac91 merged with mainline 2009-11-25 23:17:32 +01:00
Robert Millan
e4612999e6 Merge from trunk. 2009-11-25 21:34:53 +00:00
Felix Zielcke
f022876b03 2009-11-25 Felix Zielcke <fzielcke@z-51.de> 
autoconf >= 2.60 support $(localedir).

	* INSTALL: Note that autoconf 2.60 is required.
	* configure.ac (AC_PREREQ): Bump to 2.60.
	* util/grub.d/10_kfreebsd.in (TEXTDOMAINDIR): Set to lowercased @localedir@.
	* util/grub.d/10_linux.in (TEXTDOMAINDIR): Likewise.
 2009-11-25 18:37:04 +01:00
Vladimir 'phcoder' Serbinenko
0e8489094a mainstream merged into pci 2009-11-25 15:15:30 +01:00
Yves Blusseau
6717926e6e 2009-11-25 Yves Blusseau <yves.blusseau@zetam.org> 
* configure.ac: move the call to AM_GNU_GETTEXT to avoid warnings when
    aclocal is run.
 2009-11-25 12:23:16 +01:00
Vladimir 'phcoder' Serbinenko
3dcf83ba7d merged mainstream into gfxmenu 2009-11-24 01:22:41 +01:00
Robert Millan
f84b481b35 Cheery-pick grub-emu split from experimental (rev 1361) 
2009-11-23  Robert Millan  <rmh.grub@aybabtu.com>

        * configure.ac: Detect all `emu' platforms.  Define
        GRUB_MACHINE_* macros in TARGET_CFLAGS.  Remove
        --enable-grub-emu logic.  Disable include/grub/machine
        symlink on `emu' platforms.

        * genkernsyms.sh.in: Use @TARGET_CFLAGS@ during symbol generation.
        * gensymlist.sh.in: Likewise.

        * include/grub/i386/coreboot/machine.h: Remove file.
        * include/grub/i386/efi/machine.h: Likewise.
        * include/grub/i386/ieee1275/machine.h: Likewise.
        * include/grub/i386/pc/machine.h: Likewise.
        * include/grub/i386/qemu/machine.h: Likewise.
        * include/grub/powerpc/ieee1275/machine.h: Likewise.
        * include/grub/sparc64/ieee1275/machine.h: Likewise.
        * include/grub/x86_64/efi/machine.h: Likewise.

        * commands/acpi.c: Remove `<grub/machine/machine.h>'.
        * commands/halt.c: Likewise.
        * commands/reboot.c: Likewise.
        * include/grub/autoefi.h: Likewise.
        * include/grub/i386/at_keyboard.h: Likewise.
        * include/grub/i386/kernel.h: Likewise.
        * include/grub/i386/loader.h: Likewise.
        * include/grub/i386/pc/memory.h: Likewise.
        * kern/dl.c: Likewise.
        * kern/i386/coreboot/init.c: Likewise.
        * loader/i386/bsd.c: Likewise.
        * loader/i386/linux.c: Likewise.
        * loader/multiboot_loader.c: Likewise.
        * term/i386/pc/serial.c: Likewise.
        * term/usb_keyboard.c: Likewise.

        * include/grub/time.h [!GRUB_MACHINE_EMU]: Remove
        `<grub/machine/machine.h>'
        [!GRUB_MACHINE_EMU] (GRUB_TICKS_PER_SECOND): New macro.
        * util/misc.c: Remove `<grub/machine/machine.h>' and
        `<grub/machine/time.h>'.

        * Makefile.in (enable_grub_emu): Remove variable.
        Include $(srcdir)/conf/any-emu.mk for the `emu' platform.

        * conf/any-emu.rmk: New file.
        * conf/common.rmk (grub_emu_init.lst, grub_emu_init.h)
        (grub_emu_init.c): Move from here ...
        * conf/any-emu.rmk: ... to here.

        * conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-emu'.
        (grub_emu_SOURCES, grub_emu_LDFLAGS): Move from here ...
        * conf/any-emu.rmk: ... to here.
 2009-11-23 15:31:54 +00:00
Vladimir 'phcoder' Serbinenko
5acc2aba78 merged mainline into PCI 2009-11-23 11:15:24 +01:00
Vladimir 'phcoder' Serbinenko
5afcd00788 merge mainstream into mips 2009-11-21 21:45:32 +01:00
Vladimir 'phcoder' Serbinenko
ade85305f8 recognise mips64(el) targets 2009-11-21 17:33:23 +01:00
Felix Zielcke
6c09890c87 2009-11-20 Felix Zielcke <fzielcke@z-51.de> 
* configure.ac (UNIFONT_BDF): Rename to ...
	(FONT_SOURCE): ... this.  Update all users.
 2009-11-20 22:39:07 +01:00
Felix Zielcke
68b44b1d2d Revert accidently renaming of UNIFONT_BDF in configure.ac 2009-11-20 21:13:50 +01:00
Felix Zielcke
a797824f12 2009-11-20 Felix Zielcke <fzielcke@z-51.de> 
* configure.ac: Add `/usr/share/fonts/X11/misc/unifont.pcf.gz'
	to the list of unifont files to look for.
 2009-11-20 21:08:29 +01:00
Robert Millan
336262f829 2009-11-17 Robert Millan <rmh.grub@aybabtu.com> 
* configure.ac: Call AM_GNU_GETTEXT() (defines localedir, among
        other things).
        * Makefile.in (CPPFLAGS): Add `-DLOCALEDIR=\"$(localedir)\"'.
        * util/i386/pc/grub-mkimage.c (main): Issue setlocale() and
        bindtextdomain() calls for gettext initialization.
 2009-11-17 10:47:22 +00:00
Robert Millan
fc22844e83 2009-11-16 Robert Millan <rmh.grub@aybabtu.com> 
* aclocal.m4: Move from here ...
        * acinclude.m4: ... to here.
        * autogen.sh: Add call to `aclocal'.
        * configure.ac: Add AM_INIT_AUTOMAKE() after AC_INIT() call.
 2009-11-16 19:31:29 +00:00
Vladimir 'phcoder' Serbinenko
927d0134c7 SDL 2009-11-20 10:28:42 +01:00
Vladimir 'phcoder' Serbinenko
da547ac323 merged with mainstream 2009-11-09 21:16:25 +01:00
Robert Millan
4825d7908c 2009-11-09 Robert Millan <rmh.grub@aybabtu.com> 
* util/mkisofs/fnmatch.c: Remove.
        * util/mkisofs/getopt1.c: Likewise.
        * util/mkisofs/getopt.c: Likewise.
        * conf/common.rmk (grub_mkisofs_SOURCES): Replace
        `util/mkisofs/fnmatch.c', `util/mkisofs/getopt1.c' and
        `util/mkisofs/getopt.c' with `gnulib/fnmatch.c',
        `gnulib/getopt1.c' and `gnulib/getopt.c'.
        (grub_mkisofs_CFLAGS): Add `-I$(srcdir)/gnulib'.

        * configure.ac: Detect `mingw32msvc' host_os.
        Check for lstat(), getuid() and getgid().

        * util/mkisofs/joliet.c: Include `<stdint.h>'.  Replace all
        instances of `u_char' with `uint8_t'.

        * util/mkisofs/mkisofs.h: Include `<sys/stat.h>'.
        [!HAVE_GETUID] (getuid): New function (stub).
        [!HAVE_GETGID] (getgid): Likewise.
        [!HAVE_LSTAT] (lstat): Likewise.
        [!S_IROTH] (S_IROTH): New macro (dummy).
        [!S_IRGRP] (S_IRGRP): Likewise.
 2009-11-09 19:58:24 +00:00
Robert Millan
7c4e16ff88 Integrate grub-mkisofs into the build system. 2009-11-08 23:01:34 +00:00
fzielcke
86e5b1dbb7 2009-11-04 Felix Zielcke <fzielcke@z-51.de> 
* configure.ac (AC_PREREQ): Bump to 2.59d.
	* INSTALL: Make it more clear when Autoconf and Ruby are
	needed and when to run `./autogen.sh'.
 2009-11-04 08:20:53 +00:00
Vladimir 'phcoder' Serbinenko
6174923799 merged with upstream 2009-11-02 23:29:51 +01:00
robertmh
67937d4dca 2009-10-26 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/10_freebsd.in: Remove.
        * util/grub.d/10_kfreebsd.in: New file (based on 10_linux.in).
        * configure.ac: Set host_kernel=kfreebsd for FreeBSD and GNU/kFreeBSD.
 2009-10-26 00:41:54 +00:00
robertmh
346e7fbedb 2009-10-25 Robert Millan <rmh.grub@aybabtu.com> 
* configure.ac: Check for `__ashldi3', `__ashrdi3', `__lshrdi3',
        `__trampoline_setup' and `__ucmpdi2'.
        * include/grub/powerpc/libgcc.h: Only export symbols for functions
        that libgcc provides.
 2009-10-24 23:26:53 +00:00
phcoder
0f8d98dad2 Merge branch 'pci' into mips 2009-10-22 14:32:09 +02:00
robertmh
3b2fe8c285 2009-10-20 Robert Millan <rmh.grub@aybabtu.com> 
Fix build on sparc64.

        * configure.ac: Perform checks for libgcc symbols before
        adding `-nostdlib' to LDFLAGS.
 2009-10-20 11:30:37 +00:00
phcoder
b78f2e6e10 Merge branch 'mainline' into mips 2009-10-18 16:12:53 +02:00
phcoder
4a1eefb623 Revert "simplify mipsel handling" 
This reverts commit 3451c43f4938a20aee5a2c0d0fa17c29e40b989b.

Conflicts:

	configure.ac
 2009-10-18 15:06:47 +02:00
phcoder
ad17a401d6 new image format for mips. Asm part 2009-10-18 14:10:31 +02:00
phcoder
686135601f simplified mips/mipsel 2009-10-18 11:50:40 +02:00
phcoder
fdb3c3acb0 simplify mipsel handling 2009-10-18 00:22:15 +02:00
robertmh
f1d29d87ad 2009-10-16 Robert Millan <rmh.grub@aybabtu.com> 
* configure.ac: Bump version to 1.97.
 2009-10-16 17:43:26 +00:00
cjwatson
6f3cd880e9 2009-10-16 Colin Watson <cjwatson@ubuntu.com> 
* configure.ac (TARGET_CFLAGS): Add -mno-mmx -mno-sse -mno-sse2
	-mno-3dnow on x86 architectures.  Some toolchains enable these
	features by default, but they rely on registers that aren't enabled
	in GRUB.  Thanks to Vladimir Serbinenko for the suggestion.
 2009-10-16 15:38:42 +00:00
phcoder
c6f3b249e4 2009-10-15 Vladimir Serbinenko <phcoder@gmail.com> 
* configure.ac: Add missing dollar.
 2009-10-15 12:09:56 +00:00
phcoder
6b5886ba66 2009-10-15 Vladimir Serbinenko <phcoder@gmail.com> 
Revert 2009-06-10  Pavel Roskin  <proski@gnu.org>

	* configure.ac: Put checks for __bswapsi2 and __bswapdi2.
	* include/grub/powerpc/libgcc.h: Don't use weak attribute for all
	exports.
	* include/grub/sparc64/libgcc.h: Likewise.  Use
	preprocessor conditionals.
 2009-10-15 11:55:06 +00:00
phcoder
459fed4b98 pciaccess 2009-10-14 18:17:18 +02:00
phcoder
325c8258e7 lspci works in grub-emu 2009-10-14 10:36:37 +02:00
phcoder
3affd0ece8 libpci initial stuff 2009-10-14 10:11:59 +02:00
phcoder
1540a08402 various fixes. MIPSsim support 2009-10-11 18:18:18 +02:00
phcoder
e8b458be45 fixes 2009-10-10 14:27:28 +02:00
phcoder
33dc6f74d2 bugfixes. Merge MIPS and MIPSel 2009-10-10 14:19:50 +02:00
phcoder
e27fbc80e4 kernel.img compiles on mipsel-qemu-r4k 2009-10-09 19:50:31 +02:00
robertmh
da25306d46 2009-10-05 Robert Millan <rmh.grub@aybabtu.com> 
* configure.ac: Bump version to 1.97~beta4.
 2009-10-05 17:56:33 +00:00
cjwatson
ff42022396 2009-09-23 Colin Watson <cjwatson@ubuntu.com> 
* configure.ac: Call AC_PROG_MKDIR_P.
	* Makefile.in (docs/stamp-vti): Create docs directory.  Create
	version.texi in $(builddir) rather than $(srcdir).
	(docs/grub.info): Create docs directory.  Prepend $(builddir)/docs
	to makeinfo's @include search path.
 2009-09-23 17:18:06 +00:00
cjwatson
c44c90db27 2009-09-21 Colin Watson <cjwatson@ubuntu.com> 
Build info documentation.  Some code borrowed from Automake.

	* configure.ac: Check for makeinfo.
	* Makefile.in (MAKEINFO, INFOS, info_INFOS): New variables.
	(MAINTAINER_CLEANFILES): Add $(INFOS), docs/stamp-vti, and
	docs/version.texi.
	(MOSTLYCLEANFILES): Add vti.tmp.
	(docs/version.texi, docs/stamp-vti): Update automatically.
	(docs/grub.info): Build info documentation.  Use --force and ignore
	errors for now.
	(all-local): Add $(INFOS).
	(install-local): Install info files.
	(uninstall): Uninstall info files.
	* docs/version.texi: Remove from revision control.  This file is
	automatically generated on build now.
	* gendistlist.sh: Add `*.info'.
 2009-09-21 18:22:27 +00:00
robertmh
63f745e857 2009-09-16 Robert Millan <rmh.grub@aybabtu.com> 
* aclocal.m4 (AC_LANG_PROGRAM): New macro.  Overrides stock
        AC_LANG_PROGRAM from autoconf.
        (grub_ASM_USCORE, grub_PROG_OBJCOPY_ABSOLUTE): Add missing      
        prototypes (fixes warning).

        * configure.ac: Add `-Werror' to TARGET_CFLAGS unless
        `--disable-werror' was used.
 2009-09-16 19:32:44 +00:00
robertmh
5653217923 2009-09-13 Robert Millan <rmh.grub@aybabtu.com> 
* configure.ac: Remove --enable-grub-pe2elf.  Only build
        grub-pe2elf when needed by the build system itself.
        * conf/common.rmk: Remove $(enable_grub_pe2elf) check.
 2009-09-13 01:30:18 +00:00
robertmh
8ef070f50d 2009-09-12 Robert Millan <rmh.grub@aybabtu.com> 
* configure.ac: Bump version to 1.97~beta3.
        * docs/version.texi: Likewise.
 2009-09-12 13:08:38 +00:00
cjwatson
866953751f 2009-09-11 Colin Watson <cjwatson@ubuntu.com> 
* configure.ac: Don't look for help2man when cross-compiling.  Fixes
	part of bug #27349.
 2009-09-11 14:17:35 +00:00
robertmh
4ff0d7a4b8 2009-09-04 Robert Millan <rmh.grub@aybabtu.com> 
* configure.ac: Bump version to 1.97~beta2.
        * docs/version.texi: Likewise.
 2009-09-04 12:08:43 +00:00
cjwatson
77c55a8749 2009-09-03 Colin Watson <cjwatson@ubuntu.com> 
* configure.ac: By default, GCC 4.4 generates .eh_frame sections
	containing unwind information in some cases where it previously did
	not. Use -fno-dwarf2-cfi-asm if available to restore the old
	behaviour. See http://patchwork.kernel.org/patch/8555/ for related
	discussion.
 2009-09-03 23:00:25 +00:00