From: Vladimir 'phcoder' Serbinenko Date: Tue, 16 Jul 2013 16:43:43 +0000 (+0200) Subject: Merge mainline into arm X-Git-Tag: grub-2.02-beta1~930^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae27e4d3233bfe28eee168b4045d3f8c7ad3ac20;p=thirdparty%2Fgrub.git Merge mainline into arm --- ae27e4d3233bfe28eee168b4045d3f8c7ad3ac20 diff --cc .bzrignore index fc20bc698,40c206522..d4e3d2dde --- a/.bzrignore +++ b/.bzrignore @@@ -174,7 -206,10 +206,12 @@@ po/*.gm po/LINGUAS include/grub/gcrypt/gcrypt.h include/grub/gcrypt/g10lib.h +grub-core/lib/dtc-grub +grub-core/Makefile.libfdt.def po/POTFILES.in po/POTFILES-shell.in + grub-glue-efi + grub-render-label + grub-core/gnulib/locale.h + grub-core/gnulib/unitypes.h + grub-core/gnulib/uniwidth.h diff --cc ChangeLog index bb06a93f5,69492ef85..42ee41203 --- a/ChangeLog +++ b/ChangeLog @@@ -1,12 -1,341 +1,350 @@@ +2013-05-16 Vladimir Serbinenko + + * grub-core/kern/arm/uboot/startup.S: Move stack before modules. + +2013-05-16 Vladimir Serbinenko + + * grub-core/lib/dtc/libfdt-grub.diff: Remove extraneous uintptr_t + declaration. + + 2013-07-16 Vladimir Serbinenko + + * grub-core/loader/multiboot_elfxx.c: Check eip after v2p translation + and not before. + Reported by: Leon Drugi. + + 2013-07-16 Vladimir Serbinenko + + * grub-core/kern/powerpc/ieee1275/startup.S: Handle unaligned bss. + Reported by: Paulo Flabiano Smorigo. + + 2013-07-14 Vladimir Testov + + * grub-core/gfxmenu/gui_list.c: USe viewport when drawing strings. + + 2013-07-14 Vladimir Testov + + * grub-core/gfxmenu/gui_list.c: Fix height calculation. + + 2013-07-14 Vladimir Serbinenko + + * grub-core/fs/zfs/zfs.c: Stylistic fixes. + + 2013-07-14 Vladimir Serbinenko + + * grub-core/fs/zfs/zfs.c: Run emacs indent on file. + + 2013-07-14 Andrey Borzenkov + + * grub-core/net/bootp.c: Export net_* variables. + * grub-core/net/net.c: Likewise. + + 2013-07-14 Vladimir Serbinenko + + * grub-core/fs/zfs/zfs.c: Remove brackets around return value. + + 2013-07-14 Vladimir Serbinenko + + * grub-core/fs/zfs/zfs_lz4.c: Add missing packed attribute. + + 2013-07-14 Vladimir Serbinenko + + * grub-core/fs/zfs/zfs.c (nvlist_next_nvpair): Fix improper cast. + + 2013-07-14 Vladimir Serbinenko + + * grub-core/fs/zfs/zfs_lz4.c: Remove restrict keyword. + + 2013-07-14 Massimo Maggi + + * grub-core/fs/zfs/zfs.c (nvlist_next_nvpair): Error is encode_size + <= 0. + + 2013-07-14 Massimo Maggi + + * grub-core/fs/zfs/zfs.c: Split nvpair iterators into separate + functions. + + 2013-07-14 Massimo Maggi + + * grub-core/fs/zfs/zfs_lz4.c: New file. + * grub-core/fs/zfs/zfs.c: Tie up lz4 decompression. + + 2013-07-14 Massimo Maggi + + * grub-core/fs/zfs/zfs.c: Check for feature compatibility. + + 2013-07-14 Massimo Maggi + + * grub-core/fs/zfs/zfs.c (uberblock_verify): Accept version 5000. + (check_pool_label): Likewise. + * include/grub/zfs/zfs.h: Rewrite SPA_VERSION_* macros. + + 2013-07-14 Massimo Maggi + + * grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Fix RAIDZ reporting. + + 2013-07-13 Andrey Borzenkov + + * docs/grub.texi (Commands): Document postition parameters + for menuentry command. + + 2013-07-13 Andrey Borzenkov + + * util/grub-mknetdir.in: Remove stray line from help output. + + 2013-07-11 Vladimir Serbinenko + + Remove early sm712 init as there is no reason for it (the "watchdog" + effect was due to wrong GPIO map). + + 2013-07-11 Vladimir Serbinenko + + * grub-core/commands/pcidump.c: Remove static variables. + + 2013-07-11 Vladimir Serbinenko + + * grub-core/commands/sleep.c: Refresh screen before sleeping. + + 2013-07-11 Vladimir Serbinenko + + * configure.ac: Move delimiter after the infos. + + 2013-07-11 Vladimir Serbinenko + + * grub-core/bus/usb/usbhub.c: Fix recheck logic. + + 2013-07-11 Vladimir Serbinenko + + * util/grub-mkfont.c (write_font_ascii_bitmap): Fix handling of glyphs + not filling whole 8x16 space. + + 2013-07-11 Vladimir Serbinenko + + * grub-core/normal/charset.c (bidi_line_wrap): Fix spurios warning. + + 2013-07-11 Vladimir Serbinenko + + * configure.ac: Indicate which liblzma is used if any. + + 2013-06-21 Paul Wise + 2013-06-21 Craig Sanders + + * util/grub-reboot.in: Document submenu usage. + + 2013-06-25 Colin Watson + + * .bzrignore: Update with a number of new test-related files. + + 2013-06-25 Colin Watson + + * util/grub-script-check.c: Fail on scripts containing no + commands, to guard against corrupted grub-mkconfig setups that + produce no useful output. + * tests/grub_script_no_commands.in: New test. + * Makefile.util.def (grub_script_no_commands): Add. + Reported by Hans Putter. Fixes Debian bug #713886. + + 2013-06-16 Andrey Borzenkov + + * grub-core/disk/diskfilter.c: Forgot to remove comment + from previous commit. + + 2013-06-16 Andrey Borzenkov + + * grub-core/term/gfxterm.c (grub_virtual_screen_setup): Use + grub_term_normal_color, do not hardcode GRUB_TERM_DEFAULT_NORMAL_COLOR. + + 2013-06-16 Andrey Borzenkov + + * conf/Makefile.extra-dist: Add grub-core/fs/cpio_common.c. + + 2013-06-16 Andrey Borzenkov + + * grub-core/disk/diskfilter.c (scan_devices): Iteratively + rescan diskfilter devices until nothing new is found. + + 2013-06-16 Vladimir Serbinenko + + Fix casts when compiling coreboot-specific code for 64-bit EFI. + + 2013-06-16 Vladimir Serbinenko + + Don't try to detect cbfs on *-emu. + + 2013-06-16 Vladimir Serbinenko + + * grub-core/term/gfxterm.c: USe right background color when scrolling. + + 2013-06-16 Vladimir Serbinenko + + Add support for processed coreboot payload chainloading. + + 2013-06-16 Vladimir Serbinenko + + Enable coreboot information commands even when not loaded as + coreboot payload (e.g. when loaded from SeaBIOS-as-payload). + + 2013-06-15 Vladimir Serbinenko + + Support for cbfs. Also factor out the part which is common + for all archives to a separate module. This splits tar from cpio + as they are very different but keeps cpio, cpio_be, odc and newc + together since they're very similar. + + 2013-06-15 David Michael + + * configure.ac (FREETYPE): Change AC_CHECK_PROGS to AC_CHECK_TOOLS. + (freetype_cflags,freetype_libs): Change freetype-config to $FREETYPE. + + 2013-06-15 Vladimir Serbinenko + + * tests/grub_script_eval.in: Really add the eval test. + + 2013-06-14 Vladimir Serbinenko + + Move flavour-specific parts out of common cpio.c file and + rename remaining to cpio_common.c + + 2013-06-07 Andrey Borzenkov + + * grub-core/script/execute.c (grub_script_execute_sourcecode): Split + off new function grub_script_execute_new_scope. Change callers to use + either of them as appropriate. + * grub-core/commands/eval.c: New command eval. + * docs/grub.texi (Commands): Document it. + + 2013-06-07 Andrey Borzenkov + + * grub-core/kern/corecmd.c (grub_core_cmd_set): Use grub_env_get + to fetch values when listing. + + 2013-06-07 Andrey Borzenkov + + Fix make dist on non-pc. + + 2013-06-07 Francesco Lavra + + * grub-core/kern/corecmd.c (grub_core_cmd_ls): Fix handling of paths + without a device name. + + 2013-06-07 Vladimir Serbinenko + + Remove enable_executable_check as it's not needed anymore. + Reported by: dougray. + + 2013-06-07 Vladimir Serbinenko + + * grub-core/disk/diskfilter.c (insert_array): Fix order to discover + ambigouos RAID before discovering RAIDs on top of it. + Reported by: bodom. + + 2013-06-07 Vladimir Serbinenko + + Fix typo (failback vs fallback). + + 2013-05-31 Andrey Borzenkov + + * util/grub.d/30_os-prober.in: Add support for probing EFI + System Partition (as of os-prober 1.58). + + 2013-05-31 Vladimir Serbinenko + + * configure.ac: Add yet another path to unifont. For parabola. + + 2013-05-30 Josh Triplett + + * grub-core/normal/cmdline.c (grub_cmdline_get): Fix Ctrl-u + handling to copy the killed characters to the kill buffer as + UCS4 stored as grub_uint32_t rather than as 8-bit characters + stored as char. Eliminates UCS4 truncation and corruption + observed when killing characters with Ctrl-u and yanking them + back with Ctrl-y. + + 2013-05-30 Vladimir Serbinenko + + Detach optional parts of gfxterm and integrate in with coreboot init. + + 2013-05-30 Vladimir Serbinenko + + Move blit and fill dispatcher to appropriate files to decrease export + and relocation overhead. + + 2013-05-30 Vladimir Serbinenko + + * grub-core/font/font.c, include/grub/font.h: Inline simple font + functions. + + 2013-05-30 Vladimir Serbinenko + + * grub-core/Makefile.am: Fix compilation problem with some + automake versions. + + 2013-05-30 Vladimir Serbinenko + + * configure.ac: Add Ubuntu path to unifont and report unifont path used. + + 2013-05-30 Vladimir Serbinenko + + * Makefile.am, conf/Makefile.common: Fix compilation problem with some + automake versions. + + 2013-05-30 Vladimir Serbinenko + + * grub-core/commands/acpihalt.c: Fix handling of DSDT in presence of + SSDT. + + 2013-05-15 Radosław Szymczyszyn + + * grub-core/partmap/dfly.c: New partition map. + + 2013-05-15 Vladimir Serbinenko + + * grub-core/kern/corecmd.c (grub_core_cmd_ls): Fix empty path + checking. + Reported by: Francesco Lavra. + + 2013-05-14 Andrey Borzenkov + + * gentpl.py: Replace EXTRA_DIST with dist_noinst_DATA or + dist__DATA. EXTRA_DIST is ignored by automake inside + false conditions. + * conf/Makefile.common: define dist_grubconf_DATA + + 2013-05-14 Vladimir Serbinenko + + Progressively skip menu elements on small terminals rather + than crashing. + + 2013-05-14 Vladimir Serbinenko + + * grub-core/normal/cmdline.c (grub_cmdline_get): Fix off-by-one error + to avoid losing last column. + + 2013-05-14 Vladimir Serbinenko + + * po/exclude.pot: Add missing string "%C". + + 2013-05-14 Vladimir Serbinenko + + * tests/util/grub-shell.in: Remove the temporary directory on grub-emu + after the test. + + 2013-05-11 Vladimir Serbinenko + + * util/grub-install.in: Gettextize "Not found" message. + + 2013-05-11 Vladimir Serbinenko + + Fix distfiles list. + Reported by: Andrey Borzenkov + + 2013-05-11 Paulo Flabiano Smorigo + + * grub-core/net/bootp.c (grub_cmd_bootp): Check if there is any card + present. + * include/grub/err.h (grub_err_t): New enum value GRUB_ERR_NET_NO_CARD. + 2013-05-11 Vladimir Serbinenko * grub-core/tests/setjmp_test.c: Ignore missing noreturn. diff --cc docs/grub.texi index ec2178160,1e533641d..42e17e61c --- a/docs/grub.texi +++ b/docs/grub.texi @@@ -3433,9 -3436,9 +3436,10 @@@ you forget a command, you can run the c * crc:: Compute or check CRC32 checksums * cryptomount:: Mount a crypto device * date:: Display or set current date and time +* devicetree:: Load a device tree blob * drivemap:: Map a drive to another * echo:: Display a line of text + * eval:: Evaluate agruments as GRUB commands * export:: Export an environment variable * false:: Do nothing, unsuccessfully * gettext:: Translate a string diff --cc include/grub/disk.h index 259eb9b94,c91583dfd..bf21473ca --- a/include/grub/disk.h +++ b/include/grub/disk.h @@@ -46,7 -46,7 +46,8 @@@ enum grub_disk_dev_i GRUB_DISK_DEVICE_ARCDISK_ID, GRUB_DISK_DEVICE_HOSTDISK_ID, GRUB_DISK_DEVICE_PROCFS_ID, - GRUB_DISK_DEVICE_CBFSDISK_ID ++ GRUB_DISK_DEVICE_CBFSDISK_ID, + GRUB_DISK_DEVICE_UBOOTDISK_ID, }; struct grub_disk;