From d55d47e08d444fe8d7795588fe4ae6d0e5294a61134f7d5d76fcbe26025bfd1d Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Tue, 12 Feb 2019 08:10:12 +0000 Subject: [PATCH] Accepting request 668764 from home:jengelh:branches:Base:System - Replace old $RPM_* shell vars. OBS-URL: https://build.opensuse.org/request/show/668764 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=325 --- grub2.changes | 181 ++++++++++++++++++++++++++------------------------ grub2.spec | 67 +++++++++---------- 2 files changed, 126 insertions(+), 122 deletions(-) diff --git a/grub2.changes b/grub2.changes index bd0af25..f448844 100644 --- a/grub2.changes +++ b/grub2.changes @@ -4,18 +4,23 @@ Mon Jan 28 14:12:05 UTC 2019 - Guillaume GARDET - Add patch to fix ARM boot, when kernel become too big: * grub2-move-initrd-upper.patch (boo#1123350) +------------------------------------------------------------------- +Fri Jan 25 22:20:36 UTC 2019 - Jan Engelhardt + +- Replace old $RPM_* shell vars. + ------------------------------------------------------------------- Fri Jan 25 07:08:32 UTC 2019 - mchang@suse.com - Support long menu entry by scrolling its text left and right through - the key stroke ctrl+l and ctrl+r (FATE#325760) + the key stroke ctrl+l and ctrl+r (FATE#325760) * grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch ------------------------------------------------------------------- Thu Jan 24 09:26:09 UTC 2019 - mchang@suse.com - Improved hiDPI device support (FATE#326680) - * grub2-video-limit-the-resolution-for-fixed-bimap-font.patch + * grub2-video-limit-the-resolution-for-fixed-bimap-font.patch ------------------------------------------------------------------- Wed Jan 23 10:44:09 UTC 2019 - rw@suse.com @@ -71,7 +76,7 @@ Wed Sep 26 08:01:05 UTC 2018 - mchang@suse.com ------------------------------------------------------------------- Thu Sep 13 08:38:01 UTC 2018 - mchang@suse.com -- Fix broken network interface with random address and same name (bsc#1084508) +- Fix broken network interface with random address and same name (bsc#1084508) * 0001-ofnet-Initialize-structs-in-bootpath-parser.patch ------------------------------------------------------------------- @@ -79,7 +84,7 @@ Fri Aug 31 10:06:56 UTC 2018 - mchang@suse.com - Fix outputting invalid btrfs subvol path on non btrfs filesystem due to bogus return code handling. (bsc#1106381) - * modified grub2-btrfs-10-config-directory.patch + * modified grub2-btrfs-10-config-directory.patch ------------------------------------------------------------------- Thu Aug 23 08:37:15 UTC 2018 - mchang@suse.com @@ -113,13 +118,13 @@ Mon Aug 6 09:02:45 UTC 2018 - josef.moellers@suse.com Tue Jul 24 07:56:02 UTC 2018 - mchang@suse.com - Fix config_directory on btrfs to follow path scheme (bsc#1063443) - * grub2-btrfs-10-config-directory.patch + * grub2-btrfs-10-config-directory.patch - Fix grub2-install --root-directory does not work for /boot/grub2/ on - separate btrfs subvolume (boo#1098420) + separate btrfs subvolume (boo#1098420) * grub2-btrfs-06-subvol-mount.patch - Fix setparams doesn't work as expected from boot-last-label NVRAM var, after inital CAS reboot on ieee1275 (bsc#1088830) - * grub2-ppc64-cas-new-scope.patch + * grub2-ppc64-cas-new-scope.patch ------------------------------------------------------------------- Mon Jul 16 07:53:19 UTC 2018 - mchang@suse.com @@ -202,7 +207,7 @@ Mon Apr 2 08:30:05 UTC 2018 - mchang@suse.com - Fix Nvidia GPU in legacy I/O slot 2 disappears during system startup (bsc#1082914) - * 0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch + * 0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch ------------------------------------------------------------------- Fri Mar 30 09:16:06 UTC 2018 - mchang@suse.com @@ -220,7 +225,7 @@ Mon Mar 26 11:37:13 UTC 2018 - msuchanek@suse.com Mon Mar 12 07:31:10 UTC 2018 - mchang@suse.com - Fix UEFI HTTPS Boot from ISO installation image (bsc#1076132) - * 0001-add-support-for-UEFI-network-protocols.patch + * 0001-add-support-for-UEFI-network-protocols.patch ------------------------------------------------------------------- Tue Mar 6 08:21:43 UTC 2018 - mchang@suse.com @@ -242,18 +247,18 @@ Thu Mar 1 18:36:33 UTC 2018 - iforster@suse.com Tue Feb 13 09:05:45 UTC 2018 - mchang@suse.com - Fix incorrect check preventing the script from running (bsc#1078481) - * 80_suse_btrfs_snapshot + * 80_suse_btrfs_snapshot ------------------------------------------------------------------- Wed Feb 7 09:58:26 UTC 2018 - mchang@suse.com - Fix disappeared snapshot menu entry (bsc#1078481) - * 80_suse_btrfs_snapshot + * 80_suse_btrfs_snapshot ------------------------------------------------------------------- Tue Feb 6 09:44:26 UTC 2018 - mchang@suse.com -- Fix unquoted string error and add some more checks (bsc#1079330) +- Fix unquoted string error and add some more checks (bsc#1079330) * grub2-check-default.sh ------------------------------------------------------------------- @@ -284,7 +289,7 @@ Fri Dec 8 09:30:46 UTC 2017 - mchang@suse.com Tue Nov 28 09:35:48 UTC 2017 - mchang@suse.com - Fix http(s) boot security review (bsc#1058090) - * 0002-AUDIT-0-http-boot-tracker-bug.patch + * 0002-AUDIT-0-http-boot-tracker-bug.patch ------------------------------------------------------------------- Tue Nov 14 09:02:19 UTC 2017 - mchang@suse.com @@ -319,7 +324,7 @@ Tue Sep 26 06:35:50 UTC 2017 - mchang@suse.com - Build diskboot_tpm.img as separate image to diskboot.img to prevent failure in booting on some bogus firmware. To use the TPM image you have to use suse-enable-tpm option of grub2-install (bsc#1052401) - * 0013-tpm-i386-pc-diskboot-img.patch + * 0013-tpm-i386-pc-diskboot-img.patch ------------------------------------------------------------------- Wed Sep 20 22:17:10 UTC 2017 - mlatimer@suse.com @@ -345,13 +350,13 @@ Sun Sep 3 12:12:21 UTC 2017 - mchang@suse.com - Add preliminary patch for UEFI HTTPS and related network protocol support (fate#320130) - * 0001-add-support-for-UEFI-network-protocols.patch + * 0001-add-support-for-UEFI-network-protocols.patch ------------------------------------------------------------------- Sun Sep 3 11:41:42 UTC 2017 - mchang@suse.com - grub2-s390x-04-grub2-install.patch : remove arybase dependency in - grub2-zipl-setup by not referencing to $[ (bsc#1055280) + grub2-zipl-setup by not referencing to $[ (bsc#1055280) ------------------------------------------------------------------- Wed Aug 23 17:52:32 UTC 2017 - rw@suse.com @@ -375,7 +380,7 @@ Tue Jul 4 16:56:33 UTC 2017 - arvidjaar@gmail.com Thu Jun 1 09:45:44 UTC 2017 - mchang@suse.com - Support LVM physical volume created without metadatacopies (bsc#1027526) - * grub2-diskfilter-support-pv-without-metadatacopies.patch + * grub2-diskfilter-support-pv-without-metadatacopies.patch - Fix page fault exception when grub loads with Nvidia cards (bsc#1038533) * grub2-efi-uga-64bit-fb.patch - Require 'kexec-tools' for System z. (bsc#944358) @@ -420,13 +425,13 @@ Mon Mar 20 09:43:58 UTC 2017 - mchang@suse.com - Fix out of memory error on lvm detection (bsc#1016536) (bsc#1027401) * grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch - Fix boot failure if /boot is separate btrfs partition (bsc#1023160) - * grub2-btrfs-06-subvol-mount.patch + * grub2-btrfs-06-subvol-mount.patch ------------------------------------------------------------------- Fri Mar 17 06:22:42 UTC 2017 - mchang@suse.com - 0004-tpm-Rework-linux-command.patch : Fix out of bound memory copy - (bsc#1029187) + (bsc#1029187) ------------------------------------------------------------------- Thu Mar 16 16:32:54 UTC 2017 - arvidjaar@gmail.com @@ -473,13 +478,13 @@ Wed Mar 1 10:29:46 UTC 2017 - mchang@suse.com - Fix for openQA UEFI USB Boot failure with upstream patch (bsc#1026344) * added 0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch - * removed 0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch + * removed 0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch ------------------------------------------------------------------- Thu Feb 23 15:06:44 UTC 2017 - mchang@suse.com - Temporary fix for openQA UEFI USB Boot failure (bsc#1026344) - * 0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch + * 0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch ------------------------------------------------------------------- Fri Feb 17 06:46:11 UTC 2017 - mchang@suse.com @@ -610,8 +615,8 @@ Fri Dec 30 14:47:39 UTC 2016 - sor.alexei@meowr.ru ------------------------------------------------------------------- Fri Oct 28 04:08:19 UTC 2016 - mchang@suse.com -- Fix new line character in distributor (bsc#1007212) - * modified grub2-default-distributor.patch +- Fix new line character in distributor (bsc#1007212) + * modified grub2-default-distributor.patch ------------------------------------------------------------------- Fri Oct 21 09:34:58 UTC 2016 - mchang@suse.com @@ -641,7 +646,7 @@ Fri Sep 2 03:24:19 UTC 2016 - mchang@suse.com - use $PRETTY_NAME instead of $NAME $VERSION for $GRUB_DISTRIBUTOR in openSUSE Tumbleweed (bsc#995549) - * modified grub2-default-distributor.patch + * modified grub2-default-distributor.patch - grub2.spec: add http module to grub.efi (fate#320129) ------------------------------------------------------------------- @@ -704,16 +709,16 @@ Tue Aug 2 09:05:11 UTC 2016 - mchang@suse.com ------------------------------------------------------------------- Tue Jun 28 00:31:47 CEST 2016 - ro@suse.de -- fix filelist for s390x +- fix filelist for s390x ------------------------------------------------------------------- Tue Jun 21 06:19:27 UTC 2016 - mchang@suse.com -- Fix grub2-editenv error on encrypted lvm installation (bsc#981621) +- Fix grub2-editenv error on encrypted lvm installation (bsc#981621) * modified grub2-btrfs-workaround-grub2-once.patch - Add missing closing bracket in 'grub2-snapper-plugin.sh'. - Fix snapshot booting on s390x (bsc#955115) - * modified grub2-snapper-plugin.sh + * modified grub2-snapper-plugin.sh - Fallback to old subvol name scheme to support old snapshot config (bsc#953538) * added grub2-btrfs-07-subvol-fallback.patch @@ -752,7 +757,7 @@ Thu Apr 28 09:06:11 UTC 2016 - agraf@suse.com ------------------------------------------------------------------- Tue Apr 19 08:21:24 UTC 2016 - mchang@suse.com -- Correct show user defined comments in menu for snapshots (bsc#956698) +- Correct show user defined comments in menu for snapshots (bsc#956698) * modified grub2-snapper-plugin.sh ------------------------------------------------------------------- @@ -868,7 +873,7 @@ Sun Feb 28 23:10:06 UTC 2016 - agraf@suse.com Fri Jan 29 03:54:15 UTC 2016 - mchang@suse.com - Add config option to set efi xen loader command line option (bsc#957383) - * added grub2-efi-xen-cmdline.patch + * added grub2-efi-xen-cmdline.patch ------------------------------------------------------------------- Thu Jan 28 12:27:27 UTC 2016 - dvaleev@suse.com @@ -955,7 +960,7 @@ Fri Dec 4 17:06:17 UTC 2015 - olaf@aepfle.de Thu Nov 26 10:22:28 UTC 2015 - mchang@suse.com - Expand list of grub.cfg search path in PV Xen guest for systems - installed to btrfs snapshot. (bsc#946148) (bsc#952539) + installed to btrfs snapshot. (bsc#946148) (bsc#952539) * modified grub2-xen.cfg - drop grub2-fix-Grub2-with-SUSE-Xen-package-install.patch (bsc#774666) @@ -976,14 +981,14 @@ Mon Nov 1 21:30:02 UTC 2015 - arvidjaar@gmail.com ------------------------------------------------------------------- Fri Oct 30 10:09:02 UTC 2015 - mchang@suse.com -- Allow to execute menuentry unrestricted as default (fate#318574) - * added grub2-menu-unrestricted.patch +- Allow to execute menuentry unrestricted as default (fate#318574) + * added grub2-menu-unrestricted.patch ------------------------------------------------------------------- Thu Oct 29 04:17:08 UTC 2015 - mchang@suse.com - Add missing quoting for linuxefi (bsc#951962) - * modified grub2-secureboot-use-linuxefi-on-uefi.patch + * modified grub2-secureboot-use-linuxefi-on-uefi.patch * refreshed grub2-secureboot-provide-linuxefi-config.patch ------------------------------------------------------------------- @@ -995,7 +1000,7 @@ Sun Oct 18 11:45:10 UTC 2015 - eich@suse.com ------------------------------------------------------------------- Wed Oct 7 09:01:37 UTC 2015 - mchang@suse.com -- Upstream patches for fixing file descriptor leakage (bsc#943784) +- Upstream patches for fixing file descriptor leakage (bsc#943784) * added 0001-unix-password-Fix-file-descriptor-leak.patch * added 0002-linux-getroot-fix-descriptor-leak.patch * added 0003-util-grub-mount-fix-descriptor-leak.patch @@ -1020,16 +1025,16 @@ Wed Sep 23 20:02:47 UTC 2015 - dmueller@suse.com ------------------------------------------------------------------- Mon Sep 14 06:36:04 UTC 2015 - mchang@suse.com -- Set default GRUB_DISTRIBUTOR from /etc/os-release if it is empty +- Set default GRUB_DISTRIBUTOR from /etc/os-release if it is empty or not set by user (bsc#942519) - * added grub2-default-distributor.patch + * added grub2-default-distributor.patch * modified grub.default ------------------------------------------------------------------- Tue Aug 18 09:53:54 UTC 2015 - mchang@suse.com -- add systemd-sleep-plugin subpackage (bsc#941758) -- evaluate the menu entry's title string by printf +- add systemd-sleep-plugin subpackage (bsc#941758) +- evaluate the menu entry's title string by printf * modified grub2-once * added grub2-systemd-sleep.sh @@ -1129,12 +1134,12 @@ Wed Apr 15 06:02:36 UTC 2015 - mchang@suse.com Thu Apr 2 04:25:52 UTC 2015 - mchang@suse.com - Merge changes from SLE12 -- Do not pass root= when root is on nfs (bnc#894374) +- Do not pass root= when root is on nfs (bnc#894374) * modified grub2-pass-corret-root-for-nfsroot.patch * modified grub2-secureboot-provide-linuxefi-config.patch * modified grub2-secureboot-use-linuxefi-on-uefi.patch - Fix xen pvops kernel not appear on menu (bnc#895286) - * modified grub2-fix-menu-in-xen-host-server.patch + * modified grub2-fix-menu-in-xen-host-server.patch - Workaround grub2-once (bnc#892358) * added grub2-btrfs-workaround-grub2-once.patch * added grub2-once.service @@ -1144,8 +1149,8 @@ Thu Apr 2 04:25:52 UTC 2015 - mchang@suse.com - Add warning in grubenv file about editing it directly (bnc#887008) * added grub2-editenv-add-warning-message.patch - Fix broken graphics with efifb on QEMU/KVM and nomodeset (bnc#884558) - * added grub2-efi-disable-video-cirrus-and-bochus.patch -- Disable video support on Power (bnc#877142) + * added grub2-efi-disable-video-cirrus-and-bochus.patch +- Disable video support on Power (bnc#877142) * added grub2-ppc64le-disable-video.patch - Track occupied memory so it can be released on exit (bnc#885026) * added grub2-ppc64le-memory-map.patch @@ -1167,7 +1172,7 @@ Thu Apr 2 04:25:52 UTC 2015 - mchang@suse.com * added grub2-getroot-treat-mdadm-ddf-as-simple-device.patch - Fix booting from NVMe device (bnc#873132) * added grub2-getroot-support-NVMe-device-names.patch -- Document peculiarities of s390 terminals +- Document peculiarities of s390 terminals * added README.ibm3215 - Grub2 for System z (fate#314213) * added grub2-s390x-02-kexec-module-added-to-emu.patch @@ -1197,7 +1202,7 @@ Mon Feb 16 16:25:50 UTC 2015 - arvidjaar@gmail.com ------------------------------------------------------------------- Thu Feb 5 09:37:46 UTC 2015 - mchang@suse.com -- enable i386-xen (boo#891043) +- enable i386-xen (boo#891043) ------------------------------------------------------------------- Wed Feb 4 07:43:27 UTC 2015 - mchang@suse.com @@ -1208,12 +1213,12 @@ Wed Feb 4 07:43:27 UTC 2015 - mchang@suse.com Thu Dec 25 08:52:12 UTC 2014 - mchang@suse.com - grub2-snapper-plugin.sh: cleanup grub-snapshot.cfg not referring - to any snapshot (boo#909359) + to any snapshot (boo#909359) ------------------------------------------------------------------- Thu Dec 25 08:34:49 UTC 2014 - mpluskal@suse.com -- Require efibootmgr also on i586 +- Require efibootmgr also on i586 ------------------------------------------------------------------- Tue Dec 16 10:41:08 UTC 2014 - schwab@suse.de @@ -1261,10 +1266,10 @@ Thu Oct 30 07:36:15 UTC 2014 - mchang@suse.com - fix errors when boot is btrfs with Windows partition scheme. The first partition is created on cylinder boundary that can't offer - enough room for core.img and also the installation has to be in + enough room for core.img and also the installation has to be in logical paritition which made MBR the only location to install. (bnc#841247) - * add grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch + * add grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch ------------------------------------------------------------------- Tue Sep 30 03:45:04 UTC 2014 - mchang@suse.com @@ -1316,13 +1321,13 @@ Mon Sep 15 15:30:03 UTC 2014 - arvidjaar@gmail.com Fri Sep 12 04:14:38 UTC 2014 - mchang@suse.com - fix xen pvops kernel not appear on menu (bnc#895286) - * refresh grub2-fix-menu-in-xen-host-server.patch + * refresh grub2-fix-menu-in-xen-host-server.patch ------------------------------------------------------------------- Wed Sep 10 10:34:47 UTC 2014 - mchang@suse.com - fix extraneous comma in printf shell command (bnc#895884) - * refresh grub2-btrfs-04-grub2-install.patch + * refresh grub2-btrfs-04-grub2-install.patch ------------------------------------------------------------------- Wed Aug 27 07:53:35 UTC 2014 - schwab@suse.de @@ -1341,13 +1346,13 @@ Mon Aug 25 03:10:18 UTC 2014 - mchang@suse.com Fri Aug 22 10:05:13 UTC 2014 - mchang@suse.com - fix openqa boot error on separate boot partition - * refresh grub2-btrfs-05-grub2-mkconfig.patch + * refresh grub2-btrfs-05-grub2-mkconfig.patch ------------------------------------------------------------------- Thu Aug 21 06:10:07 UTC 2014 - mchang@suse.com - update snapper plugin for rollback support - * refresh grub2-snapper-plugin.sh + * refresh grub2-snapper-plugin.sh ------------------------------------------------------------------- Fri Aug 15 07:55:54 UTC 2014 - mchang@suse.com @@ -1361,23 +1366,23 @@ Fri Aug 15 07:55:54 UTC 2014 - mchang@suse.com - added patches * grub2-btrfs-03-follow_default.patch * grub2-btrfs-04-grub2-install.patch - * grub2-btrfs-05-grub2-mkconfig.patch + * grub2-btrfs-05-grub2-mkconfig.patch - remove patch * 0003-cmdline-add-envvar-loader_cmdline_append.patch - + ------------------------------------------------------------------- Thu Aug 14 06:35:58 UTC 2014 - mchang@suse.com - grub2-btrfs-fix-incorrect-address-reference.patch * Fix incorrect address reference in GRUB_BTRFS_EXTENT_REGULAR - range check (bnc#869748) + range check (bnc#869748) ------------------------------------------------------------------- Wed Aug 13 02:56:22 UTC 2014 - mchang@suse.com - grub2-vbe-blacklist-preferred-1440x900x32.patch - * Blacklist preferred resolution 1440x900x32 which is broken on - many Thinkpads (bnc#888727) + * Blacklist preferred resolution 1440x900x32 which is broken on + many Thinkpads (bnc#888727) ------------------------------------------------------------------- Tue Aug 12 12:56:29 UTC 2014 - schwab@suse.de @@ -1390,20 +1395,20 @@ Tue Aug 12 12:56:29 UTC 2014 - schwab@suse.de Mon Aug 11 14:34:55 UTC 2014 - dvaleev@suse.com - Fix the 64-bit trampoline code in dynamic linker (bnc#890999) - grub2-ppc64le-fix-64bit-trampoline-in-dyn-linker.patch + grub2-ppc64le-fix-64bit-trampoline-in-dyn-linker.patch ------------------------------------------------------------------- Tue Jul 29 11:46:54 CEST 2014 - tiwai@suse.de - Prefer a higher resolution in efi_gop driver if the mode taking over is too small like 640x480 (bnc#887972): - grub2-efi_gop-avoid-low-resolution.patch + grub2-efi_gop-avoid-low-resolution.patch ------------------------------------------------------------------- Wed Jul 9 16:26:35 UTC 2014 - dvlaeev@suse.com -- Fix ppc64le build by fixing - grub2-xfs-V5-filesystem-format-support.patch +- Fix ppc64le build by fixing + grub2-xfs-V5-filesystem-format-support.patch ------------------------------------------------------------------- Wed Jun 25 09:20:16 UTC 2014 - jack@suse.cz @@ -1496,11 +1501,11 @@ Mon Feb 24 07:28:42 UTC 2014 - mchang@suse.com - refresh grub2-fix-menu-in-xen-host-server.patch (bnc#859361) * prevent 10_linux from booting xen kernel without pv_opt support - on systems other than xen PV domU guest + on systems other than xen PV domU guest * prevent 20_linux_xen.in from setting up nested virt running from Xen domU - refresh grub2-fix-Grub2-with-SUSE-Xen-package-install.patch - * adjust accordingly + * adjust accordingly ------------------------------------------------------------------- Thu Feb 20 14:43:21 UTC 2014 - jw@suse.com @@ -1588,7 +1593,7 @@ Wed Jan 15 06:18:10 UTC 2014 - mchang@suse.com - add new patches for booting btrfs snapshot (fate#316522) (fate#316232) * 0001-script-provide-overridable-root-by-subvol.patch * 0002-script-create-menus-for-btrfs-snapshot.patch - + ------------------------------------------------------------------- Fri Dec 27 16:36:40 UTC 2013 - arvidjaar@gmail.com @@ -1614,10 +1619,10 @@ Fri Dec 27 16:36:40 UTC 2013 - arvidjaar@gmail.com - grub2-secureboot-provide-linuxefi-config.patch - grub2-pass-corret-root-for-nfsroot.patch - 0002-btrfs-add-ability-to-boot-from-subvolumes.patch - - grub2-fix-menu-in-xen-host-server.patch + - grub2-fix-menu-in-xen-host-server.patch - grub2-fix-Grub2-with-SUSE-Xen-package-install.patch - grub2-secureboot-add-linuxefi.patch - - grub2-secureboot-no-insmod-on-sb.patch + - grub2-secureboot-no-insmod-on-sb.patch - rename-grub-info-file-to-grub2.patch * drop Makefile.util.am and Makefile.core.am, they are now generated during build @@ -1684,7 +1689,7 @@ Sat Jul 27 10:12:36 UTC 2013 - arvidjaar@gmail.com Tue Jul 9 10:54:41 UTC 2013 - mchang@suse.com - refresh grub2-fix-menu-in-xen-host-server.patch: In domU we - have to add xen kernel to config. (bnc#825528) + have to add xen kernel to config. (bnc#825528) ------------------------------------------------------------------- Wed Jun 26 17:02:08 UTC 2013 - elchevive@opensuse.org @@ -1713,7 +1718,7 @@ Sun Jun 16 12:42:33 UTC 2013 - arvidjaar@gmail.com - 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-add-linuxefi.patch - grub2-secureboot-no-insmod-on-sb.patch - grub2-secureboot-chainloader.patch * add @@ -1750,7 +1755,7 @@ Wed Apr 3 17:56:20 UTC 2013 - arvidjaar@gmail.com Wed Apr 3 06:55:52 UTC 2013 - mchang@suse.com - refresh grub2-secureboot-chainloader.patch: Fix wrongly aligned - buffer address (bnc#811608) + buffer address (bnc#811608) ------------------------------------------------------------------- Thu Mar 28 02:57:47 UTC 2013 - mchang@suse.com @@ -1764,7 +1769,7 @@ Thu Mar 28 02:57:47 UTC 2013 - mchang@suse.com ------------------------------------------------------------------- Mon Mar 25 17:37:59 UTC 2013 - dvaleev@suse.com -- extraconfigure macro is not defined on ppc +- extraconfigure macro is not defined on ppc ------------------------------------------------------------------- Sat Mar 23 18:31:07 UTC 2013 - arvidjaar@gmail.com @@ -1773,8 +1778,8 @@ Sat Mar 23 18:31:07 UTC 2013 - arvidjaar@gmail.com ------------------------------------------------------------------- Wed Mar 13 11:30:52 UTC 2013 - mchang@suse.com - -- remove all compatible links in grub2-efi as now all concerned + +- remove all compatible links in grub2-efi as now all concerned utilities are fixed - superseding grub2-efi by grub2-x86_64-efi and grub2-i386-efi on x86_64 and ix86 respectively @@ -1839,7 +1844,7 @@ Tue Feb 19 15:38:04 UTC 2013 - duwe@suse.com ------------------------------------------------------------------- Thu Feb 14 11:42:40 UTC 2013 - duwe@suse.com -- merge internal+external BS changes into superset spec file, +- merge internal+external BS changes into superset spec file, remove obsolete dependencies - merge SLES+openSUSE patches, restrict "grub-efi" to 12.2 - add efidisk-ahci-workaround (bnc#794674) @@ -1947,7 +1952,7 @@ Tue Dec 18 03:43:38 UTC 2012 - mchang@suse.com ------------------------------------------------------------------- Fri Nov 30 06:39:15 UTC 2012 - mchang@suse.com -- replace %{sles_version} by %{suse_version} +- replace %{sles_version} by %{suse_version} - use correct product name ------------------------------------------------------------------- @@ -1981,7 +1986,7 @@ Thu Nov 22 07:01:31 UTC 2012 - mchang@suse.com meet the requirement. - grub2 : common utilties and config etc - grub2-efi : provide compatibilty to grub2-efi package - - grub2-i386-pc : binaries for x86 legacy pc firmware + - grub2-i386-pc : binaries for x86 legacy pc firmware - grub2-i386-efi : binaries for ia32 EFI firmware - grub2-x86_64-efi : binaries for x86_64 firmware - grub2-powerpc-ieee1275: binaries for powerpc open firmware @@ -2006,7 +2011,7 @@ Thu Nov 1 08:10:12 UTC 2012 - mchang@suse.com - ship a Secure Boot UEFI compatible bootloader (fate#314485) - Secure boot support in installer DVD (fate#314489) -- prime support for package on SLE-11 (SP3) +- prime support for package on SLE-11 (SP3) - remove buildrequire to libuse and ncurses 32-bit devel packages as they are needed by grub-emu which we don't support - remove buildrequire to freetype2-devel-32bit as it's not need @@ -2053,23 +2058,23 @@ Thu Oct 18 16:10:02 UTC 2012 - arvidjaar@gmail.com Wed Sep 26 08:04:48 UTC 2012 - mchang@suse.com - refresh grub2-fix-locale-en.mo.gz-not-found-error-message.patch - with the correct fix in upstream bugzilla #35880 by Colin Watson + with the correct fix in upstream bugzilla #35880 by Colin Watson (bnc#771393) ------------------------------------------------------------------- Fri Sep 21 07:37:53 UTC 2012 - mchang@suse.com -- grub2-fix-locale-en.mo.gz-not-found-error-message.patch (bnc#771393) +- grub2-fix-locale-en.mo.gz-not-found-error-message.patch (bnc#771393) ------------------------------------------------------------------- Wed Sep 19 18:54:34 UTC 2012 - arvidjaar@gmail.com -- add 20_memtest86+ (bnc#780622) +- add 20_memtest86+ (bnc#780622) ------------------------------------------------------------------- Tue Sep 18 09:26:29 UTC 2012 - mchang@suse.com -- Fix un-bootable grub2 testing entry in grub's menu.lst (bnc#779370) +- Fix un-bootable grub2 testing entry in grub's menu.lst (bnc#779370) - Not add new grub2 testing entry if it's not found in menu.lst - Update grub2 stuff and config if there's grub2 entry in menu.lst - Check for current bootloader as update-bootloader acts on it @@ -2084,7 +2089,7 @@ Thu Aug 30 08:00:54 UTC 2012 - mchang@suse.com Mon Aug 20 06:27:23 UTC 2012 - mchang@suse.com - disable grub2-enable-theme-for-terminal-window.patch to use - default black background due to current background has poor + default black background due to current background has poor contrast to the font color (bnc#776244). ------------------------------------------------------------------- @@ -2134,8 +2139,8 @@ Fri Jul 6 08:09:16 UTC 2012 - mchang@suse.com - grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch. We don't run in sigle user mode for recovery, instead use different - set kernel command line options which could be specified by this - GRUB_CMDLINE_LINUX_RECOVERY setting. + set kernel command line options which could be specified by this + GRUB_CMDLINE_LINUX_RECOVERY setting. ------------------------------------------------------------------- Wed Jul 4 06:20:23 UTC 2012 - mchang@suse.com @@ -2146,7 +2151,7 @@ Wed Jul 4 06:20:23 UTC 2012 - mchang@suse.com Fri Jun 29 10:02:08 UTC 2012 - dvaleev@suse.com - Add configuration support for serial terminal consoles. This will - set the maximum screen size so that text is not overwritten. + set the maximum screen size so that text is not overwritten. ------------------------------------------------------------------- Fri Jun 29 09:51:59 UTC 2012 - dvaleev@suse.com @@ -2194,8 +2199,8 @@ Thu Apr 19 11:28:44 UTC 2012 - mchang@suse.com - grub2-probe-disk-mountby.patch : fix grub2-probe fails on probing mount-by devices under /dev/disk/by-(id|uuid|path). - (bnc#757746) - + (bnc#757746) + ------------------------------------------------------------------- Thu Mar 29 07:08:38 UTC 2012 - mchang@suse.com @@ -2222,7 +2227,7 @@ Tue Mar 13 04:06:06 UTC 2012 - mchang@suse.com ------------------------------------------------------------------- Mon Mar 12 09:34:40 UTC 2012 - tittiatcoke@gmail.com -- Added BuildRequires for gnu-unifont in order to create the +- Added BuildRequires for gnu-unifont in order to create the necessary fonts for a graphical boot menu. ------------------------------------------------------------------- @@ -2291,7 +2296,7 @@ Tue Aug 23 12:46:43 UTC 2011 - aj@suse.de Tue Aug 2 12:10:39 UTC 2011 - dvaleev@novell.com - enable ppc build -- patch unused-but-set-variable +- patch unused-but-set-variable ------------------------------------------------------------------- Tue Jul 12 14:03:05 UTC 2011 - aj@suse.de diff --git a/grub2.spec b/grub2.spec index efd563d..3bd8e2d 100644 --- a/grub2.spec +++ b/grub2.spec @@ -805,29 +805,28 @@ cd .. %ifarch %{ix86} x86_64 cd build-xen -make DESTDIR=$RPM_BUILD_ROOT install -install -m 644 grub.xen $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubxenarch}/. +%make_install +install -m 644 grub.xen %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/. cd .. %endif %ifarch %{efi} cd build-efi -make DESTDIR=$RPM_BUILD_ROOT install - -install -m 644 grub.efi grub-tpm.efi $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/. +%make_install +install -m 644 grub.efi grub-tpm.efi %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/. # Create grub.efi link to system efi directory # This is for tools like kiwi not fiddling with the path %define sysefibasedir %{_datadir}/efi %define sysefidir %{sysefibasedir}/%{_target_cpu} -install -d $RPM_BUILD_ROOT%{sysefidir} -ln -sr $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/grub.efi $RPM_BUILD_ROOT%{sysefidir}/grub.efi +install -d %{buildroot}/%{sysefidir} +ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}/%{sysefidir}/grub.efi %ifarch x86_64 # provide compatibility sym-link for previous shim-install and the like -install -d $RPM_BUILD_ROOT/usr/lib64/efi -ln -srf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/grub.efi $RPM_BUILD_ROOT/usr/lib64/efi/grub.efi -cat <<-EoM > $RPM_BUILD_ROOT/usr/lib64/efi/DEPRECATED - This directory and it's contents was moved to %{_datadir}/efi/x86_64. +install -d %{buildroot}/usr/lib64/efi +ln -srf %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}/usr/lib64/efi/grub.efi +cat <<-EoM >%{buildroot}/usr/lib64/efi/DEPRECATED + This directory and its contents was moved to %{_datadir}/efi/x86_64. Individual symbolic links are provided for a smooth transition and may vanish at any point in time. Please use the new location! EoM @@ -836,7 +835,7 @@ EoM %ifarch x86_64 aarch64 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110 export BRP_PESIGN_FILES="%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{_datadir}/%{name}/%{grubefiarch}/grub-tpm.efi" -install -m 444 grub.der $RPM_BUILD_ROOT%{sysefidir}/ +install -m 444 grub.der %{buildroot}/%{sysefidir}/ %endif %endif @@ -845,60 +844,60 @@ cd .. %if ! 0%{?only_efi:1} cd build -make DESTDIR=$RPM_BUILD_ROOT install +%make_install cd .. %endif if [ "%{platform}" = "emu" ]; then # emu-lite is currently broken (and not needed), don't install! - rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-emu-lite + rm -f %{buildroot}/%{_bindir}/%{name}-emu-lite elif [ -d build-emu/grub-core ]; then cd build-emu/grub-core - install -m 755 grub-emu $RPM_BUILD_ROOT%{_bindir}/%{name}-emu + install -m 755 grub-emu %{buildroot}/%{_bindir}/%{name}-emu if false; then # this needs to go to '-emu'-package; until that is ready, don't install! - install -m 755 grub-emu-lite $RPM_BUILD_ROOT%{_bindir}/%{name}-emu-lite + install -m 755 grub-emu-lite %{buildroot}/%{_bindir}/%{name}-emu-lite else - rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-emu-lite + rm -f %{buildroot}/%{_bindir}/%{name}-emu-lite fi - install -m 644 grub-emu.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-emu.1 + install -m 644 grub-emu.1 %{buildroot}/%{_mandir}/man1/%{name}-emu.1 cd ../.. fi # *.module files are installed with executable bits due to the way grub2 build # system works. Clear executable bits to not confuse find-debuginfo.sh -find $RPM_BUILD_ROOT%{_datadir}/%{name} \ +find %{buildroot}/%{_datadir}/%{name} \ \( -name '*.module' -o -name '*.image' -o -name '*.exec' \) -print0 | \ xargs --no-run-if-empty -0 chmod a-x # Script that makes part of grub.cfg persist across updates -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/ +install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/grub.d/ # Script to generate memtest86+ menu entry -install -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/ +install -m 755 %{SOURCE7} %{buildroot}/%{_sysconfdir}/grub.d/ # Ghost config file -install -d $RPM_BUILD_ROOT/boot/%{name} -touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg +install -d %{buildroot}/boot/%{name} +touch %{buildroot}/boot/%{name}/grub.cfg # Remove devel files -rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/*/*.h +rm %{buildroot}/%{_datadir}/%{name}/*/*.h %if 0%{?suse_version} >= 1140 -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.h +rm %{buildroot}/%{_datadir}/%{name}/*.h %endif # Defaults -install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub -install -m 755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/grub2-once -install -m 755 -D %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/snapper/plugins/grub -install -m 755 -D %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/80_suse_btrfs_snapshot +install -m 644 -D %{SOURCE2} %{buildroot}/%{_sysconfdir}/default/grub +install -m 755 -D %{SOURCE6} %{buildroot}/%{_sbindir}/grub2-once +install -m 755 -D %{SOURCE12} %{buildroot}/%{_libdir}/snapper/plugins/grub +install -m 755 -D %{SOURCE14} %{buildroot}/%{_sysconfdir}/grub.d/80_suse_btrfs_snapshot %if 0%{?has_systemd:1} -install -m 644 -D %{SOURCE15} $RPM_BUILD_ROOT%{_unitdir}/grub2-once.service -install -m 755 -D %{SOURCE17} $RPM_BUILD_ROOT%{_libdir}/systemd/system-sleep/grub2.sleep +install -m 644 -D %{SOURCE15} %{buildroot}/%{_unitdir}/grub2-once.service +install -m 755 -D %{SOURCE17} %{buildroot}/%{_libdir}/systemd/system-sleep/grub2.sleep %endif -install -m 755 -D %{SOURCE18} $RPM_BUILD_ROOT%{_sbindir}/grub2-check-default +install -m 755 -D %{SOURCE18} %{buildroot}/%{_sbindir}/grub2-check-default -R=$RPM_BUILD_ROOT +R="%{buildroot}" %ifarch %{ix86} x86_64 %else rm -f $R%{_sysconfdir}/grub.d/20_memtest86+ @@ -936,7 +935,7 @@ perl -ni -e ' } s{openSUSE}{SUSE Linux Enterprise Server} if (m{^GRUB_DISTRIBUTOR}); print; -' $RPM_BUILD_ROOT%{_sysconfdir}/default/grub +' %{buildroot}/%{_sysconfdir}/default/grub %else %endif