Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2017-02-14 00:38:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2017-02-07 11:58:00.572008842 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-02-14 00:38:51.791028161 +0100 @@ -1,0 +2,44 @@ +Fri Feb 10 17:58:22 UTC 2017 - [email protected] + +- new upstream version 2.02~rc1 + * rediff + - use-grub2-as-a-package-name.patch + - grub2-s390x-04-grub2-install.patch + - grub2-accept-empty-module.patch + - grub2-btrfs-04-grub2-install.patch + - grub2-btrfs-06-subvol-mount.patch + * drop upstream patches + - 0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch + - 0001-build-Use-AC_HEADER_MAJOR-to-find-device-macros.patch + - 0002-configure-fix-check-for-sys-sysmacros.h-under-glibc-.patch + - 0001-Fix-fwpath-in-efi-netboot.patch + - 0001-arm64-Move-firmware-fdt-search-into-global-function.patch + - 0002-arm-efi-Use-fdt-from-firmware-when-available.patch + - grub2-arm64-mknetdir-add-suport-for-arm64-efi.patch + - 0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch + - 0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch + - 0001-xen-make-xen-loader-callable-multiple-times.patch + - 0002-xen-avoid-memleaks-on-error.patch + - 0003-xen-reduce-number-of-global-variables-in-xen-loader.patch + - 0004-xen-add-elfnote.h-to-avoid-using-numbers-instead-of-.patch + - 0005-xen-synchronize-xen-header.patch + - 0006-xen-factor-out-p2m-list-allocation-into-separate-fun.patch + - 0007-xen-factor-out-allocation-of-special-pages-into-sepa.patch + - 0008-xen-factor-out-allocation-of-page-tables-into-separa.patch + - 0009-xen-add-capability-to-load-initrd-outside-of-initial.patch + - 0010-xen-modify-page-table-construction.patch + - 0011-xen-add-capability-to-load-p2m-list-outside-of-kerne.patch + * add + - fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch + fix compilation with new glibc + +------------------------------------------------------------------- +Thu Feb 9 03:45:16 UTC 2017 - [email protected] + +- Fix build error on glibc-2.25 + * 0001-build-Use-AC_HEADER_MAJOR-to-find-device-macros.patch + * 0002-configure-fix-check-for-sys-sysmacros.h-under-glibc-.patch +- Fix fwpath in efi netboot (fate#321993) (bsc#1022294) + * 0001-Fix-fwpath-in-efi-netboot.patch + +------------------------------------------------------------------- Old: ---- 0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch 0001-arm64-Move-firmware-fdt-search-into-global-function.patch 0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch 0001-xen-make-xen-loader-callable-multiple-times.patch 0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch 0002-arm-efi-Use-fdt-from-firmware-when-available.patch 0002-xen-avoid-memleaks-on-error.patch 0003-xen-reduce-number-of-global-variables-in-xen-loader.patch 0004-xen-add-elfnote.h-to-avoid-using-numbers-instead-of-.patch 0005-xen-synchronize-xen-header.patch 0006-xen-factor-out-p2m-list-allocation-into-separate-fun.patch 0007-xen-factor-out-allocation-of-special-pages-into-sepa.patch 0008-xen-factor-out-allocation-of-page-tables-into-separa.patch 0009-xen-add-capability-to-load-initrd-outside-of-initial.patch 0010-xen-modify-page-table-construction.patch 0011-xen-add-capability-to-load-p2m-list-outside-of-kerne.patch grub-2.02~beta3.tar.xz grub2-arm64-mknetdir-add-suport-for-arm64-efi.patch New: ---- fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch grub-2.02~rc1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.82a0Wj/_old 2017-02-14 00:38:58.010150144 +0100 +++ /var/tmp/diff_new_pack.82a0Wj/_new 2017-02-14 00:38:58.014149579 +0100 @@ -123,7 +123,7 @@ %define only_x86_64 %{nil} %endif -Version: 2.02~beta3 +Version: 2.02~rc1 Release: 0 Summary: Bootloader with support for Linux, Multiboot and more License: GPL-3.0+ @@ -186,7 +186,6 @@ Patch70: grub2-default-distributor.patch Patch71: grub2-menu-unrestricted.patch Patch72: grub2-mkconfig-arm.patch -Patch73: 0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch Patch74: grub2-accept-empty-module.patch # Btrfs snapshot booting related patches Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch @@ -201,18 +200,12 @@ Patch120: grub2-efi-xen-chainload.patch Patch121: grub2-efi-chainloader-root.patch Patch122: grub2-efi-xen-cmdline.patch -# 32bit ARM EFI FDT table pass-through support -Patch130: 0001-arm64-Move-firmware-fdt-search-into-global-function.patch -Patch131: 0002-arm-efi-Use-fdt-from-firmware-when-available.patch -Patch132: grub2-arm64-mknetdir-add-suport-for-arm64-efi.patch # Hidden menu entry and hotkey "t" for text console Patch140: grub2-Add-hidden-menu-entries.patch Patch141: grub2-SUSE-Add-the-t-hotkey.patch # EFI free memory on exit fix (bsc#980739) Patch150: grub2-efi-Free-malloc-regions-on-exit.patch # Linux root device related patches -Patch160: 0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch -Patch161: 0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch Patch162: grub2-fix-multi-device-root-kernel-argument.patch Patch163: grub2-zipl-setup-fix-btrfs-multipledev.patch Patch164: grub2-suse-remove-linux-root-param.patch @@ -220,6 +213,7 @@ Patch205: grub2-ppc64le-disable-video.patch Patch207: grub2-ppc64le-memory-map.patch Patch233: grub2-use-stat-instead-of-udevadm-for-partition-lookup.patch +Patch234: fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch Patch235: 0002-Add-Virtual-LAN-support.patch Patch236: grub2-efi_gop-avoid-low-resolution.patch Patch277: grub2-ppc64-cas-reboot-support.patch @@ -232,18 +226,6 @@ Patch285: 0006-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch Patch286: 0007-efinet-Setting-network-from-UEFI-device-path.patch Patch287: 0008-efinet-Setting-DNS-server-from-UEFI-protocol.patch -# Support booting huge xen pv-domains (bsc#1004398) (bsc#899465) -Patch300: 0001-xen-make-xen-loader-callable-multiple-times.patch -Patch301: 0002-xen-avoid-memleaks-on-error.patch -Patch302: 0003-xen-reduce-number-of-global-variables-in-xen-loader.patch -Patch303: 0004-xen-add-elfnote.h-to-avoid-using-numbers-instead-of-.patch -Patch304: 0005-xen-synchronize-xen-header.patch -Patch305: 0006-xen-factor-out-p2m-list-allocation-into-separate-fun.patch -Patch306: 0007-xen-factor-out-allocation-of-special-pages-into-sepa.patch -Patch307: 0008-xen-factor-out-allocation-of-page-tables-into-separa.patch -Patch308: 0009-xen-add-capability-to-load-initrd-outside-of-initial.patch -Patch309: 0010-xen-modify-page-table-construction.patch -Patch310: 0011-xen-add-capability-to-load-p2m-list-outside-of-kerne.patch # Fix GOP BLT support (FATE#322332) Patch311: grub2-efi-gop-add-blt.patch @@ -450,7 +432,6 @@ %patch70 -p1 %patch71 -p1 %patch72 -p1 -%patch73 -p1 %patch74 -p1 %patch101 -p1 %patch102 -p1 @@ -463,20 +444,16 @@ %patch120 -p1 %patch121 -p1 %patch122 -p1 -%patch130 -p1 -%patch131 -p1 -%patch132 -p1 %patch140 -p1 %patch141 -p1 %patch150 -p1 -%patch160 -p1 -%patch161 -p1 %patch162 -p1 %patch163 -p1 %patch164 -p1 %patch205 -p1 %patch207 -p1 %patch233 -p1 +%patch234 -p1 %patch235 -p1 %patch236 -p1 %patch277 -p1 @@ -488,17 +465,6 @@ %patch285 -p1 %patch286 -p1 %patch287 -p1 -%patch300 -p1 -%patch301 -p1 -%patch302 -p1 -%patch303 -p1 -%patch304 -p1 -%patch305 -p1 -%patch306 -p1 -%patch307 -p1 -%patch308 -p1 -%patch309 -p1 -%patch310 -p1 %patch311 -p1 # This simplifies patch handling without need to use git to create patch ++++++ fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch ++++++ Index: grub-2.02~rc1/grub-core/osdep/linux/hostdisk.c =================================================================== --- grub-2.02~rc1.orig/grub-core/osdep/linux/hostdisk.c +++ grub-2.02~rc1/grub-core/osdep/linux/hostdisk.c @@ -45,6 +45,12 @@ #include <errno.h> #include <limits.h> +#if defined(MAJOR_IN_MKDEV) +#include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +#include <sys/sysmacros.h> +#endif + # include <sys/ioctl.h> /* ioctl */ # include <sys/mount.h> # ifndef BLKFLSBUF ++++++ grub2-accept-empty-module.patch ++++++ --- /var/tmp/diff_new_pack.82a0Wj/_old 2017-02-14 00:38:58.190124735 +0100 +++ /var/tmp/diff_new_pack.82a0Wj/_new 2017-02-14 00:38:58.190124735 +0100 @@ -6,10 +6,12 @@ with binutils 2.27 not even a .symtab remains. As there are also no relocations that's no problem (and that is checked independendly). ---- grub-2.02~beta3/util/grub-module-verifierXX.c.mm 2016-02-11 10:57:41.000000000 +0000 -+++ grub-2.02~beta3/util/grub-module-verifierXX.c 2016-08-31 15:26:36.000000000 +0000 -@@ -199,7 +199,8 @@ check_symbols (const struct grub_module_ - Elf_Shdr *s = find_section (arch, e, ".moddeps"); +Index: grub-2.02~rc1/util/grub-module-verifierXX.c +=================================================================== +--- grub-2.02~rc1.orig/util/grub-module-verifierXX.c ++++ grub-2.02~rc1/util/grub-module-verifierXX.c +@@ -224,7 +224,8 @@ check_symbols (const struct grub_module_ + s = find_section (arch, e, ".moddeps"); if (!s) - grub_util_error ("no symbol table and no .moddeps section"); ++++++ grub2-btrfs-04-grub2-install.patch ++++++ --- /var/tmp/diff_new_pack.82a0Wj/_old 2017-02-14 00:38:58.206122476 +0100 +++ /var/tmp/diff_new_pack.82a0Wj/_new 2017-02-14 00:38:58.206122476 +0100 @@ -1,8 +1,8 @@ -Index: grub-2.02~beta2/grub-core/osdep/unix/config.c +Index: grub-2.02~rc1/grub-core/osdep/unix/config.c =================================================================== ---- grub-2.02~beta2.orig/grub-core/osdep/unix/config.c -+++ grub-2.02~beta2/grub-core/osdep/unix/config.c -@@ -200,6 +200,19 @@ grub_util_load_config (struct grub_util_ +--- grub-2.02~rc1.orig/grub-core/osdep/unix/config.c ++++ grub-2.02~rc1/grub-core/osdep/unix/config.c +@@ -219,6 +219,19 @@ grub_util_load_config (struct grub_util_ if (v) cfg->grub_distributor = xstrdup (v); @@ -22,7 +22,7 @@ cfgfile = grub_util_get_config_filename (); if (!grub_util_is_regular (cfgfile)) return; -@@ -223,8 +236,8 @@ grub_util_load_config (struct grub_util_ +@@ -242,8 +255,8 @@ grub_util_load_config (struct grub_util_ *ptr++ = *iptr; } @@ -33,10 +33,10 @@ argv[2] = script; argv[3] = '\0'; -Index: grub-2.02~beta2/include/grub/emu/config.h +Index: grub-2.02~rc1/include/grub/emu/config.h =================================================================== ---- grub-2.02~beta2.orig/include/grub/emu/config.h -+++ grub-2.02~beta2/include/grub/emu/config.h +--- grub-2.02~rc1.orig/include/grub/emu/config.h ++++ grub-2.02~rc1/include/grub/emu/config.h @@ -37,6 +37,7 @@ struct grub_util_config { int is_cryptodisk_enabled; @@ -45,10 +45,10 @@ }; void -Index: grub-2.02~beta2/util/config.c +Index: grub-2.02~rc1/util/config.c =================================================================== ---- grub-2.02~beta2.orig/util/config.c -+++ grub-2.02~beta2/util/config.c +--- grub-2.02~rc1.orig/util/config.c ++++ grub-2.02~rc1/util/config.c @@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct cfg->is_cryptodisk_enabled = 1; continue; @@ -66,10 +66,10 @@ if (grub_strncmp (ptr, "GRUB_DISTRIBUTOR=", sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0) { -Index: grub-2.02~beta2/util/grub-install.c +Index: grub-2.02~rc1/util/grub-install.c =================================================================== ---- grub-2.02~beta2.orig/util/grub-install.c -+++ grub-2.02~beta2/util/grub-install.c +--- grub-2.02~rc1.orig/util/grub-install.c ++++ grub-2.02~rc1/util/grub-install.c @@ -828,6 +828,8 @@ fill_core_services (const char *core_ser free (sysv_plist); } @@ -89,7 +89,7 @@ if (!bootloader_id && config.grub_distributor) { char *ptr; -@@ -1346,6 +1351,16 @@ main (int argc, char *argv[]) +@@ -1347,6 +1352,16 @@ main (int argc, char *argv[]) fprintf (load_cfg_f, "set debug='%s'\n", debug_image); } @@ -106,11 +106,11 @@ char *prefix_drive = NULL; char *install_drive = NULL; -Index: grub-2.02~beta2/grub-core/osdep/linux/getroot.c +Index: grub-2.02~rc1/grub-core/osdep/linux/getroot.c =================================================================== ---- grub-2.02~beta2.orig/grub-core/osdep/linux/getroot.c -+++ grub-2.02~beta2/grub-core/osdep/linux/getroot.c -@@ -370,6 +370,7 @@ get_btrfs_fs_prefix (const char *mount_p +--- grub-2.02~rc1.orig/grub-core/osdep/linux/getroot.c ++++ grub-2.02~rc1/grub-core/osdep/linux/getroot.c +@@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_p return NULL; } @@ -118,7 +118,7 @@ char ** grub_find_root_devices_from_mountinfo (const char *dir, char **relroot) -@@ -508,6 +509,12 @@ grub_find_root_devices_from_mountinfo (c +@@ -519,6 +520,12 @@ again: { ret = grub_find_root_devices_from_btrfs (dir); fs_prefix = get_btrfs_fs_prefix (entries[i].enc_path); @@ -129,12 +129,12 @@ + fs_prefix = xstrdup ("/"); + } } - if (!ret) + else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0) { -Index: grub-2.02~beta2/util/grub-mkrelpath.c +Index: grub-2.02~rc1/util/grub-mkrelpath.c =================================================================== ---- grub-2.02~beta2.orig/util/grub-mkrelpath.c -+++ grub-2.02~beta2/util/grub-mkrelpath.c +--- grub-2.02~rc1.orig/util/grub-mkrelpath.c ++++ grub-2.02~rc1/util/grub-mkrelpath.c @@ -40,9 +40,12 @@ struct arguments }; ++++++ grub2-btrfs-06-subvol-mount.patch ++++++ --- /var/tmp/diff_new_pack.82a0Wj/_old 2017-02-14 00:38:58.218120782 +0100 +++ /var/tmp/diff_new_pack.82a0Wj/_new 2017-02-14 00:38:58.218120782 +0100 @@ -1,7 +1,7 @@ -Index: grub-2.02~beta2/grub-core/fs/btrfs.c +Index: grub-2.02~rc1/grub-core/fs/btrfs.c =================================================================== ---- grub-2.02~beta2.orig/grub-core/fs/btrfs.c -+++ grub-2.02~beta2/grub-core/fs/btrfs.c +--- grub-2.02~rc1.orig/grub-core/fs/btrfs.c ++++ grub-2.02~rc1/grub-core/fs/btrfs.c @@ -32,6 +32,7 @@ #include <grub/command.h> #include <grub/env.h> @@ -23,7 +23,7 @@ static grub_err_t read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb) -@@ -880,9 +887,26 @@ lookup_root_by_name(struct grub_btrfs_da +@@ -887,9 +894,26 @@ lookup_root_by_name(struct grub_btrfs_da grub_err_t err; grub_uint64_t tree = 0; grub_uint8_t type; @@ -50,7 +50,7 @@ if (err) return grub_error(GRUB_ERR_FILE_NOT_FOUND, "couldn't locate %s\n", path); -@@ -1751,11 +1775,20 @@ grub_btrfs_dir (grub_device_t device, co +@@ -1758,11 +1782,20 @@ grub_btrfs_dir (grub_device_t device, co int r = 0; grub_uint64_t tree; grub_uint8_t type; @@ -72,7 +72,7 @@ if (err) { grub_btrfs_unmount (data); -@@ -1857,11 +1890,21 @@ grub_btrfs_open (struct grub_file *file, +@@ -1864,11 +1897,21 @@ grub_btrfs_open (struct grub_file *file, struct grub_btrfs_inode inode; grub_uint8_t type; struct grub_btrfs_key key_in; @@ -95,7 +95,7 @@ if (err) { grub_btrfs_unmount (data); -@@ -2032,6 +2075,150 @@ grub_cmd_btrfs_info (grub_command_t cmd +@@ -2039,6 +2082,150 @@ grub_cmd_btrfs_info (grub_command_t cmd return 0; } @@ -246,7 +246,7 @@ static grub_err_t get_fs_root(struct grub_btrfs_data *data, grub_uint64_t tree, grub_uint64_t objectid, grub_uint64_t offset, -@@ -2238,6 +2425,7 @@ static struct grub_fs grub_btrfs_fs = { +@@ -2245,6 +2432,7 @@ static struct grub_fs grub_btrfs_fs = { }; static grub_command_t cmd_info; @@ -254,7 +254,7 @@ static grub_extcmd_t cmd_list_subvols; static char * -@@ -2301,6 +2489,9 @@ GRUB_MOD_INIT (btrfs) +@@ -2308,6 +2496,9 @@ GRUB_MOD_INIT (btrfs) cmd_info = grub_register_command("btrfs-info", grub_cmd_btrfs_info, "DEVICE", "Print BtrFS info about DEVICE."); @@ -264,11 +264,11 @@ cmd_list_subvols = grub_register_extcmd("btrfs-list-subvols", grub_cmd_btrfs_list_subvols, 0, "[-p|-n] [-o var] DEVICE", -Index: grub-2.02~beta2/grub-core/osdep/linux/getroot.c +Index: grub-2.02~rc1/grub-core/osdep/linux/getroot.c =================================================================== ---- grub-2.02~beta2.orig/grub-core/osdep/linux/getroot.c -+++ grub-2.02~beta2/grub-core/osdep/linux/getroot.c -@@ -101,6 +101,14 @@ struct btrfs_ioctl_search_key +--- grub-2.02~rc1.orig/grub-core/osdep/linux/getroot.c ++++ grub-2.02~rc1/grub-core/osdep/linux/getroot.c +@@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key grub_uint32_t unused[9]; }; @@ -283,7 +283,7 @@ struct btrfs_ioctl_search_args { struct btrfs_ioctl_search_key key; grub_uint64_t buf[(4096 - sizeof(struct btrfs_ioctl_search_key)) -@@ -366,6 +374,109 @@ get_btrfs_fs_prefix (const char *mount_p +@@ -378,6 +386,109 @@ get_btrfs_fs_prefix (const char *mount_p int use_relative_path_on_btrfs = 0; @@ -393,7 +393,7 @@ char ** grub_find_root_devices_from_mountinfo (const char *dir, char **relroot) { -@@ -502,12 +613,15 @@ grub_find_root_devices_from_mountinfo (c +@@ -519,12 +630,15 @@ again: else if (grub_strcmp (entries[i].fstype, "btrfs") == 0) { ret = grub_find_root_devices_from_btrfs (dir); @@ -411,8 +411,8 @@ + fs_prefix = get_btrfs_fs_prefix (entries[i].enc_path); } } - if (!ret) -@@ -1094,6 +1208,34 @@ grub_util_get_grub_dev_os (const char *o + else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0) +@@ -1144,6 +1258,34 @@ grub_util_get_grub_dev_os (const char *o return grub_dev; } @@ -447,11 +447,11 @@ char * grub_make_system_path_relative_to_its_root_os (const char *path) { -Index: grub-2.02~beta2/util/grub-install.c +Index: grub-2.02~rc1/util/grub-install.c =================================================================== ---- grub-2.02~beta2.orig/util/grub-install.c -+++ grub-2.02~beta2/util/grub-install.c -@@ -1547,6 +1547,42 @@ main (int argc, char *argv[]) +--- grub-2.02~rc1.orig/util/grub-install.c ++++ grub-2.02~rc1/util/grub-install.c +@@ -1560,6 +1560,42 @@ main (int argc, char *argv[]) prefix_drive = xasprintf ("(%s)", grub_drives[0]); } @@ -494,10 +494,10 @@ char mkimage_target[200]; const char *core_name = NULL; -Index: grub-2.02~beta2/include/grub/emu/getroot.h +Index: grub-2.02~rc1/include/grub/emu/getroot.h =================================================================== ---- grub-2.02~beta2.orig/include/grub/emu/getroot.h -+++ grub-2.02~beta2/include/grub/emu/getroot.h +--- grub-2.02~rc1.orig/include/grub/emu/getroot.h ++++ grub-2.02~rc1/include/grub/emu/getroot.h @@ -53,6 +53,11 @@ char ** grub_find_root_devices_from_mountinfo (const char *dir, char **relroot); #endif ++++++ grub2-s390x-04-grub2-install.patch ++++++ --- /var/tmp/diff_new_pack.82a0Wj/_old 2017-02-14 00:38:58.362100455 +0100 +++ /var/tmp/diff_new_pack.82a0Wj/_new 2017-02-14 00:38:58.362100455 +0100 @@ -58,11 +58,11 @@ util/s390x/zipl2grub.pl.in | 424 +++++++++++++++++++++++++++++++++++ 13 files changed, 698 insertions(+), 4 deletions(-) -Index: grub-2.02~beta2/Makefile.util.def +Index: grub-2.02~rc1/Makefile.util.def =================================================================== ---- grub-2.02~beta2.orig/Makefile.util.def -+++ grub-2.02~beta2/Makefile.util.def -@@ -350,6 +350,7 @@ program = { +--- grub-2.02~rc1.orig/Makefile.util.def ++++ grub-2.02~rc1/Makefile.util.def +@@ -352,6 +352,7 @@ program = { ldadd = grub-core/gnulib/libgnu.a; ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; cppflags = '-DGRUB_SETUP_FUNC=grub_util_bios_setup'; @@ -70,7 +70,7 @@ }; program = { -@@ -370,6 +371,7 @@ program = { +@@ -372,6 +373,7 @@ program = { ldadd = grub-core/gnulib/libgnu.a; ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; cppflags = '-DGRUB_SETUP_FUNC=grub_util_sparc_setup'; @@ -78,7 +78,7 @@ }; program = { -@@ -385,6 +387,7 @@ program = { +@@ -387,6 +389,7 @@ program = { ldadd = libgrubkern.a; ldadd = grub-core/gnulib/libgnu.a; ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; @@ -86,15 +86,15 @@ }; program = { -@@ -415,6 +418,7 @@ program = { +@@ -402,6 +405,7 @@ program = { ldadd = libgrubkern.a; ldadd = grub-core/gnulib/libgnu.a; ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; + emu_condition = COND_NOT_s390x; }; - data = { -@@ -687,6 +691,38 @@ script = { + program = { +@@ -697,6 +701,38 @@ script = { }; script = { @@ -133,7 +133,7 @@ name = grub-mkconfig_lib; common = util/grub-mkconfig_lib.in; installdir = noinst; -@@ -1282,6 +1318,7 @@ program = { +@@ -1292,6 +1328,7 @@ program = { ldadd = libgrubkern.a; ldadd = grub-core/gnulib/libgnu.a; ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; @@ -141,10 +141,10 @@ }; program = { -Index: grub-2.02~beta2/configure.ac +Index: grub-2.02~rc1/configure.ac =================================================================== ---- grub-2.02~beta2.orig/configure.ac -+++ grub-2.02~beta2/configure.ac +--- grub-2.02~rc1.orig/configure.ac ++++ grub-2.02~rc1/configure.ac @@ -181,9 +181,9 @@ if test x$platform != xemu ; then esac fi @@ -158,7 +158,7 @@ case "$target_os" in windows* | mingw32*) target_os=cygwin ;; -@@ -1845,6 +1845,9 @@ AM_CONDITIONAL([COND_arm_uboot], [test x +@@ -1908,6 +1908,9 @@ AM_CONDITIONAL([COND_arm_uboot], [test x AM_CONDITIONAL([COND_arm_efi], [test x$target_cpu = xarm -a x$platform = xefi]) AM_CONDITIONAL([COND_arm64], [test x$target_cpu = xarm64 ]) AM_CONDITIONAL([COND_arm64_efi], [test x$target_cpu = xarm64 -a x$platform = xefi]) @@ -168,11 +168,11 @@ AM_CONDITIONAL([COND_HOST_HURD], [test x$host_kernel = xhurd]) AM_CONDITIONAL([COND_HOST_LINUX], [test x$host_kernel = xlinux]) -Index: grub-2.02~beta2/grub-core/Makefile.core.def +Index: grub-2.02~rc1/grub-core/Makefile.core.def =================================================================== ---- grub-2.02~beta2.orig/grub-core/Makefile.core.def -+++ grub-2.02~beta2/grub-core/Makefile.core.def -@@ -1050,6 +1050,7 @@ module = { +--- grub-2.02~rc1.orig/grub-core/Makefile.core.def ++++ grub-2.02~rc1/grub-core/Makefile.core.def +@@ -1057,6 +1057,7 @@ module = { module = { name = videotest; common = commands/videotest.c; @@ -180,7 +180,7 @@ }; module = { -@@ -1462,6 +1463,7 @@ module = { +@@ -1469,6 +1470,7 @@ module = { common = gfxmenu/gui_progress_bar.c; common = gfxmenu/gui_util.c; common = gfxmenu/gui_string_util.c; @@ -188,7 +188,7 @@ }; module = { -@@ -1841,11 +1843,13 @@ module = { +@@ -1884,11 +1886,13 @@ module = { name = gfxterm; common = term/gfxterm.c; enable = videomodules; @@ -202,7 +202,7 @@ }; module = { -@@ -1960,6 +1964,7 @@ module = { +@@ -2003,6 +2007,7 @@ module = { enable = x86_64_efi; enable = emu; enable = xen; @@ -210,7 +210,7 @@ }; module = { -@@ -2006,6 +2011,7 @@ module = { +@@ -2049,6 +2054,7 @@ module = { module = { name = gfxterm_menu; common = tests/gfxterm_menu.c; @@ -218,7 +218,7 @@ }; module = { -@@ -2158,6 +2164,7 @@ module = { +@@ -2201,6 +2207,7 @@ module = { enable = x86_64_efi; enable = emu; enable = xen; @@ -226,10 +226,10 @@ }; module = { -Index: grub-2.02~beta2/grub-core/osdep/basic/no_platform.c +Index: grub-2.02~rc1/grub-core/osdep/basic/no_platform.c =================================================================== ---- grub-2.02~beta2.orig/grub-core/osdep/basic/no_platform.c -+++ grub-2.02~beta2/grub-core/osdep/basic/no_platform.c +--- grub-2.02~rc1.orig/grub-core/osdep/basic/no_platform.c ++++ grub-2.02~rc1/grub-core/osdep/basic/no_platform.c @@ -44,3 +44,10 @@ grub_install_sgi_setup (const char *inst { grub_util_error ("%s", _("no SGI routines are available for your platform")); @@ -241,10 +241,10 @@ + grub_util_error ("%s", _("no zIPL routines are available for your platform")); +} + -Index: grub-2.02~beta2/grub-core/osdep/unix/platform.c +Index: grub-2.02~rc1/grub-core/osdep/unix/platform.c =================================================================== ---- grub-2.02~beta2.orig/grub-core/osdep/unix/platform.c -+++ grub-2.02~beta2/grub-core/osdep/unix/platform.c +--- grub-2.02~rc1.orig/grub-core/osdep/unix/platform.c ++++ grub-2.02~rc1/grub-core/osdep/unix/platform.c @@ -233,3 +233,14 @@ grub_install_sgi_setup (const char *inst imgfile, destname, NULL }); grub_util_warn ("%s", _("You will have to set `SystemPartition' and `OSLoader' manually.")); @@ -260,10 +260,10 @@ + "-z", dest, NULL })) + grub_util_error (_("`%s' failed.\n"), PACKAGE"-zipl-setup"); +} -Index: grub-2.02~beta2/grub-core/osdep/windows/platform.c +Index: grub-2.02~rc1/grub-core/osdep/windows/platform.c =================================================================== ---- grub-2.02~beta2.orig/grub-core/osdep/windows/platform.c -+++ grub-2.02~beta2/grub-core/osdep/windows/platform.c +--- grub-2.02~rc1.orig/grub-core/osdep/windows/platform.c ++++ grub-2.02~rc1/grub-core/osdep/windows/platform.c @@ -422,3 +422,9 @@ grub_install_sgi_setup (const char *inst { grub_util_error ("%s", _("no SGI routines are available for your platform")); @@ -274,10 +274,10 @@ +{ + grub_util_error ("%s", _("no zIPL routines are available for your platform")); +} -Index: grub-2.02~beta2/include/grub/util/install.h +Index: grub-2.02~rc1/include/grub/util/install.h =================================================================== ---- grub-2.02~beta2.orig/include/grub/util/install.h -+++ grub-2.02~beta2/include/grub/util/install.h +--- grub-2.02~rc1.orig/include/grub/util/install.h ++++ grub-2.02~rc1/include/grub/util/install.h @@ -99,6 +99,7 @@ enum grub_install_plat GRUB_INSTALL_PLATFORM_I386_XEN, GRUB_INSTALL_PLATFORM_X86_64_XEN, @@ -296,10 +296,10 @@ int grub_install_compress_gzip (const char *src, const char *dest); int -Index: grub-2.02~beta2/util/grub-install-common.c +Index: grub-2.02~rc1/util/grub-install-common.c =================================================================== ---- grub-2.02~beta2.orig/util/grub-install-common.c -+++ grub-2.02~beta2/util/grub-install-common.c +--- grub-2.02~rc1.orig/util/grub-install-common.c ++++ grub-2.02~rc1/util/grub-install-common.c @@ -666,6 +666,7 @@ static struct [GRUB_INSTALL_PLATFORM_ARM_EFI] = { "arm", "efi" }, [GRUB_INSTALL_PLATFORM_ARM64_EFI] = { "arm64", "efi" }, @@ -308,10 +308,10 @@ }; char * -Index: grub-2.02~beta2/util/grub-install.c +Index: grub-2.02~rc1/util/grub-install.c =================================================================== ---- grub-2.02~beta2.orig/util/grub-install.c -+++ grub-2.02~beta2/util/grub-install.c +--- grub-2.02~rc1.orig/util/grub-install.c ++++ grub-2.02~rc1/util/grub-install.c @@ -66,6 +66,7 @@ static int force_file_id = 0; static char *disk_module = NULL; static char *efidir = NULL; @@ -404,7 +404,7 @@ grub_install_copy_files (grub_install_source_directory, grubdir, platform); -@@ -1457,6 +1486,7 @@ main (int argc, char *argv[]) +@@ -1458,6 +1487,7 @@ main (int argc, char *argv[]) case GRUB_INSTALL_PLATFORM_ARM_UBOOT: case GRUB_INSTALL_PLATFORM_I386_XEN: case GRUB_INSTALL_PLATFORM_X86_64_XEN: @@ -412,7 +412,7 @@ grub_util_warn ("%s", _("no hints available for your platform. Expect reduced performance")); break; /* pacify warning. */ -@@ -1569,6 +1599,10 @@ main (int argc, char *argv[]) +@@ -1570,6 +1600,10 @@ main (int argc, char *argv[]) strcpy (mkimage_target, "sparc64-ieee1275-raw"); core_name = "core.img"; break; @@ -423,7 +423,7 @@ /* pacify warning. */ case GRUB_INSTALL_PLATFORM_MAX: break; -@@ -1584,6 +1618,7 @@ main (int argc, char *argv[]) +@@ -1585,6 +1619,7 @@ main (int argc, char *argv[]) core_name); char *prefix = xasprintf ("%s%s", prefix_drive ? : "", relative_grubdir); @@ -431,7 +431,7 @@ grub_install_make_image_wrap (/* source dir */ grub_install_source_directory, /*prefix */ prefix, /* output */ imgfile, -@@ -1622,6 +1657,10 @@ main (int argc, char *argv[]) +@@ -1623,6 +1658,10 @@ main (int argc, char *argv[]) /* image target */ mkimage_target, 0); } break; @@ -442,7 +442,7 @@ case GRUB_INSTALL_PLATFORM_ARM_EFI: case GRUB_INSTALL_PLATFORM_ARM64_EFI: case GRUB_INSTALL_PLATFORM_IA64_EFI: -@@ -1883,6 +1922,10 @@ main (int argc, char *argv[]) +@@ -1884,6 +1923,10 @@ main (int argc, char *argv[]) } break; @@ -453,10 +453,10 @@ case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON: case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS: case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS: -Index: grub-2.02~beta2/util/s390x/dracut-grub2.sh.in +Index: grub-2.02~rc1/util/s390x/dracut-grub2.sh.in =================================================================== --- /dev/null -+++ grub-2.02~beta2/util/s390x/dracut-grub2.sh.in ++++ grub-2.02~rc1/util/s390x/dracut-grub2.sh.in @@ -0,0 +1,106 @@ +#!/bin/sh +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- @@ -564,10 +564,10 @@ + fi +fi + -Index: grub-2.02~beta2/util/s390x/dracut-module-setup.sh.in +Index: grub-2.02~rc1/util/s390x/dracut-module-setup.sh.in =================================================================== --- /dev/null -+++ grub-2.02~beta2/util/s390x/dracut-module-setup.sh.in ++++ grub-2.02~rc1/util/s390x/dracut-module-setup.sh.in @@ -0,0 +1,19 @@ +#!/bin/bash +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- @@ -588,10 +588,10 @@ + #inst_multiple grub2-emu kexec +} + -Index: grub-2.02~beta2/util/s390x/zipl2grub.conf.in +Index: grub-2.02~rc1/util/s390x/zipl2grub.conf.in =================================================================== --- /dev/null -+++ grub-2.02~beta2/util/s390x/zipl2grub.conf.in ++++ grub-2.02~rc1/util/s390x/zipl2grub.conf.in @@ -0,0 +1,26 @@ +## This is the template for '@zipldir@/config' and is subject to +## rpm's %config file handling in case of grub2-s390x-emu package update. @@ -619,10 +619,10 @@ + 1 = grub2 + 2 = skip-grub2 + -Index: grub-2.02~beta2/util/s390x/zipl2grub.pl.in +Index: grub-2.02~rc1/util/s390x/zipl2grub.pl.in =================================================================== --- /dev/null -+++ grub-2.02~beta2/util/s390x/zipl2grub.pl.in ++++ grub-2.02~rc1/util/s390x/zipl2grub.pl.in @@ -0,0 +1,424 @@ +#!/usr/bin/perl +use strict; ++++++ use-grub2-as-a-package-name.patch ++++++ --- /var/tmp/diff_new_pack.82a0Wj/_old 2017-02-14 00:38:58.510079564 +0100 +++ /var/tmp/diff_new_pack.82a0Wj/_new 2017-02-14 00:38:58.510079564 +0100 @@ -12,16 +12,16 @@ configure.ac | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) -Index: grub-2.02~beta3/configure.ac +Index: grub-2.02~rc1/configure.ac =================================================================== ---- grub-2.02~beta3.orig/configure.ac 2016-02-28 19:22:28.028876923 +0300 -+++ grub-2.02~beta3/configure.ac 2016-02-28 19:22:57.596877272 +0300 -@@ -31,7 +31,7 @@ +--- grub-2.02~rc1.orig/configure.ac ++++ grub-2.02~rc1/configure.ac +@@ -31,7 +31,7 @@ dnl (such as BUILD_CC, BUILD_CFLAGS, etc dnl with the prefix "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are dnl used for the target type. See INSTALL for full list of variables. --AC_INIT([GRUB],[2.02~beta3],[[email protected]]) -+AC_INIT([GRUB2],[2.02~beta3],[[email protected]]) +-AC_INIT([GRUB],[2.02~rc1],[[email protected]]) ++AC_INIT([GRUB2],[2.02~rc1],[[email protected]]) AC_CONFIG_AUX_DIR([build-aux])
