Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2013-06-26 20:19:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2013-04-20 17:42:29.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2013-06-26 20:19:02.000000000 +0200
@@ -1,0 +2,35 @@
+Sun Jun 16 12:42:33 UTC 2013 - arvidjaar@gmail.com
+
+- update to current upstream trunk rev 5042
+ * drop upstream patches
+ - grub2-correct-font-path.patch
+ - grub2-fix-mo-not-copied-to-grubdir-locale.patch
+ - grub2-stdio.in.patch
+ - grub2-fix-build-error-on-flex-2.5.37.patch
+ - grub2-quote-messages-in-grub.cfg.patch
+ - 30_os-prober_UEFI_support.patch
+ - grub2-fix-enumeration-of-extended-partition.patch
+ - grub2-add-device-to-os_prober-linux-menuentry.patch
+ - grub2-fix-tftp-endianness.patch
+ - efidisk-ahci-workaround
+ - grub2-grub-mount-return-failure-if-FUSE-failed.patch
+ * rediff
+ - rename-grub-info-file-to-grub2.patch
+ - grub2-linux.patch
+ - use-grub2-as-a-package-name.patch
+ - grub2-iterate-and-hook-for-extended-partition.patch
+ - grub2-secureboot-add-linuxefi.patch
+ - grub2-secureboot-no-insmod-on-sb.patch
+ - grub2-secureboot-chainloader.patch
+ * add
+ - grub2-linguas.sh-no-rsync.patch
+ + disable rsync in linguas.sh so it can be used during RPM build
+ + disable auto-generated catalogs, they fail at the moment due to
+ missing C.UTF-8 locale
+ * update Makefile.util.am and Makefile.core.am
+ * grub2-mknetdir is now in /usr/bin
+ * generate po/LINGUAS for message catalogs using distributed linguas.sh
+ * remove po/stamp-po during setup to trigger message catalogs rebuild
+ * package bootinfo.txt on PPC (used by grub2-mkrescue)
+
+-------------------------------------------------------------------
Old:
----
30_os-prober_UEFI_support.patch
efidisk-ahci-workaround
grub2-add-device-to-os_prober-linux-menuentry.patch
grub2-correct-font-path.patch
grub2-fix-build-error-on-flex-2.5.37.patch
grub2-fix-enumeration-of-extended-partition.patch
grub2-fix-mo-not-copied-to-grubdir-locale.patch
grub2-fix-tftp-endianness.patch
grub2-grub-mount-return-failure-if-FUSE-failed.patch
grub2-quote-messages-in-grub.cfg.patch
grub2-stdio.in.patch
New:
----
grub2-linguas.sh-no-rsync.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.wl5u2F/_old 2013-06-26 20:19:04.000000000 +0200
+++ /var/tmp/diff_new_pack.wl5u2F/_new 2013-06-26 20:19:04.000000000 +0200
@@ -107,7 +107,6 @@
Source10: openSUSE-UEFI-CA-Certificate.crt
Source11: SLES-UEFI-CA-Certificate.crt
Source1000: PATCH_POLICY
-Patch0: grub2-correct-font-path.patch
Patch1: rename-grub-info-file-to-grub2.patch
Patch2: grub2-linux.patch
Patch3: use-grub2-as-a-package-name.patch
@@ -116,30 +115,21 @@
Patch8: grub2-ppc-terminfo.patch
Patch9: grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
Patch10: grub2-fix-error-terminal-gfxterm-isn-t-found.patch
-Patch11: grub2-fix-mo-not-copied-to-grubdir-locale.patch
Patch12: grub2-fix-menu-in-xen-host-server.patch
Patch13: grub2-enable-theme-for-terminal-window.patch
-Patch14: grub2-stdio.in.patch
Patch15: not-display-menu-when-boot-once.patch
Patch16: grub2-fix-Grub2-with-SUSE-Xen-package-install.patch
Patch17: grub2-pass-corret-root-for-nfsroot.patch
Patch18: grub2-fix-locale-en.mo.gz-not-found-error-message.patch
-Patch19: grub2-fix-build-error-on-flex-2.5.37.patch
-Patch20: grub2-quote-messages-in-grub.cfg.patch
Patch21: grub2-secureboot-add-linuxefi.patch
Patch22: grub2-secureboot-use-linuxefi-on-uefi.patch
Patch23: grub2-secureboot-no-insmod-on-sb.patch
Patch24: grub2-secureboot-provide-linuxefi-config.patch
-Patch25: 30_os-prober_UEFI_support.patch
-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
-Patch31: efidisk-ahci-workaround
-Patch32: grub2-grub-mount-return-failure-if-FUSE-failed.patch
-Patch33: grub2-fix-tftp-endianness.patch
Patch34: grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
+Patch35: grub2-linguas.sh-no-rsync.patch
Requires: gettext-runtime
%if 0%{?suse_version} >= 1140
Requires: os-prober
@@ -221,11 +211,13 @@
# We create (if we build for efi) two copies of the sources in the Builddir
%setup -q -n grub-%{version} -a 5
(cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS
-%patch0 -p1
%patch1 -p1
# This simplifies patch handling without need to use git to create patch
# that renames file
mv docs/grub.texi docs/grub2.texi
+# This avoids attempt to rebuild potfiles which fails because necessary
+# sources are not included in tarball
+mv po/grub.pot po/%{name}.pot
%patch2 -p1
%patch3 -p1
%patch6 -p1
@@ -233,34 +225,30 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
%patch12 -p1
# disable and back to use black colored terminal window (bnc#776244)
# we could enable it when
# 1 we have background with better contrast to the font's color
# 2 we confirm it's eligible to set the terminal background this way
#%patch13 -p1
-%patch14 -p2
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
-%patch19 -p1
-%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
%patch28 -p1
%patch29 -p1
%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
%patch34 -p1
+%patch35 -p1
+
+# Generate po/LINGUAS for message catalogs ...
+./linguas.sh
+# ... and make sure new catalogs are actually created
+rm -f po/stamp-po
# README.openSUSE
cp %{SOURCE3} .
@@ -561,7 +549,6 @@
%{_sbindir}/%{name}-bios-setup
%{_sbindir}/%{name}-install
%{_sbindir}/%{name}-mkconfig
-%{_sbindir}/%{name}-mknetdir
%{_sbindir}/%{name}-once
%{_sbindir}/%{name}-ofpathname
%{_sbindir}/%{name}-probe
@@ -570,16 +557,19 @@
%{_sbindir}/%{name}-sparc64-setup
%{_bindir}/%{name}-editenv
%{_bindir}/%{name}-fstest
+%{_bindir}/%{name}-glue-efi
%{_bindir}/%{name}-kbdcomp
%{_bindir}/%{name}-menulst2cfg
%{_bindir}/%{name}-mkfont
%{_bindir}/%{name}-mkimage
%{_bindir}/%{name}-mklayout
+%{_bindir}/%{name}-mknetdir
%{_bindir}/%{name}-mkpasswd-pbkdf2
%{_bindir}/%{name}-mkrelpath
%{_bindir}/%{name}-mkrescue
%{_bindir}/%{name}-mkstandalone
%{_bindir}/%{name}-mount
+%{_bindir}/%{name}-render-label
%{_bindir}/%{name}-script-check
%dir %{_libdir}/%{name}
%dir %{_datadir}/%{name}
@@ -591,21 +581,23 @@
%{_infodir}/%{name}.info*
%{_mandir}/man1/%{name}-editenv.1.*
%{_mandir}/man1/%{name}-fstest.1.*
+%{_mandir}/man1/%{name}-glue-efi.1.*
%{_mandir}/man1/%{name}-kbdcomp.1.*
%{_mandir}/man1/%{name}-menulst2cfg.1.*
%{_mandir}/man1/%{name}-mkfont.1.*
%{_mandir}/man1/%{name}-mkimage.1.*
%{_mandir}/man1/%{name}-mklayout.1.*
+%{_mandir}/man1/%{name}-mknetdir.1.*
%{_mandir}/man1/%{name}-mkpasswd-pbkdf2.1.*
%{_mandir}/man1/%{name}-mkrelpath.1.*
%{_mandir}/man1/%{name}-mkrescue.1.*
%{_mandir}/man1/%{name}-mkstandalone.1.*
%{_mandir}/man1/%{name}-mount.1.*
+%{_mandir}/man1/%{name}-render-label.1.*
%{_mandir}/man1/%{name}-script-check.1.*
%{_mandir}/man8/%{name}-bios-setup.8.*
%{_mandir}/man8/%{name}-install.8.*
%{_mandir}/man8/%{name}-mkconfig.8.*
-%{_mandir}/man8/%{name}-mknetdir.8.*
%{_mandir}/man8/%{name}-ofpathname.8.*
%{_mandir}/man8/%{name}-probe.8.*
%{_mandir}/man8/%{name}-reboot.8.*
@@ -617,6 +609,10 @@
%files %{grubarch}
%defattr(-,root,root,-)
%dir %{_libdir}/%{name}/%{grubarch}
+%ifarch ppc ppc64
+%{_libdir}/%{name}/%{grubarch}/%{name}.chrp
+%{_libdir}/%{name}/%{grubarch}/bootinfo.txt
+%endif
%ifnarch ppc ppc64
%{_libdir}/%{name}/%{grubarch}/*.image
%endif
++++++ Makefile.core.am ++++++
++++ 40981 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/grub2/Makefile.core.am
++++ and /work/SRC/openSUSE:Factory/.grub2.new/Makefile.core.am
++++++ Makefile.util.am ++++++
++++ 23860 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/grub2/Makefile.util.am
++++ and /work/SRC/openSUSE:Factory/.grub2.new/Makefile.util.am
++++++ grub-2.00.tar.xz ++++++
++++ 1700383 lines of diff (skipped)
++++++ grub2-iterate-and-hook-for-extended-partition.patch ++++++
--- /var/tmp/diff_new_pack.wl5u2F/_old 2013-06-26 20:19:08.000000000 +0200
+++ /var/tmp/diff_new_pack.wl5u2F/_new 2013-06-26 20:19:08.000000000 +0200
@@ -20,7 +20,7 @@
===================================================================
--- grub-2.00.orig/grub-core/partmap/msdos.c
+++ grub-2.00/grub-core/partmap/msdos.c
-@@ -181,13 +181,20 @@ grub_partition_msdos_iterate (grub_disk_
+@@ -188,13 +188,20 @@ grub_partition_msdos_iterate (grub_disk_
(unsigned long long) p.len);
/* If this partition is a normal one, call the hook. */
@@ -33,16 +33,16 @@
+ {
+ p.number++;
-- if (hook (disk, &p))
+- if (hook (disk, &p, hook_data))
- return grub_errno;
+ /* prevent someone doing mkfs or mkswap on an
+ extended partition, but leave room for LILO */
+ if (grub_msdos_partition_is_extended (e->type))
+ p.len = 2;
+
-+ if (hook (disk, &p))
++ if (hook (disk, &p, hook_data))
+ return grub_errno;
+ }
}
- else if (p.number < 4)
+ else if (p.number < 3)
/* If this partition is a logical one, shouldn't increase the
++++++ grub2-linguas.sh-no-rsync.patch ++++++
From: Andrey Borzenkov
Subject: disable rsync to make it possible to use in RPM build
We need to create po/LINGUAS to generate message catalogs. Use
linguas.sh to ensure we always use the same rules as upstream, but
disable rsync.
Index: grub-2.00/linguas.sh
===================================================================
--- grub-2.00.orig/linguas.sh
+++ grub-2.00/linguas.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-rsync -Lrtvz --exclude=ko.po translationproject.org::tp/latest/grub/ po
+#rsync -Lrtvz --exclude=ko.po translationproject.org::tp/latest/grub/ po
autogenerated="en@quot en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH"
@@ -14,7 +14,7 @@ done
(
cd po && ls *.po| cut -d. -f1
for x in $autogenerated; do
- echo "$x";
+ : echo "$x";
done
) | sort | uniq | xargs
) >po/LINGUAS
++++++ grub2-linux.patch ++++++
--- /var/tmp/diff_new_pack.wl5u2F/_old 2013-06-26 20:19:08.000000000 +0200
+++ /var/tmp/diff_new_pack.wl5u2F/_new 2013-06-26 20:19:08.000000000 +0200
@@ -1,7 +1,7 @@
-Index: grub-1.99/util/grub.d/10_linux.in
+Index: grub-2.00/util/grub.d/10_linux.in
===================================================================
---- grub-1.99.orig/util/grub.d/10_linux.in
-+++ grub-1.99/util/grub.d/10_linux.in
+--- grub-2.00.orig/util/grub.d/10_linux.in
++++ grub-2.00/util/grub.d/10_linux.in
@@ -31,7 +31,7 @@ CLASS="--class gnu-linux --class gnu --c
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU/Linux
@@ -11,10 +11,10 @@
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
fi
-@@ -116,7 +116,7 @@ EOF
+@@ -135,7 +135,7 @@ linux_entry ()
message="$(gettext_printf "Loading Linux %s ..." ${version})"
sed "s/^/$submenu_indentation/" << EOF
- echo '$message'
+ echo '$(echo "$message" | grub_quote)'
- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ${args}
EOF
++++++ grub2-secureboot-add-linuxefi.patch ++++++
--- /var/tmp/diff_new_pack.wl5u2F/_old 2013-06-26 20:19:09.000000000 +0200
+++ /var/tmp/diff_new_pack.wl5u2F/_new 2013-06-26 20:19:09.000000000 +0200
@@ -15,11 +15,11 @@
5 files changed, 415 insertions(+), 0 deletions(-)
create mode 100644 grub-core/loader/i386/efi/linux.c
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 39e77a4..f9cbfc3 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -1415,6 +1415,14 @@ module = {
+Index: grub-2.00/grub-core/Makefile.core.def
+===================================================================
+--- grub-2.00.orig/grub-core/Makefile.core.def
++++ grub-2.00/grub-core/Makefile.core.def
+@@ -1453,6 +1453,14 @@ module = {
};
module = {
@@ -34,11 +34,11 @@
name = chain;
efi = loader/efi/chainloader.c;
i386_pc = loader/i386/pc/chainloader.c;
-diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index a2edc84..88b2557 100644
---- a/grub-core/kern/efi/mm.c
-+++ b/grub-core/kern/efi/mm.c
-@@ -47,6 +47,38 @@ static grub_efi_uintn_t finish_desc_size;
+Index: grub-2.00/grub-core/kern/efi/mm.c
+===================================================================
+--- grub-2.00.orig/grub-core/kern/efi/mm.c
++++ grub-2.00/grub-core/kern/efi/mm.c
+@@ -47,6 +47,38 @@ static grub_efi_uintn_t finish_desc_size
static grub_efi_uint32_t finish_desc_version;
int grub_efi_is_finished = 0;
@@ -77,11 +77,10 @@
/* Allocate pages. Return the pointer to the first of allocated pages. */
void *
grub_efi_allocate_pages (grub_efi_physical_address_t address,
-diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-new file mode 100644
-index 0000000..b79e632
+Index: grub-2.00/grub-core/loader/i386/efi/linux.c
+===================================================================
--- /dev/null
-+++ b/grub-core/loader/i386/efi/linux.c
++++ grub-2.00/grub-core/loader/i386/efi/linux.c
@@ -0,0 +1,371 @@
+/*
+ * GRUB -- GRand Unified Bootloader
@@ -179,13 +178,13 @@
+ grub_dl_unref (my_mod);
+ loaded = 0;
+ if (initrd_mem)
-+ grub_efi_free_pages((grub_efi_physical_address_t)initrd_mem, BYTES_TO_PAGES(params->ramdisk_size));
++ grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)initrd_mem, BYTES_TO_PAGES(params->ramdisk_size));
+ if (linux_cmdline)
-+ grub_efi_free_pages((grub_efi_physical_address_t)linux_cmdline, BYTES_TO_PAGES(params->cmdline_size + 1));
++ grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)linux_cmdline, BYTES_TO_PAGES(params->cmdline_size + 1));
+ if (kernel_mem)
-+ grub_efi_free_pages((grub_efi_physical_address_t)kernel_mem, BYTES_TO_PAGES(kernel_size));
++ grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)kernel_mem, BYTES_TO_PAGES(kernel_size));
+ if (params)
-+ grub_efi_free_pages((grub_efi_physical_address_t)params, BYTES_TO_PAGES(16384));
++ grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)params, BYTES_TO_PAGES(16384));
+ return GRUB_ERR_NONE;
+}
+
@@ -233,7 +232,7 @@
+ }
+
+ params->ramdisk_size = size;
-+ params->ramdisk_image = (grub_uint32_t)(grub_uint64_t) initrd_mem;
++ params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem;
+
+ ptr = initrd_mem;
+
@@ -260,7 +259,7 @@
+ grub_free (files);
+
+ if (initrd_mem && grub_errno)
-+ grub_efi_free_pages((grub_efi_physical_address_t)initrd_mem, BYTES_TO_PAGES(size));
++ grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)initrd_mem, BYTES_TO_PAGES(size));
+
+ return grub_errno;
+}
@@ -369,7 +368,7 @@
+ linux_cmdline + sizeof (LINUX_IMAGE) - 1,
+ lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1));
+
-+ lh.cmd_line_ptr = (grub_uint32_t)(grub_uint64_t)linux_cmdline;
++ lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
+
+ handover_offset = lh.handover_offset;
+
@@ -406,7 +405,7 @@
+ {
+ grub_loader_set (grub_linuxefi_boot, grub_linuxefi_unload, 0);
+ loaded = 1;
-+ lh.code32_start = (grub_uint32_t)(grub_uint64_t) kernel_mem;
++ lh.code32_start = (grub_uint32_t)(grub_addr_t) kernel_mem;
+ }
+
+ memcpy(params, &lh, 2 * 512);
@@ -425,13 +424,13 @@
+ }
+
+ if (linux_cmdline && !loaded)
-+ grub_efi_free_pages((grub_efi_physical_address_t)linux_cmdline, BYTES_TO_PAGES(lh.cmdline_size + 1));
++ grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)linux_cmdline, BYTES_TO_PAGES(lh.cmdline_size + 1));
+
+ if (kernel_mem && !loaded)
-+ grub_efi_free_pages((grub_efi_physical_address_t)kernel_mem, BYTES_TO_PAGES(kernel_size));
++ grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)kernel_mem, BYTES_TO_PAGES(kernel_size));
+
+ if (params && !loaded)
-+ grub_efi_free_pages((grub_efi_physical_address_t)params, BYTES_TO_PAGES(16384));
++ grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)params, BYTES_TO_PAGES(16384));
+
+ return grub_errno;
+}
@@ -454,11 +453,11 @@
+ grub_unregister_command (cmd_linux);
+ grub_unregister_command (cmd_initrd);
+}
-diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index e67d92b..1b0e7ae 100644
---- a/include/grub/efi/efi.h
-+++ b/include/grub/efi/efi.h
-@@ -40,6 +40,9 @@ void EXPORT_FUNC(grub_efi_stall) (grub_efi_uintn_t microseconds);
+Index: grub-2.00/include/grub/efi/efi.h
+===================================================================
+--- grub-2.00.orig/include/grub/efi/efi.h
++++ grub-2.00/include/grub/efi/efi.h
+@@ -40,6 +40,9 @@ void EXPORT_FUNC(grub_efi_stall) (grub_e
void *
EXPORT_FUNC(grub_efi_allocate_pages) (grub_efi_physical_address_t address,
grub_efi_uintn_t pages);
@@ -468,10 +467,10 @@
void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
grub_efi_uintn_t pages);
int
-diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index 9d064c8..c29c5af 100644
---- a/include/grub/i386/linux.h
-+++ b/include/grub/i386/linux.h
+Index: grub-2.00/include/grub/i386/linux.h
+===================================================================
+--- grub-2.00.orig/include/grub/i386/linux.h
++++ grub-2.00/include/grub/i386/linux.h
@@ -139,6 +139,7 @@ struct linux_kernel_header
grub_uint64_t setup_data;
grub_uint64_t pref_address;
@@ -480,6 +479,3 @@
} __attribute__ ((packed));
/* Boot parameters for Linux based on 2.6.12. This is used by the setup
---
-1.7.3.4
-
++++++ grub2-secureboot-chainloader.patch ++++++
--- /var/tmp/diff_new_pack.wl5u2F/_old 2013-06-26 20:19:09.000000000 +0200
+++ /var/tmp/diff_new_pack.wl5u2F/_new 2013-06-26 20:19:09.000000000 +0200
@@ -25,9 +25,9 @@
===================================================================
--- grub-2.00.orig/grub-core/loader/efi/chainloader.c
+++ grub-2.00/grub-core/loader/efi/chainloader.c
-@@ -36,15 +36,31 @@
- #include
- #include
+@@ -40,15 +40,31 @@
+ #include
+ #endif
+#ifdef __x86_64__
+#define SUPPORT_SECURE_BOOT
@@ -57,7 +57,7 @@
static grub_err_t
grub_chainloader_unload (void)
-@@ -59,6 +75,7 @@ grub_chainloader_unload (void)
+@@ -63,6 +79,7 @@ grub_chainloader_unload (void)
grub_free (cmdline);
cmdline = 0;
file_path = 0;
@@ -65,7 +65,7 @@
grub_dl_unref (my_mod);
return GRUB_ERR_NONE;
-@@ -186,19 +203,466 @@ make_file_path (grub_efi_device_path_t *
+@@ -190,12 +207,460 @@ make_file_path (grub_efi_device_path_t *
return file_path;
}
@@ -527,14 +527,15 @@
grub_efi_status_t status;
grub_efi_boot_services_t *b;
grub_device_t dev = 0;
- grub_efi_device_path_t *dp = 0;
+@@ -203,7 +668,6 @@ grub_cmd_chainloader (grub_command_t cmd
grub_efi_loaded_image_t *loaded_image;
char *filename;
+ void *boot_image = 0;
- grub_efi_handle_t dev_handle = 0;
if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-@@ -210,9 +674,36 @@ grub_cmd_chainloader (grub_command_t cmd
+@@ -215,9 +679,36 @@ grub_cmd_chainloader (grub_command_t cmd
address = 0;
image_handle = 0;
file_path = 0;
@@ -571,7 +572,7 @@
file = grub_file_open (filename);
if (! file)
goto fail;
-@@ -258,14 +749,14 @@ grub_cmd_chainloader (grub_command_t cmd
+@@ -263,14 +754,14 @@ grub_cmd_chainloader (grub_command_t cmd
grub_printf ("file path: ");
grub_efi_print_device_path (file_path);
@@ -589,20 +590,44 @@
status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ANY_PAGES,
GRUB_EFI_LOADER_CODE,
-@@ -278,7 +769,7 @@ grub_cmd_chainloader (grub_command_t cmd
- goto fail;
+@@ -284,7 +775,7 @@ grub_cmd_chainloader (grub_command_t cmd
}
-- if (grub_file_read (file, (void *) ((grub_addr_t) address), size) != size)
-+ if (grub_file_read (file, (void *) ((grub_addr_t) address), fsize) != fsize)
+ boot_image = (void *) ((grub_addr_t) address);
+- if (grub_file_read (file, boot_image, size) != size)
++ if (grub_file_read (file, boot_image, fsize) != fsize)
{
if (grub_errno == GRUB_ERR_NONE)
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -287,8 +778,17 @@ grub_cmd_chainloader (grub_command_t cmd
- goto fail;
+@@ -294,7 +785,7 @@ grub_cmd_chainloader (grub_command_t cmd
+ }
+
+ #if defined (__i386__) || defined (__x86_64__)
+- if (size >= (grub_ssize_t) sizeof (struct grub_macho_fat_header))
++ if (fsize >= (grub_ssize_t) sizeof (struct grub_macho_fat_header))
+ {
+ struct grub_macho_fat_header *head = boot_image;
+ if (head->magic
+@@ -317,20 +808,30 @@ grub_cmd_chainloader (grub_command_t cmd
+ > ~grub_cpu_to_le32 (archs[i].size)
+ || grub_cpu_to_le32 (archs[i].offset)
+ + grub_cpu_to_le32 (archs[i].size)
+- > (grub_size_t) size)
++ > (grub_size_t) fsize)
+ {
+ grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
+ filename);
+ goto fail;
+ }
+ boot_image = (char *) boot_image + grub_cpu_to_le32 (archs[i].offset);
+- size = grub_cpu_to_le32 (archs[i].size);
++ fsize = grub_cpu_to_le32 (archs[i].size);
+ }
}
+ #endif
+#ifdef SUPPORT_SECURE_BOOT
++ /* FIXME is secure boot possible also with universal binaries? */
+ if (debug_secureboot || (grub_secure_mode() && grub_secure_validate ((void *)address, fsize)))
+ {
+ grub_file_close (file);
@@ -612,12 +637,12 @@
+#endif
+
status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, file_path,
-- (void *) ((grub_addr_t) address), size,
-+ (void *) ((grub_addr_t) address), fsize,
- &image_handle);
+- boot_image, size,
++ boot_image, fsize,
+ &image_handle);
if (status != GRUB_EFI_SUCCESS)
{
-@@ -313,33 +813,10 @@ grub_cmd_chainloader (grub_command_t cmd
+@@ -355,33 +856,10 @@ grub_cmd_chainloader (grub_command_t cmd
grub_file_close (file);
@@ -653,7 +678,7 @@
}
grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
-@@ -358,6 +835,9 @@ grub_cmd_chainloader (grub_command_t cmd
+@@ -400,6 +878,9 @@ grub_cmd_chainloader (grub_command_t cmd
if (address)
efi_call_2 (b->free_pages, address, pages);
++++++ grub2-secureboot-no-insmod-on-sb.patch ++++++
--- /var/tmp/diff_new_pack.wl5u2F/_old 2013-06-26 20:19:09.000000000 +0200
+++ /var/tmp/diff_new_pack.wl5u2F/_new 2013-06-26 20:19:09.000000000 +0200
@@ -28,7 +28,7 @@
/* set ENVVAR=VALUE */
static grub_err_t
grub_core_cmd_set (struct grub_command *cmd __attribute__ ((unused)),
-@@ -81,6 +85,13 @@ grub_core_cmd_insmod (struct grub_comman
+@@ -75,6 +79,13 @@ grub_core_cmd_insmod (struct grub_comman
{
grub_dl_t mod;
@@ -46,7 +46,7 @@
===================================================================
--- grub-2.00.orig/grub-core/kern/efi/efi.c
+++ grub-2.00/grub-core/kern/efi/efi.c
-@@ -229,6 +229,34 @@ grub_efi_get_variable (const char *var,
+@@ -259,6 +259,34 @@ grub_efi_get_variable (const char *var,
return NULL;
}
@@ -85,10 +85,10 @@
===================================================================
--- grub-2.00.orig/include/grub/efi/efi.h
+++ grub-2.00/include/grub/efi/efi.h
-@@ -67,6 +67,7 @@ grub_err_t EXPORT_FUNC (grub_efi_set_vir
- void *EXPORT_FUNC (grub_efi_get_variable) (const char *variable,
- const grub_efi_guid_t *guid,
- grub_size_t *datasize_out);
+@@ -72,6 +72,7 @@ EXPORT_FUNC (grub_efi_set_variable) (con
+ const grub_efi_guid_t *guid,
+ void *data,
+ grub_size_t datasize);
+grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);
int
EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
++++++ grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch ++++++
--- /var/tmp/diff_new_pack.wl5u2F/_old 2013-06-26 20:19:09.000000000 +0200
+++ /var/tmp/diff_new_pack.wl5u2F/_new 2013-06-26 20:19:09.000000000 +0200
@@ -24,8 +24,8 @@
osx_entry() {
if [ x$2 = x32 ]; then
# TRANSLATORS: it refers to kernel architecture (32-bit)
-@@ -207,11 +216,11 @@ EOF
- save_default_entry | sed -e "s/^/\t/"
+@@ -216,11 +225,11 @@ EOF
+ save_default_entry | grub_add_tab
printf '%s\n' "${prepare_boot_cache}"
cat << EOF
- linux ${LKERNEL} ${LPARAMS}
@@ -38,9 +38,9 @@
EOF
fi
cat << EOF
-@@ -227,11 +236,11 @@ EOF
- save_default_entry | sed -e "s/^/\t\t/"
- printf '%s\n' "${prepare_boot_cache}" | sed -e "s/^/\t/"
+@@ -236,11 +245,11 @@ EOF
+ save_default_entry | sed -e "s/^/$grub_tab$grub_tab/"
+ printf '%s\n' "${prepare_boot_cache}" | grub_add_tab
cat << EOF
- linux ${LKERNEL} ${LPARAMS}
+ ${LINUX_LOADER_CMD} ${LKERNEL} ${LPARAMS}
++++++ rename-grub-info-file-to-grub2.patch ++++++
--- /var/tmp/diff_new_pack.wl5u2F/_old 2013-06-26 20:19:09.000000000 +0200
+++ /var/tmp/diff_new_pack.wl5u2F/_new 2013-06-26 20:19:09.000000000 +0200
@@ -11,16 +11,11 @@
files - Makefile.core.am and Makefile.util.am - it may be necessary to
manually rename it.
---
- docs/Makefile.am | 2 +-
- docs/Makefile.in | 46 ++++++++++++++++++++--------------------
- docs/{grub.texi => grub2.texi} | 2 +-
- 3 files changed, 25 insertions(+), 25 deletions(-)
- rename docs/{grub.texi => grub2.texi} (99%)
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 93eb396..4143042 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
+Index: grub-2.00/docs/Makefile.am
+===================================================================
+--- grub-2.00.orig/docs/Makefile.am
++++ grub-2.00/docs/Makefile.am
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = subdir-objects
@@ -30,22 +25,20 @@
grub_TEXINFOS = fdl.texi
EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
-diff --git a/docs/Makefile.in b/docs/Makefile.in
-index 217ea7e..49dc477 100644
---- a/docs/Makefile.in
-+++ b/docs/Makefile.in
-@@ -35,8 +35,8 @@ build_triplet = @build@
+Index: grub-2.00/docs/Makefile.in
+===================================================================
+--- grub-2.00.orig/docs/Makefile.in
++++ grub-2.00/docs/Makefile.in
+@@ -51,7 +51,7 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = docs
-DIST_COMMON = $(grub_TEXINFOS) $(srcdir)/Makefile.am \
-- $(srcdir)/Makefile.in $(srcdir)/stamp-1 $(srcdir)/stamp-vti \
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+ $(srcdir)/stamp-1 $(srcdir)/stamp-vti \
- $(srcdir)/version-dev.texi $(srcdir)/version.texi mdate-sh \
- texinfo.tex
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -91,14 +91,14 @@ CONFIG_CLEAN_FILES =
++DIST_COMMON = $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/stamp-1 $(srcdir)/stamp-vti \
+ $(srcdir)/version-dev.texi $(srcdir)/version.texi \
+ $(top_srcdir)/build-aux/mdate-sh \
+@@ -108,14 +108,14 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
@@ -66,7 +59,7 @@
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
-@@ -767,7 +767,7 @@ top_srcdir = @top_srcdir@
+@@ -810,7 +810,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = subdir-objects
# AM_MAKEINFOFLAGS = --no-split --no-validate
@@ -75,7 +68,7 @@
grub_TEXINFOS = fdl.texi
EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
all: all-am
-@@ -850,14 +850,14 @@ $(am__aclocal_m4_deps):
+@@ -893,14 +893,14 @@ $(am__aclocal_m4_deps):
rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
exit 1; \
fi
@@ -97,7 +90,7 @@
echo "@set UPDATED $$1 $$2 $$3"; \
echo "@set UPDATED-MONTH $$2 $$3"; \
echo "@set EDITION $(VERSION)"; \
-@@ -979,16 +979,16 @@ dist-info: $(INFO_DEPS)
+@@ -1020,16 +1020,16 @@ dist-info: $(INFO_DEPS)
done
mostlyclean-aminfo:
@@ -134,6 +127,3 @@
@include version.texi
@settitle GNU GRUB Manual @value{VERSION}
@c Unify all our little indices for now.
---
-1.7.10.4
-
++++++ use-grub2-as-a-package-name.patch ++++++
--- /var/tmp/diff_new_pack.wl5u2F/_old 2013-06-26 20:19:09.000000000 +0200
+++ /var/tmp/diff_new_pack.wl5u2F/_new 2013-06-26 20:19:09.000000000 +0200
@@ -12,19 +12,19 @@
configure.ac | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
-diff --git a/configure b/configure
-index 50e6bf6..544c16a 100755
---- a/configure
-+++ b/configure
+Index: grub-2.00/configure
+===================================================================
+--- grub-2.00.orig/configure
++++ grub-2.00/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.68 for GRUB 2.00.
-+# Generated by GNU Autoconf 2.68 for GRUB2 2.00.
+-# Generated by GNU Autoconf 2.69 for GRUB 2.00.
++# Generated by GNU Autoconf 2.69 for GRUB2 2.00.
#
# Report bugs to .
#
-@@ -558,10 +558,10 @@ MFLAGS=
+@@ -578,10 +578,10 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
@@ -38,7 +38,7 @@
PACKAGE_BUGREPORT='bug-grub@gnu.org'
PACKAGE_URL=''
-@@ -1904,7 +1904,7 @@ if test "$ac_init_help" = "long"; then
+@@ -1938,7 +1938,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
@@ -47,7 +47,7 @@
Usage: $0 [OPTION]... [VAR=VALUE]...
-@@ -1952,7 +1952,7 @@ Fine tuning of the installation directories:
+@@ -1986,7 +1986,7 @@ Fine tuning of the installation director
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -56,7 +56,7 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -1975,7 +1975,7 @@ fi
+@@ -2009,7 +2009,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
@@ -65,25 +65,25 @@
esac
cat <<\_ACEOF
-@@ -2108,7 +2108,7 @@ fi
+@@ -2144,7 +2144,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GRUB configure 2.00
+GRUB2 configure 2.00
- generated by GNU Autoconf 2.68
+ generated by GNU Autoconf 2.69
- Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -2812,7 +2812,7 @@ cat >config.log <<_ACEOF
+ Copyright (C) 2012 Free Software Foundation, Inc.
+@@ -2853,7 +2853,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GRUB $as_me 2.00, which was
+It was created by GRUB2 $as_me 2.00, which was
- generated by GNU Autoconf 2.68. Invocation command line was
+ generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
-@@ -3789,7 +3789,7 @@ fi
+@@ -3839,7 +3839,7 @@ fi
# Define the identity of the package.
@@ -92,29 +92,29 @@
VERSION='2.00'
-@@ -23344,7 +23344,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+@@ -23470,7 +23470,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GRUB $as_me 2.00, which was
+This file was extended by GRUB2 $as_me 2.00, which was
- generated by GNU Autoconf 2.68. Invocation command line was
+ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
-@@ -23414,7 +23414,7 @@ _ACEOF
+@@ -23540,7 +23540,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GRUB config.status 2.00
+GRUB2 config.status 2.00
- configured by $0, generated by GNU Autoconf 2.68,
+ configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-diff --git a/configure.ac b/configure.ac
-index 1b5132c..5ea7ffe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ dnl type, so there is no conflict. Variables with the prefix "TARGET_"
+Index: grub-2.00/configure.ac
+===================================================================
+--- grub-2.00.orig/configure.ac
++++ grub-2.00/configure.ac
+@@ -32,7 +32,7 @@ dnl type, so there is no conflict. Varia
dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
dnl type.
@@ -123,6 +123,3 @@
AC_CONFIG_AUX_DIR([build-aux])
---
-1.7.10.4
-
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org