Vladimir 'phcoder' Serbinenko
|
9f2b45cbb9
|
merge mainline into bootcheck
|
2010-01-20 11:13:21 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
327dbcd7b9
|
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
Don't try to generate lists for kernel.img.
* conf/i386-efi.rmk (pkglib_PROGRAMS): New variable.
(pkglib_MODULES): Remove kernel.img.
(kernel_img_EXPORTS): Removed.
(kernel_img_RELOCATABLE): New variable.
* conf/x86_64-efi.rmk: Likewise.
* genmk.rb: Remove *_EXPORTS support and add *_RELOCATABLE support.
|
2010-01-20 10:59:15 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
f80927cadb
|
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* conf/mips.rmk (kernel_img_HEADERS) [yeeloong]: Add pci.h.
|
2010-01-20 08:04:01 +01:00 |
|
Robert Millan
|
e3538adaea
|
2009-12-20 Robert Millan <rmh.grub@aybabtu.com>
* kern/mips/yeeloong/init.c (grub_video_sm712_init)
(grub_video_video_init, grub_video_bitmap_init)
(grub_font_manager_init, grub_term_gfxterm_init)
(grub_at_keyboard_init): New extern declarations.
(grub_machine_init): Initialize gfxterm and at_keyboard.
* kern/main.c (grub_main): Revert grub_printf delay kludge.
* util/grub-install.in: Revert embed of `at_keyboard.mod' and
`gfxterm.mod' into core image.
* conf/mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
(kernel_img_FORMAT): Copy to ...
* conf/mips-qemu-mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
(kernel_img_FORMAT): ... here, and ...
* conf/mips-yeeloong.rmk (pkglib_IMAGES, kernel_img_SOURCES)
(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
(kernel_img_FORMAT): ... here.
(kernel_img_SOURCES): Add files necessary for output (gfxterm)
and input (at_keyboard) terminals in kernel.
(kernel_img_CFLAGS): Add `-DUSE_ASCII_FAILBACK'.
(pkglib_MODULES): Remove `pci.mod'.
(pci_mod_SOURCES, pci_mod_CFLAGS, pci_mod_LDFLAGS)
(sm712_mod_SOURCES, sm712_mod_CFLAGS, sm712_mod_LDFLAGS)
(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
(at_keyboard_mod_LDFLAGS): Remove variables.
|
2010-01-20 01:19:53 +00:00 |
|
Robert Millan
|
ca2a220a74
|
Resync
|
2010-01-20 00:47:55 +00:00 |
|
Robert Millan
|
e022a2d667
|
Sync with trunk
|
2010-01-18 20:51:35 +00:00 |
|
Robert Millan
|
41f683d456
|
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/term.h (grub_term_register_input,
grub_term_register_output): Check return of terminal init()
routines, and abort if errors are raised.
* commands/terminal.c: Update copyright year.
|
2010-01-18 20:20:34 +00:00 |
|
Robert Millan
|
3d8b4e4e26
|
Resync with trunk
|
2010-01-18 19:34:26 +00:00 |
|
BVK Chaitanya
|
d8d4217e3c
|
merge trunk
|
2010-01-18 16:58:03 +05:30 |
|
Vladimir 'phcoder' Serbinenko
|
c5545cf8ba
|
Fix linux-x86_64 bootchecks
|
2010-01-18 12:00:00 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
0db3ae3ce6
|
Add bootcheck for kfreebsd-x86_64
|
2010-01-18 11:38:28 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
5d615a77ce
|
kfreebsd-i386 boot test support
|
2010-01-18 11:14:04 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
ad8e99ec20
|
bootcheck support
|
2010-01-17 23:36:45 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
a0b766fc9b
|
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
Enable multiboot on non-pc.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (pkglib_MODULES): Move
multiboot.mod and multiboot2.mod to ...
* conf/i386.rmk (pkglib_MODULES): ... here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_SOURCES):
Moved to ...
* conf/i386.rmk (multiboot_mod_SOURCES): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_CFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_CFLAGS): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_ASFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_ASFLAGS): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_LDFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_LDFLAGS): .. here.
* conf/x86_64-efi.rmk (pkglib_MODULES): Remove ata.mod and
relocator.mod.
(ata_mod_SOURCES): Removed.
(ata_mod_CFLAGS): Likewise.
(ata_mod_LDFLAGS): Likewise.
(relocator_mod_SOURCES): Removed.
(relocator_mod_CFLAGS): Likewise.
(relocator_mod_ASFLAGS): Likewise.
(relocator_mod_LDFLAGS): Likewise.
Include i386.mk.
* include/grub/x86_64/multiboot.h: New file.
* loader/i386/multiboot.c (grub_multiboot_boot) [GRUB_MACHINE_EFI]:
Terminate EFI.
|
2010-01-15 21:11:51 +01:00 |
|
Robert Millan
|
885d1a8d90
|
Support --help and --version in grub-bin2h.
|
2010-01-14 20:33:10 +00:00 |
|
Colin Watson
|
7d1468e4b6
|
merge from trunk
|
2010-01-14 14:04:44 +00:00 |
|
BVK Chaitanya
|
96f60752d1
|
merge trunk
|
2010-01-14 18:45:19 +05:30 |
|
BVK Chaitanya
|
4d362fde58
|
build only functional tests on make
|
2010-01-12 15:49:40 +05:30 |
|
BVK Chaitanya
|
528aeaeabb
|
merge trunk
|
2010-01-12 11:02:49 +05:30 |
|
BVK Chaitanya
|
c5431d4029
|
build tests on make, but run on make check
|
2010-01-12 10:16:17 +05:30 |
|
Robert Millan
|
0b4de51491
|
2010-01-10 Robert Millan <rmh.grub@aybabtu.com>
* conf/common.rmk (bin_UTILITIES): Add `grub-bin2h'.
(grub_bin2h_SOURCES): New variable.
* util/bin2h.c: New file.
|
2010-01-10 23:13:53 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
cd0514794a
|
MAnipulate mbi in abstract way
|
2010-01-10 18:58:18 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
85a2cf749f
|
merge mainline into mips
|
2010-01-10 13:34:48 +01:00 |
|
Robert Millan
|
cdec4d3193
|
2010-01-09 Robert Millan <rmh.grub@aybabtu.com>
Fix grub-emu build.
* conf/any-emu.rmk (grub_emu_SOURCES): Remove `kern/reader.c'.
|
2010-01-10 00:47:19 +00:00 |
|
Robert Millan
|
75cc5b682e
|
Merge from trunk
|
2010-01-09 23:22:48 +01:00 |
|
BVK Chaitanya
|
58ad6b39c4
|
added changelog file
|
2010-01-09 20:31:33 +05:30 |
|
BVK Chaitanya
|
21a99f5804
|
added grub-script-check tool
|
2010-01-09 20:27:58 +05:30 |
|
BVK Chaitanya
|
169b1cd2d8
|
added functional tests to make-check
|
2010-01-08 16:35:32 +05:30 |
|
BVK Chaitanya
|
6fc804ffbb
|
unit testing framework
|
2010-01-08 15:19:10 +05:30 |
|
Vladimir 'phcoder' Serbinenko
|
fc054c9cb8
|
Various cleanups
|
2010-01-07 22:18:59 +01:00 |
|
Robert Millan
|
bc8b32b3ec
|
2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
Reset Multiboot 2 support. New loader implements the draft in
/branches/multiboot2 and shares as much code as possible with the
production Multiboot 1 implementation.
* loader/ieee1275/multiboot2.c: Remove file. Update all users.
* loader/multiboot2.c: Likewise.
* loader/i386/multiboot_helper.S: Likewise.
* include/multiboot2.h: Replace with latest version from the draft
in /branches/multiboot2.
* conf/i386-coreboot.rmk (multiboot_mod_SOURCES): Remove
`loader/i386/multiboot_helper.S', `loader/i386/pc/multiboot2.c'
and `loader/multiboot2.c'.
(pkglib_MODULES): Add `multiboot2.mod'.
(multiboot2_mod_SOURCES): New variable.
(multiboot2_mod_LDFLAGS): Likewise.
(multiboot2_mod_CFLAGS): Likewise. Define `GRUB_USE_MULTIBOOT2'.
* conf/i386-pc.rmk: Likewise.
* conf/powerpc-ieee1275.rmk (pkglib_MODULES): Remove `multiboot.mod'.
(multiboot_mod_SOURCES): Remove variable.
(multiboot_mod_LDFLAGS): Likewise.
(multiboot_mod_CFLAGS): Likewise.
* include/grub/multiboot.h [GRUB_USE_MULTIBOOT2]: Include
`<multiboot2.h>' instead of `<multiboot.h>'.
[GRUB_USE_MULTIBOOT2] (MULTIBOOT_BOOTLOADER_MAGIC)
(MULTIBOOT_HEADER_MAGIC): New macros.
* loader/multiboot_loader.c (module_version_status): Remove variable.
(find_multi_boot2_header): Remove function.
(grub_cmd_multiboot_loader): Remove Multiboot 2 / Multiboot 1 selection
logic. Always check for the Multiboot version we're compiling for.
(grub_cmd_module_loader): Likewise.
[GRUB_USE_MULTIBOOT2] (GRUB_MOD_INIT(multiboot)): Register `multiboot2'
command instead of `multiboot'.
|
2010-01-07 21:05:25 +00:00 |
|
Vladimir 'phcoder' Serbinenko
|
607a3701db
|
2010-01-07 Vladimir Serbinenko <phcoder@gmail.com>
Merge crypto branch.
* Makefile.in (pkglib_DATA): Add crypto.lst.
(crypto.lst): New target.
* commands/hashsum.c: New file.
* commands/password.c (check_password): Use grub_crypto_memcmp.
* commands/password_pbkdf2.c: New file.
* commands/xnu_uuid.c: Remove MD5. Use GRUB_MD_MD5.
* conf/any-emu.rmk (grub_emu_SOURCES): Add lib/crypto.c,
normal/crypto.c and lib/libgcrypt-grub/cipher/md5.c.
(grub_emu_CFLAGS): Add -Wno-missing-field-initializers -Wno-error
-I$(srcdir)/lib/libgcrypt_wrap.
* conf/common.rmk (normal_mod_SOURCES): Add normal/crypto.c.
(pkglib_MODULES): Add crypto.mod, hashsum.mod, pbkdf2.mod and
password_pbkdf2.mod.
(crypto_mod_SOURCES): New variable.
(crypto_mod_CFLAGS): Likewise.
(crypto_mod_LDFLAGS): Likewise.
(hashsum_mod_SOURCES): New variable.
(hashsum_mod_CFLAGS): Likewise.
(hashsum_mod_LDFLAGS): Likewise.
(pbkdf2_mod_SOURCES): New variable.
(pbkdf2_mod_CFLAGS): Likewise.
(pbkdf2_mod_LDFLAGS): Likewise.
(password_pbkdf2_mod_SOURCES): New variable.
(password_pbkdf2_mod_CFLAGS): Likewise.
(password_pbkdf2_mod_LDFLAGS): Likewise.
(bin_UTILITIES): Add grub-mkpasswd-pbkdf2.
(grub_mkpasswd_pbkdf2_SOURCES): New variable.
(grub_mkpasswd_pbkdf2_CFLAGS): Likewise.
Include conf/gcry.rmk.
* include/grub/auth.h: Rewritten.
* include/grub/crypto.h: New file.
* include/grub/disk.h (grub_disk_dev_id): Add GRUB_DISK_DEVICE_LUKS_ID.
* include/grub/normal.h (read_crypto_list): New prototype.
* lib/crypto.c: New file.
* lib/libgcrypt_wrap/cipher_wrap.h: Likewise.
* lib/pbkdf2.c: Likewise.
* normal/auth.c (grub_auth_strcmp): Removed.
(grub_iswordseparator): Likewise.
(grub_auth_strword): Likewise.
(is_authenticated): Use grub_strword.
(grub_auth_check_authentication): Use grub_strcmp, grub_password_get
and grub_strword. Pass entered password to authentication callback.
* normal/crypto.c: New file.
* normal/main.c: Call read_crypto_list.
* util/grub-mkpasswd-pbkdf2.c: New file.
* util/import_gcry.py: Generate crypto.lst. Add hash blocklen.
|
2010-01-07 01:13:01 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
519634516f
|
Merge mainline into multiterm
|
2010-01-05 16:27:41 +01:00 |
|
Colin Watson
|
bc11fee9f5
|
merge from trunk
|
2010-01-05 10:53:03 +00:00 |
|
Robert Millan
|
7c30297857
|
2010-01-05 Robert Millan <rmh.grub@aybabtu.com>
Remove grub-mkfloppy. Images produced by grub-mkrescue are valid
floppy images now.
* util/i386/pc/grub-mkfloppy.in: Remove. Update all users.
|
2010-01-05 00:31:07 +00:00 |
|
Vladimir 'phcoder' Serbinenko
|
98ff6a54de
|
2010-01-04 Vladimir Serbinenko <phcoder@gmail.com>
* loader/efi/appleloader.c: Restored. Update all users.
|
2010-01-04 14:53:15 +01:00 |
|
Robert Millan
|
ab0eeb0c33
|
2010-01-03 Robert Millan <rmh.grub@aybabtu.com>
* loader/efi/appleloader.c: Remove. Update all users.
|
2010-01-03 22:15:44 +00:00 |
|
Vladimir 'phcoder' Serbinenko
|
ba2d24dc11
|
Add missing -ffreestanding on mips
|
2009-12-30 15:31:45 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
742e1f7e72
|
merge mainline into mips
|
2009-12-28 01:05:47 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
13d1f24696
|
Fix grub-emu compilation
|
2009-12-27 22:36:09 +01:00 |
|
Robert Millan
|
d94000ed13
|
Merge from trunk
|
2009-12-25 22:29:47 +00:00 |
|
Vladimir 'phcoder' Serbinenko
|
9c288be27a
|
2009-12-25 Vladimir Serbinenko <phcoder@gmail.com>
Use search command for preliminar UUID search.
* commands/search.c: Split into ...
* commands/search_wrap.c: ...this
* commands/search.c: ...and this.
* commands/search_file.c: New file.
* commands/search_label.c: New file.
* commands/search_uuid.c: New file.
* conf/any-emu.rmk (grub_emu_SOURCES): Remove commands/search.c.
Add commands/search_wrap.c, commands/search_file.c,
commands/search_label.c and commands/search_uuid.c.
* conf/common.rmk (pkglib_MODULES): Remove fs_uuid.mod and fs_file.mod.
(search_mod_SOURCES): Set to commands/search_wrap.c.
(pkglib_MODULES): Add search_fs_file.mod, search_fs_uuid.mod and
search_label.mod.
(search_fs_file_mod_SOURCES): New variable.
(search_fs_file_mod_CFLAGS): Likewise.
(search_fs_file_mod_LDFLAGS): Likewise.
(search_label_mod_SOURCES): Likewise.
(search_label_mod_CFLAGS): Likewise.
(search_label_mod_LDFLAGS): Likewise.
(search_fs_uuid_mod_SOURCES): New variable.
(search_fs_uuid_mod_CFLAGS): Likewise.
(search_fs_uuid_mod_LDFLAGS): Likewise.
(fs_file_mod_SOURCES): Removed.
(fs_file_mod_CFLAGS): Likewise.
(fs_file_mod_LDFLAGS): Likewise.
(fs_uuid_mod_SOURCES): Removed.
(fs_uuid_mod_CFLAGS): Likewise.
(fs_uuid_mod_LDFLAGS): Likewise.
* conf/sparc64-ieee1275.rmk (grub_install_SOURCES):
Set to util/grub-install.in.
* disk/fs_file.c: Removed.
* disk/fs_uuid.c: Likewise.
* include/grub/search.h: New file.
* util/grub-install.in: Handle sparc64.
Create and use load.cfg.
* util/sparc64/ieee1275/grub-install.in: Removed.
|
2009-12-25 23:06:52 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
bf2ebfbe02
|
Lost hunk
|
2009-12-25 03:36:42 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
e48625a306
|
merge crypto into multiout
|
2009-12-24 00:38:41 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
f4c623e170
|
Work on multi-out terminal
|
2009-12-24 00:37:11 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
a2e77ce455
|
merge mainline into crypto
|
2009-12-23 20:34:26 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
a7a095c71a
|
hashsum support
|
2009-12-23 20:31:12 +01:00 |
|
Felix Zielcke
|
a2c1332b70
|
2009-12-23 Felix Zielcke <fzielcke@z-51.de>
* commands/i386/pc/drivemap.c: Remove all trailing whitespace.
* commands/lspci.c: Likewise.
* commands/probe.c: Likewise.
* commands/xnu_uuid.c: Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* fs/i386/pc/pxe.c: Likewise.
* gettext/gettext.c: Likewise.
* include/grub/efi/graphics_output.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* kern/env.c: Likewise.
* kern/i386/qemu/startup.S: Likewise.
* lib/i386/pc/biosnum.c: Likewise.
* lib/i386/relocator.c: Likewise.
* lib/i386/relocator_asm.S: Likewise.
* lib/relocator.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/multiboot.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/xnu.c: Likewise.
* loader/xnu.c: Likewise.
* normal/main.c: Likewise.
* normal/menu_text.c: Likewise.
* util/getroot.c: Likewise.
* util/grub-mkconfig_lib.in: Likewise.
* util/grub.d/00_header.in: Likewise.
* util/i386/pc/grub-mkimage.c: Likewise.
* util/mkisofs/eltorito.c: Likewise.
* util/mkisofs/exclude.h: Likewise.
* util/mkisofs/hash.c: Likewise.
* util/mkisofs/iso9660.h: Likewise.
* util/mkisofs/joliet.c: Likewise.
* util/mkisofs/mkisofs.c: Likewise.
* util/mkisofs/mkisofs.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.
* video/efi_gop.c: Likewise.
|
2009-12-23 17:41:32 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
7316783f35
|
Crypto module autoloading
|
2009-12-23 17:33:35 +01:00 |
|
Vladimir 'phcoder' Serbinenko
|
ba136b293a
|
merge mainline into crypto
|
2009-12-22 14:28:39 +01:00 |
|