Merge mainline into arm

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-07-16 18:43:43 +02:00
commit ae27e4d323
111 changed files with 5383 additions and 3002 deletions

View file

@ -75,6 +75,8 @@ library = {
common = grub-core/fs/afs.c;
common = grub-core/fs/bfs.c;
common = grub-core/fs/btrfs.c;
common = grub-core/fs/cbfs.c;
common = grub-core/fs/archelp.c;
common = grub-core/fs/cpio.c;
common = grub-core/fs/cpio_be.c;
common = grub-core/fs/odc.c;
@ -111,6 +113,7 @@ library = {
common = grub-core/fs/zfs/zfs.c;
common = grub-core/fs/zfs/zfsinfo.c;
common = grub-core/fs/zfs/zfs_lzjb.c;
common = grub-core/fs/zfs/zfs_lz4.c;
common = grub-core/fs/zfs/zfs_sha256.c;
common = grub-core/fs/zfs/zfs_fletcher.c;
common = grub-core/lib/envblk.c;
@ -130,6 +133,7 @@ library = {
common = grub-core/partmap/dvh.c;
common = grub-core/partmap/sunpc.c;
common = grub-core/partmap/bsdlabel.c;
common = grub-core/partmap/dfly.c;
common = grub-core/script/function.c;
common = grub-core/script/lexer.c;
common = grub-core/script/main.c;
@ -552,6 +556,7 @@ script = {
testcase;
name = gettext_strings_test;
common = tests/gettext_strings_test.in;
extra_dist = po/exclude.pot;
};
script = {
@ -590,6 +595,12 @@ script = {
common = tests/example_grub_script_test.in;
};
script = {
testcase;
name = grub_script_eval;
common = tests/grub_script_eval.in;
};
script = {
testcase;
name = grub_script_test;
@ -740,6 +751,12 @@ script = {
common = tests/grub_script_not.in;
};
script = {
testcase;
name = grub_script_no_commands;
common = tests/grub_script_no_commands.in;
};
script = {
testcase;
name = partmap_test;