Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2013-01-31 14:48:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2013-01-08 13:44:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2013-01-31 14:48:10.000000000 +0100 @@ -1,0 +2,25 @@ +Wed Jan 30 07:29:29 UTC 2013 - [email protected] + +- sync from SLE-11 SP3 to date +- set empty prefix to grub.efi for looking up in current directory +- grub2-cdpath.patch: fix the grub.cfg not found when booting from + optical disk +- put grub.efi in grub2's source module directory +- create links in system's efi directory to grub.efi +- arvidjaar: do not overwrite device path in grub2-cdpath.patch + +------------------------------------------------------------------- +Wed Jan 30 04:36:45 UTC 2013 - [email protected] + +- remove obsolete reference to /boot/grub2-efi and /usr/sbin/grub2-efi + from grub2-once +- add GRUB_SAVEDFAULT description to /etc/default/grub + +------------------------------------------------------------------- +Fri Jan 18 07:39:18 UTC 2013 - [email protected] + +- ship a Secure Boot UEFI compatible bootloader (fate#314485) +- add grub2-secureboot-chainloader.patch, which expands the efi + chainloader to be able to verify images via shim lock protocol. + +------------------------------------------------------------------- New: ---- grub2-cdpath.patch grub2-secureboot-chainloader.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.sE9tSj/_old 2013-01-31 14:48:13.000000000 +0100 +++ /var/tmp/diff_new_pack.sE9tSj/_new 2013-01-31 14:48:13.000000000 +0100 @@ -81,14 +81,6 @@ %define only_x86_64 %{nil} %endif -%if 0%{?sles_version} -%global efidir SuSE -%else -%if 0%{?suse_version} -%global efidir opensuse -%endif -%endif - Version: 2.00 Release: 0 Summary: Bootloader with support for Linux, Multiboot and more @@ -135,6 +127,8 @@ Patch26: grub2-fix-enumeration-of-extended-partition.patch Patch27: grub2-add-device-to-os_prober-linux-menuentry.patch Patch28: grub2-fix-unquoted-string-in-class.patch +Patch29: grub2-secureboot-chainloader.patch +Patch30: grub2-cdpath.patch PreReq: perl-Bootloader Requires: gettext-runtime %if 0%{?suse_version} >= 1140 @@ -250,6 +244,8 @@ %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 +%patch30 -p1 cd .. # README.openSUSE @@ -278,9 +274,9 @@ #TODO: add efifwsetup module -FS_MODULES="ext2 fat btrfs ext2 xfs jfs reiserfs" +FS_MODULES="ext2 btrfs ext2 xfs jfs reiserfs" CD_MODULES=" all_video boot cat chain configfile echo \ - efinet ext2 font gfxmenu gfxterm gzio halt iso9660 \ + efinet fat font gfxmenu gfxterm gzio halt iso9660 \ jpeg minicmd normal part_apple part_msdos part_gpt \ password_pbkdf2 png reboot search search_fs_uuid \ search_fs_file search_label sleep test video" @@ -292,7 +288,7 @@ %endif GRUB_MODULES="${CD_MODULES} ${FS_MODULES} mdraid09 mdraid1x" -./grub-mkimage -O %{grubefiarch} -o grub.efi -p /EFI/%{efidir} \ +./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix= \ -d grub-core ${GRUB_MODULES} #./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus fat \ # ext2 btrfs normal chain boot configfile linux appleldr minicmd \ @@ -336,8 +332,17 @@ cd grub-efi-%{version} make DESTDIR=$RPM_BUILD_ROOT install -install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/ -install -m 755 grub.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/grub.efi +install -m 644 grub.efi $RPM_BUILD_ROOT%{_libdir}/%{name}/%{grubefiarch}/grub.efi + +# Create grub.efi link to system efi directory +# This is for tools like kiwi not fiddling with the path +%if "%{grubefiarch}" == "x86_64-efi" +%define sysefidir %{_exec_prefix}/lib64/efi +%else +%define sysefidir %{_libdir}/efi +%endif +install -d $RPM_BUILD_ROOT%{sysefidir} +ln -sf ../../../%{_libdir}/%{name}/%{grubefiarch}/grub.efi $RPM_BUILD_ROOT%{sysefidir}/grub.efi cd .. %endif @@ -608,11 +613,8 @@ %files %{grubefiarch} %defattr(-,root,root,-) -%dir /boot/efi -%dir /boot/efi/EFI -%dir /boot/efi/EFI/%{efidir} -%attr(0755,root,root)/boot/efi/EFI/%{efidir}/grub.efi %dir %{_libdir}/%{name}/%{grubefiarch} +%{_libdir}/%{name}/%{grubefiarch}/grub.efi %{_libdir}/%{name}/%{grubefiarch}/*.img %{_libdir}/%{name}/%{grubefiarch}/*.lst %{_libdir}/%{name}/%{grubefiarch}/*.mod @@ -621,6 +623,8 @@ %{_libdir}/%{name}/%{grubefiarch}/gmodule.pl %{_libdir}/%{name}/%{grubefiarch}/kernel.exec %{_libdir}/%{name}/%{grubefiarch}/modinfo.sh +%dir %{sysefidir} +%{sysefidir}/grub.efi %endif %changelog ++++++ grub.default ++++++ --- /var/tmp/diff_new_pack.sE9tSj/_old 2013-01-31 14:48:13.000000000 +0100 +++ /var/tmp/diff_new_pack.sE9tSj/_new 2013-01-31 14:48:13.000000000 +0100 @@ -9,6 +9,10 @@ GRUB_CMDLINE_LINUX_DEFAULT="quiet splash=silent" GRUB_CMDLINE_LINUX="" +# Uncomment to automatically save last booted menu entry in GRUB2 environment +# variable `saved_entry' +#GRUB_SAVEDEFAULT="true" + # Uncomment to enable BadRAM filtering, modify to suit your needs # This works with Linux (no patch required) and with any kernel that obtains # the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...) ++++++ grub2-cdpath.patch ++++++ From: Matthew Garrett <[email protected]> Date: 2012-07-10 11:58:52 EDT Subject: [PATCH] Add support for crappy cd craparino References: fate#314485 Patch-Mainline: no Signed-off-by: Michael Chang <[email protected]> Follow other code in this function and duplicate device path before overwriting it. Signed-off-by: Andrey Borzenkov <[email protected]> Index: grub-2.00/grub-core/disk/efi/efidisk.c =================================================================== --- grub-2.00.orig/grub-core/disk/efi/efidisk.c +++ grub-2.00/grub-core/disk/efi/efidisk.c @@ -820,6 +820,31 @@ grub_efidisk_get_device_name (grub_efi_h return dev_name; } + else if (GRUB_EFI_DEVICE_PATH_TYPE (ldp) == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE && + (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) == GRUB_EFI_CDROM_DEVICE_PATH_SUBTYPE)) + { + grub_efi_device_path_t *dup_dp, *dup_ldp; + + /* It is necessary to duplicate the device path so that GRUB + can overwrite it. */ + dup_dp = duplicate_device_path (dp); + if (! dup_dp) + return 0; + + dup_ldp = find_last_device_path (dup_dp); + dup_ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE; + dup_ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE; + dup_ldp->length[0] = 4; + dup_ldp->length[1] = 0; + + if (!get_diskname_from_path (dup_dp, device_name)) + { + grub_free (dup_dp); + return 0; + } + grub_free (dup_dp); + return grub_strdup (device_name); + } else { /* This should be an entire disk. */ ++++++ grub2-once ++++++ --- /var/tmp/diff_new_pack.sE9tSj/_old 2013-01-31 14:48:13.000000000 +0100 +++ /var/tmp/diff_new_pack.sE9tSj/_new 2013-01-31 14:48:13.000000000 +0100 @@ -45,12 +45,9 @@ while (<SYSCONF>) { if (/LOADER_TYPE="(.*)"/) { my $bl = $1; - if ($bl eq "grub2") { + if ($bl eq "grub2" || $bl eq "grub2-efi") { $grub2_dir = "/boot/grub2"; $grub2_reboot = "/usr/sbin/grub2-reboot"; - } elsif ($bl eq "grub2-efi") { - $grub2_dir = "/boot/grub2-efi"; - $grub2_reboot = "/usr/sbin/grub2-efi-reboot"; } last; } ++++++ grub2-secureboot-chainloader.patch ++++++ ++++ 646 lines (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
