Commit Graph

6719 Commits

Author SHA1 Message Date
Colin Watson
5d918965eb * New Bazaar snapshot.
- Add btrfs probing support, currently only in the single-device case
    (closes: #540786).
  - Fix grub-emu build on mips/powerpc/sparc.
2010-06-02 01:31:43 +01:00
Colin Watson
ab6316112c * conf/any-emu.rmk (kernel_img_SOURCES) [!x86]: Include
kern/$(target_cpu)/cache.S even if TARGET_NO_MODULES = yes.
2010-06-02 01:23:34 +01:00
Aleš Nesrsta
390b0676c4 Use dev->descdev.maxsize0 even if dev->initialized isn't set 2010-06-02 02:04:45 +02:00
Colin Watson
e726afa89d fix indentation 2010-06-01 18:40:45 +01:00
Peter Henn
3b97788878 * disk/mdraid_linux.c (grub_mdraid_detect): Fix calculation of 1.x
chunk size and disk size, which are already given as sector counts
as distinct from the 0.90 units.  Fetch the correct device number
from the role table instead of using the table index.
2010-06-01 18:40:03 +01:00
Colin Watson
bde4a9ac1d Add btrfs probing support, currently only in the single-device case.
* kern/emu/getroot.c (find_root_device_from_mountinfo): New
function.
(grub_guess_root_device): Call find_root_device_from_mountinfo
before looking in /dev.
2010-06-01 18:30:20 +01:00
Colin Watson
0d9ff59345 * kern/emu/getroot.c (find_root_device_from_mountinfo): Use getline instead
of fgets into a static buffer.  Use sizeof instead of strlen on a constant
string.  Thanks to Vladimir for review.
2010-06-01 18:05:29 +01:00
Colin Watson
f77681ba03 * Reorganise configure and build targets in debian/rules to use stamp
files.  configure/* never existed and build/* was always a directory, so
  make never considered either of them up to date (closes: #450505).
* Remove config.h.in from AUTOGEN_FILES, since autoheader doesn't
  necessarily update it.
* Remove conf/gcry.mk from AUTOGEN_FILES, and conf/gcry.rmk from their
  dependencies.  autogen.sh runs util/import_gcry.py after autoconf et al,
  so conf/gcry.rmk's timestamp will be later than some of the
  autogenerated outputs.
2010-06-01 15:59:33 +01:00
Colin Watson
86c7d5dac5 releasing version 1.98+20100527-2 2010-06-01 14:21:18 +01:00
Colin Watson
da2dd9be89 Override binary-from-other-architecture for kernel.img as well as *.mod
when building grub-efi-amd64 on i386.
2010-06-01 13:45:35 +01:00
Colin Watson
f795e757dd kernel.img is stripped upstream where it can be, but override Lintian's
error for the cases where it can't.
2010-06-01 13:38:46 +01:00
Colin Watson
34e604bba2 Always override statically-linked-binary Lintian tag for kernel.img;
dynamic linking makes no sense here.
2010-06-01 13:33:59 +01:00
BVK Chaitanya
a762e3c335 merge with mainline 2010-06-01 17:52:31 +05:30
Colin Watson
ec52f53bb7 releasing version 1.98+20100527-1 2010-06-01 12:42:18 +01:00
Colin Watson
42f353ff1d Build-depend on gcc-4.4-multilib on amd64. 2010-06-01 11:16:19 +01:00
BVK Chaitanya
fe16b84557 pull-in emu-lite 2010-06-01 09:12:01 +05:30
Aleš Nesrsta
7d4873c26a Merge Aleš' latest patch 2010-06-01 02:10:19 +02:00
Vladimir 'phcoder' Serbinenko
b1d17e10e0 * disk/i386/pc/biosdisk.c (grub_biosdisk_open): Use
GRUB_DISK_SIZE_UNKNOWN.
	* disk/ieee1275/ofdisk.c (grub_ofdisk_open): Likewise.
2010-05-31 21:01:01 +02:00
Jiro SEKIBA
dfbfe00473 * include/grub/disk.h (GRUB_DISK_SIZE_UNKNOWN): New macro.
* fs/nilfs.c: Support 2nd super block in case 1st one is accidently
	corrupted or not synced properly.
2010-05-31 20:49:42 +02:00
Vladimir 'phcoder' Serbinenko
c2ffc8e956 * normal/main.c (grub_normal_add_menu_entry): Avoid going out of args.
Reported by: Seth Goldberg.
2010-05-31 20:46:16 +02:00
Vladimir 'phcoder' Serbinenko
5629316656 * loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix incorrect
addition of dest.
	Reported by: Seth Goldberg.
2010-05-31 20:43:28 +02:00
Vladimir 'phcoder' Serbinenko
7620e7debd * commands/setpci.c (grub_setpci_iter): Fix an incorrect function check.
Reported by: Seth Goldberg.
2010-05-31 20:40:42 +02:00
Vladimir 'phcoder' Serbinenko
c837af3f38 * loader/multiboot_elfxx.c (grub_multiboot_load_elfXX) [__mips]: Check
64-bit address as signed on MIPS.
2010-05-31 20:23:51 +02:00
Vladimir 'phcoder' Serbinenko
89d90892d0 Merge usb into yeeloongfw 2010-05-31 14:21:34 +02:00
Aleš Nesrsta
778ff32476 Fix a bunch of problems with USB. 2010-05-31 14:11:41 +02:00
Vladimir 'phcoder' Serbinenko
7fd08f56ae Shut down OHCI on booting 2010-05-31 14:01:38 +02:00
Vladimir 'phcoder' Serbinenko
8b1cf5e87f Dedicated DMA allocation functions. CS5536 OHCI support. 2010-05-31 13:58:18 +02:00
Vladimir 'phcoder' Serbinenko
4fa54f9209 Remove leftover message 2010-05-31 08:25:20 +02:00
Vladimir 'phcoder' Serbinenko
8148171e96 Pad image to 512K for flashrom 2010-05-31 08:24:33 +02:00
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
Colin Watson
fa39c92598 version flex build-dep to match configure 2010-05-28 18:11:31 +01:00
Colin Watson
c19c43cf5b Build-depend on flex. 2010-05-28 18:08:07 +01:00
BVK Chaitanya
fa4b84900a Fix grub-emu issues on NetBSD, with gcc 4.1.3.
* conf/any-emu.rmk: Remove unnecessary COMMON_CFLAGS.
	* include/grub/emu/misc.h (canonicalize_file_name): New Prototype.
	* kern/misc.c (__enable_execute_stack): Disable on
	GRUB_MACHINE_EMU.
2010-05-28 19:18:45 +05:30
Colin Watson
7dfe8b2efb Don't leak debconf's file descriptor to update-grub, so that the LVM
tools called from os-prober don't complain about it (closes: #549976).
Other leaks are not this package's fault, may not be bugs at all, and in
any case os-prober 1.36 suppresses the warnings.
2010-05-28 14:40:46 +01:00
Colin Watson
d7eec0ae07 gettext 0.18 adds a new Language field 2010-05-28 14:13:41 +01:00
Colin Watson
3f7622072f msgcat 2010-05-28 13:42:19 +01:00
Colin Watson
f7ba94406f Build-depend on libsdl1.2-dev for SDL support in grub-emu. 2010-05-28 13:38:58 +01:00
Colin Watson
15f9f1fa4c remove grub-reboot and grub-set-default from grub-emu package 2010-05-28 13:36:21 +01:00
Colin Watson
5f37160594 grub-emu moved to /usr/bin 2010-05-28 13:32:41 +01:00
Colin Watson
be68af4c39 909_mapper_symlink applied upstream 2010-05-28 13:24:28 +01:00
Colin Watson
a33075b941 Make grub-probe work with symbolic links under /dev/mapper as well
as with real block devices.  The Linux world seems to be (at best)
in transition here, and GRUB shouldn't get caught in the middle.
* kern/emu/getroot.c (find_root_device): Follow symbolic links under
/dev/mapper.
2010-05-28 13:21:30 +01:00
Colin Watson
dbaa0b5aa8 better sorting 2010-05-28 13:01:59 +01:00
Colin Watson
06260d91e2 Use xorriso for image creation rather than embedding a modified copy
of mkisofs (closes: #570156).
2010-05-28 13:01:33 +01:00
Colin Watson
48a20b154a typo 2010-05-28 12:41:48 +01:00
Colin Watson
8e0ff34315 When upgrading a system where GRUB 2 is chainloaded from GRUB Legacy and
upgrade-from-grub-legacy has not been run, upgrade the chainloaded image
rather than confusing the user by prompting them where they want to
install GRUB (closes: #546822).
2010-05-28 12:35:24 +01:00
Colin Watson
d557121fef Make grub-probe work with symlinks under /dev/mapper (closes: #550704). 2010-05-28 12:04:09 +01:00
BVK Chaitanya
64c10cde57 merge with mainline 2010-05-28 16:23:07 +05:30
Colin Watson
15fb2ae896 Make grub-probe work with symbolic links under /dev/mapper as well
as with real block devices.  The Linux world seems to be (at best)
in transition here, and GRUB shouldn't get caught in the middle.
* kern/emu/getroot.c (find_root_device): Follow symbolic links under
/dev/mapper.
2010-05-28 11:51:50 +01:00
BVK Chaitanya
16eaf6f7c6 fixes for netbsd build 2010-05-28 16:18:22 +05:30
BVK Chaitanya
f17ead43f9 cygwin fixes 2010-05-27 17:04:31 -07:00