Vladimir 'phcoder' Serbinenko
519634516f
Merge mainline into multiterm
2010-01-05 16:27:41 +01: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
a7a095c71a
hashsum support
2009-12-23 20:31:12 +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
Vladimir 'phcoder' Serbinenko
7ea73643f5
merge mtrunk into xnu
2009-12-18 03:57:32 +01:00
Robert Millan
37ba589a4e
Merge from trunk
2009-12-12 00:07:45 +00:00
Robert Millan
7c7b610626
2009-12-08 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk [sparc64-ieee1275] (grub_mkdevicemap_SOURCES): Use
`util/ieee1275/ofpath.c' and `util/ieee1275/devicemap.c' instead of
`util/devicemap.c'.
2009-12-08 16:00:52 +00:00
Vladimir 'phcoder' Serbinenko
b391bdb2f2
Use dedicated simple password retriever for size of future crypto disks modules and simplify entering passwords routines
2009-12-06 20:11:50 +01:00
Vladimir 'phcoder' Serbinenko
fd39f820fd
fix mismerge with trunk (progname)
2009-12-05 18:59:36 +01:00
Vladimir 'phcoder' Serbinenko
7d624c2949
merge mainline into crypto
2009-12-05 16:34:27 +01:00
Vladimir 'phcoder' Serbinenko
9d1fafb96e
Move include/grub/cipher_wrap.h to lib/libgcrypt_wrap/cipher_wrap.h
2009-12-05 16:33:39 +01:00
Vladimir 'phcoder' Serbinenko
84c6b0863f
renamed grub-pbkdf2 into grub-mkpasswd-pbkdf2
2009-11-26 17:34:22 +01:00
Robert Millan
8a4c07fd6a
2009-11-26 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk (sbin_UTILITIES): Add `grub-mkdevicemap'.
(grub_mkdevicemap_SOURCES): New variable.
(grub_probe_SOURCES, grub_fstest_SOURCES, grub_mkfont_SOURCES)
(grub_mkrelpath_SOURCES, grub_editenv_SOURCES)
(grub_pe2elf_SOURCES): Add `gnulib/progname.c'.
* conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-mkdevicemap'.
(grub_mkdevicemap_SOURCES): Remove.
* 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.
* util/elf/grub-mkimage.c: Include `<grub/i18n.h>' and `"progname.h"'.
(usage): Fix strings to use `program_name'.
(main): Initialize gettext.
* 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-pe2elf.c: Likewise.
* util/grub-probe.c: Likewise.
* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
* util/sparc64/ieee1275/grub-ofpathname.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
* util/misc.c: Include `"progname.h"'.
(progname): Remove variable.
(grub_util_warn, grub_util_info, grub_util_error): Use `program_name'.
2009-11-25 23:10:02 +00:00
Vladimir 'phcoder' Serbinenko
53e08cc54c
Merged mainstream into newuuid
2009-11-25 23:50:54 +01:00
Felix Zielcke
4501250b6c
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrelpath.c: New file.
* conf/common.rmk (bin_UTILITIES): Add grub-mkrelpath.
(grub_mkrelpath_SOURCES): New variable.
* include/grub/util/misc.h: New function prototype.
* util/misc.c (make_system_path_relative_to_its_root): New function.
* util/grub-mkconfig_lib.in (bindir): New variable.
(grub_mkrelpath): Likewise.
(make_system_path_relative_to_its_root): Use grub-mkrelpath.
* util/probe.c (probe): Make the file path relative to its root.
Change a info message to use the GRUB path. Enable again the
check if we can read the file with GRUB facilities.
* util/i386/pc/grub-setup.c (setup): Make core.img path relative
to its root.
2009-11-24 15:00:25 +01:00
Vladimir 'phcoder' Serbinenko
59f746dc5f
merged mainstream into crypto
2009-11-24 02:54:35 +01:00
Carles Pina i Estany
b58fc33c4f
Merging with trunk
2009-11-23 20:34:42 +00:00
Robert Millan
f515aa6224
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
...
* script/sh/execute.c: Move from here ...
* script/execute.c: ... to here. Update all users.
* script/sh/function.c: Move from here ...
* script/function.c: ... to here. Update all users.
* script/sh/lexer.c: Move from here ...
* script/lexer.c: ... to here. Update all users.
* script/sh/main.c: Move from here ...
* script/main.c: ... to here. Update all users.
* script/sh/parser.y: Move from here ...
* script/parser.y: ... to here. Update all users.
* script/sh/script.c: Move from here ...
* script/script.c: ... to here. Update all users.
2009-11-23 15:37:33 +00: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
Carles Pina i Estany
e5fb78c684
This commit is the same than gettext08.patch (see mailing list)
2009-11-22 12:50:46 +00:00
Vladimir 'phcoder' Serbinenko
937d332db3
compile and configuration fixes
2009-11-22 13:15:49 +01:00
Vladimir 'phcoder' Serbinenko
4fe6aa0961
synced with mainstream
2009-11-22 12:11:17 +01:00
Carles Pina i Estany
43fa69467c
Moves where pkglib_MODULS += gettext.mod is defined
2009-11-21 23:06:37 +00:00
Carles Pina i Estany
fbc5e89710
Syncs with trunk
2009-11-19 21:18:38 +00:00
Robert Millan
700d59cded
2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk (grub_mkisofs_SOURCES): Add `gnulib/progname.c'.
* util/mkisofs/mkisofs.c: Include `"progname.h"'.
(program_name): Remove.
(main): Initialize gettext support.
* util/mkisofs/eltorito.c: Gettexttize.
* util/mkisofs/joliet.c: Likewise.
* util/mkisofs/mkisofs.c: Likewise.
* util/mkisofs/mkisofs.h: Likewise.
* util/mkisofs/multi.c: Likewise.
* util/mkisofs/rock.c: Likewise.
* util/mkisofs/tree.c: Likewise.
* util/mkisofs/write.c: Likewise.
* po/POTFILES: Update with new files.
2009-11-18 23:05:59 +00:00
Robert Millan
769ae37bfd
Merge my gettext branch (gettext support in build system for GRUB utilities)
2009-11-17 20:23:06 +00:00
Robert Millan
ab502ec59d
* conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib'
...
from here ...
* Makefile.in (CPPFLAGS): ... to here.
2009-11-17 10:31:08 +00:00
Robert Millan
af2f93ac47
2009-11-16 Robert Millan <rmh.grub@aybabtu.com>
...
Fix build for systems without error().
* gnulib/error.c: New file (imported from Gnulib).
* gnulib/error.h: Likewise.
* conf/common.rmk (grub_mkisofs_SOURCES): Add `gnulib/error.c'.
* util/mkisofs/mkisofs.c (program_name): Remove `static' qualifier
(this variable is now used by error()).
2009-11-16 18:49:44 +00:00
Vladimir 'phcoder' Serbinenko
0e3c54a5c5
PBKDF2 passwords available
2009-11-24 02:36:21 +01:00
Vladimir 'phcoder' Serbinenko
6e7d9194d1
Add HMAC and PBKDF2
2009-11-24 02:32:29 +01:00
Carles Pina i Estany
203ffbfa31
Adds gettext support in Grub. Building system needs to be improved and maybe userland utilites improved.
...
YYYY-MM-DD Carles Pina i Estany <carles@pina.cat>
* Makefile.in: Add uptrans target to help to update .pot file
* conf/common.rmk: Add grub-gettext_lib target, dependency and SOURCES, CFLAGS, LDFLAGS
* kern/misc.c: Define grub_gettext symbol and add implement grub_gettext_dummy function
* po/TODO: Temporary file with instructions of what Makefile.in will do
* po/ca.po: Catalan translation stub
* include/grub/misc.h: Define macro _(char *s). Declare grub_gettext_dummy and grub_gettext
* gettext/gettext.c: New file with gettext implementation
* normal/menu.c (print_message): add _( ) to some strings
* util/grub.d/10_linux.in: include grub-gettext_lib file. For the Linux menuentry, call eval_gettext
* util/grub.d/00_header.in: add locale_prefix and gettext locale detection and setting up the access to the mo directory
* util/grub-mkconfig_lib.in: add get_locale_lang
* util/grub-gettext_lib.in: new file
2009-11-13 20:39:33 +00:00
Felix Zielcke
f4c62ed6ed
Merge trunk
2009-11-13 14:15:36 +01:00
Vladimir 'phcoder' Serbinenko
d944246c6a
Created crypto module. Moved some functions to it.
2009-11-12 22:40:14 +01:00
Robert Millan
2c55dbc0d5
2009-11-11 Robert Millan <rmh.grub@aybabtu.com>
...
Large file support for grub-mkisofs.
* conf/common.rmk (grub_mkisofs_CFLAGS): Add `-D_FILE_OFFSET_BITS=64'.
* util/mkisofs/mkisofs.c (next_extent, last_extent)
(session_start): Upgrade type to `uint64_t'. Update all users.
* util/mkisofs/mkisofs.h: Include `<stdint.h>'.
(struct directory_entry): Upgrade type of `starting_block' and
`size' to `uint64_t'. Update all users.
(struct deferred): Remove unused structure.
(xfwrite): Upgrade type of `count' and `size' to `uint64_t'.
Update all users.
* util/mkisofs/tree.c (stat_filter, lstat_filter): Return -1 when
file is larger than `UINT32_MAX'.
* util/mkisofs/write.c (xfwrite): Upgrade type of `count' and
`size' to `uint64_t'. Update all users. Fix handling of fwrite()
return value.
(struct deferred_write): Upgrade type of `extent' and `size' to
`uint64_t'. Update all users.
(last_extent_written): Upgrade type to `uint64_t'. Update all
users.
(write_one_file): Upgrade type of `count' and `size' to `uint64_t'.
Update all users. Upgrade type of `remain' to `int64_t' and
`use' to `size_t'. Use error() to handle fread() errors.
(write_files): Rely on write_one_file() rather than calling
xfwrite() directly.
2009-11-11 00:23:29 +00:00
Vladimir 'phcoder' Serbinenko
99145bdc4b
Merged with mainline
2009-11-09 21:58:49 +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
Vladimir 'phcoder' Serbinenko
1d3c6f1de7
Manually reimported XNU branch
2009-11-09 18:43:53 +01:00
Vladimir 'phcoder' Serbinenko
c9b1ebc10b
First try to gcry glue
2009-11-09 17:13:17 +01:00
Robert Millan
a4cd68e41d
2009-11-09 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk (grub_mkisofs_CFLAGS): Prefix include
path with $(srcdir).
2009-11-08 23:59:24 +00:00
Robert Millan
2cf257068a
s/bin_SCRIPTS/bin_UTILITIES/
2009-11-08 23:04:43 +00:00
Robert Millan
7c4e16ff88
Integrate grub-mkisofs into the build system.
2009-11-08 23:01:34 +00:00
Felix Zielcke
50ceeb7cb5
2009-11-04 Felix Zielcke <fzielcke@z-51.de>
...
* util//grub-mkconfig_lib.in (bindir): New variable.
(grub_mkrelpath): Likewise.
Properly set path variable. Use ${grub_mkrelpath} instead of
calling it directly.
2009-11-02 Felix Zielcke <fzielcke@z-51.de>
* util/probe.c (probe): Make the file path relative to its root.
Change a info message to use the GRUB path. Enable again the
check if we can read the file with GRUB facilities.
2009-11-01 Felix Zielcke <fzielcke@z-51.de>
* util/grub-mkrelpath.c: New file.
* conf/common.rmk (bin_UTILITIES): Add grub-mkrelpath.
(grub_mkrelpath_SOURCES): New variable.
* include/grub/util/misc.h: New function prototype.
* util/misc.c (make_system_path_relative_to_its_root): New function.
* util/grub-mkconfig_lib.in (make_system_path_relative_to_its_root):
Use grub-mkrelpath.
2009-11-08 01:49:15 +01:00
robertmh
fa6e945f50
2009-10-29 Robert Millan <rmh.grub@aybabtu.com>
...
Revert SVN r2660.
* conf/common.rmk (script/sh/lexer.c_DEPENDENCIES): Moved from here ...
* conf/i386-coreboot.rmk (script/sh/lexer.c_DEPENDENCIES): ... to here.
* conf/i386-efi.rmk (script/sh/lexer.c_DEPENDENCIES): ... and here.
* 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.
2009-10-29 10:03:13 +00:00
robertmh
94180ff6c7
2009-10-26 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/i386-coreboot.rmk (script/sh/lexer.c_DEPENDENCIES): Moved
from here ...
* conf/common.rmk (script/sh/lexer.c_DEPENDENCIES): ... to here.
* conf/i386-efi.rmk (script/sh/lexer.c_DEPENDENCIES): Remove.
* 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.
2009-10-26 18:02:19 +00:00
robertmh
e9d66f6d6a
2009-10-14 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk (grub-dumpbios): Remove rule.
(sbin_SCRIPTS, CLEANFILES): Remove `grub-dumpbios'.
* util/grub-dumpbios.in: Remove file.
2009-10-14 18:23:40 +00:00
robertmh
31299a9556
2009-09-26 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk (pkglib_MODULES): Remove `lua.mod'.
(lua_mod_SOURCES, lua_mod_CFLAGS, lua_mod_LDFLAGS): Remove.
* util/osdetect.lua: Remove.
* script/lua/lauxlib.c: Likewise.
* script/lua/ldebug.c: Likewise.
* script/lua/grub_main.c: Likewise.
* script/lua/lauxlib.h: Likewise.
* script/lua/ldebug.h: Likewise.
* script/lua/ltablib.c: Likewise.
* script/lua/liolib.c: Likewise.
* script/lua/lstrlib.c: Likewise.
* script/lua/lualib.h: Likewise.
* script/lua/ldo.c: Likewise.
* script/lua/ldump.c: Likewise.
* script/lua/ldo.h: Likewise.
* script/lua/loslib.c: Likewise.
* script/lua/lundump.c: Likewise.
* script/lua/grub_lib.c: Likewise.
* script/lua/ldblib.c: Likewise.
* script/lua/lundump.h: Likewise.
* script/lua/lmem.c: Likewise.
* script/lua/grub_lib.h: Likewise.
* script/lua/lmathlib.c: Likewise.
* script/lua/lstate.c: Likewise.
* script/lua/ltm.c: Likewise.
* script/lua/lvm.c: Likewise.
* script/lua/lmem.h: Likewise.
* script/lua/lstate.h: Likewise.
* script/lua/ltm.h: Likewise.
* script/lua/ltable.c: Likewise.
* script/lua/lvm.h: Likewise.
* script/lua/llex.c: Likewise.
* script/lua/lgc.c: Likewise.
* script/lua/grub_lua.h: Likewise.
* script/lua/loadlib.c: Likewise.
* script/lua/lfunc.c: Likewise.
* script/lua/lopcodes.c: Likewise.
* script/lua/lparser.c: Likewise.
* script/lua/ltable.h: Likewise.
* script/lua/llex.h: Likewise.
* script/lua/lgc.h: Likewise.
* script/lua/lfunc.h: Likewise.
* script/lua/lbaselib.c: Likewise.
* script/lua/lopcodes.h: Likewise.
* script/lua/lparser.h: Likewise.
* script/lua/lzio.c: Likewise.
* script/lua/linit.c: Likewise.
* script/lua/lobject.c: Likewise.
* script/lua/llimits.h: Likewise.
* script/lua/lstring.c: Likewise.
* script/lua/lzio.h: Likewise.
* script/lua/lapi.c: Likewise.
* script/lua/lcode.c: Likewise.
* script/lua/lua.h: Likewise.
* script/lua/lobject.h: Likewise.
* script/lua/lstring.h: Likewise.
* script/lua/lapi.h: Likewise.
* script/lua/lcode.h: Likewise.
* script/lua/luaconf.h: Likewise.
2009-09-26 11:48:55 +00:00