From 981054a5f6370a7ae551299e83e9a5e7c69a0e27023fd029917bb20eb2a95c25 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Dec 2016 08:30:51 +0000 Subject: [PATCH 1/4] Accepting request 443760 from devel:openSUSE:Factory The shim binary from Leap 42.2 OBS-URL: https://build.opensuse.org/request/show/443760 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shim-leap?expand=0&rev=1 --- shim-0.9-11.1.x86_64.rpm | 3 +++ shim-0.9-13.1.x86_64.rpm | 3 --- shim-leap.changes | 14 -------------- shim-leap.spec | 26 +++++--------------------- 4 files changed, 8 insertions(+), 38 deletions(-) create mode 100644 shim-0.9-11.1.x86_64.rpm delete mode 100644 shim-0.9-13.1.x86_64.rpm diff --git a/shim-0.9-11.1.x86_64.rpm b/shim-0.9-11.1.x86_64.rpm new file mode 100644 index 0000000..9b3b5ab --- /dev/null +++ b/shim-0.9-11.1.x86_64.rpm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11f2cb2b2c9db38e0bca7af732cb73b78347bb4fdfafe8a4b33fa193316a33ec +size 457406 diff --git a/shim-0.9-13.1.x86_64.rpm b/shim-0.9-13.1.x86_64.rpm deleted file mode 100644 index f60260c..0000000 --- a/shim-0.9-13.1.x86_64.rpm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93537270ce66a583e06ba4dcb00cc23b5d4c803066f63f160455a6bdccc8363c -size 459013 diff --git a/shim-leap.changes b/shim-leap.changes index c870309..9d30c78 100644 --- a/shim-leap.changes +++ b/shim-leap.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Fri Feb 17 04:04:36 UTC 2017 - glin@suse.com - -- Support %posttrans with marcos provided by update-bootloader-rpm-macros - package (bsc#997317) (fix from mchang@suse.com) - -------------------------------------------------------------------- -Tue Dec 27 05:47:23 UTC 2016 - glin@suse.com - -- Update shim to 0.9-13.1 - + Update shim-install to support "--no-nvram" and improve - removable media and fallback mode handling (bsc#985568, - bsc#999818) (Fix from mchang@suse.com) - ------------------------------------------------------------------- Fri Oct 7 09:31:29 UTC 2016 - jsegitz@novell.com diff --git a/shim-leap.spec b/shim-leap.spec index 84fe1a4..6854a23 100644 --- a/shim-leap.spec +++ b/shim-leap.spec @@ -1,7 +1,7 @@ # # spec file for package shim-leap # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,14 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: shim-leap Version: 0.9 Release: 0 -Summary: UEFI shim loader License: BSD-2-Clause +Summary: UEFI shim loader Group: System/Boot -Source: shim-0.9-13.1.x86_64.rpm +Source: shim-0.9-11.1.x86_64.rpm BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 @@ -30,16 +29,8 @@ ExclusiveArch: x86_64 does not exist %package -n shim -Summary: UEFI shim loader -Group: System/Boot -%if 0%{?suse_version} > 1320 -BuildRequires: update-bootloader-rpm-macros -%endif -%if 0%{?update_bootloader_requires:1} -%update_bootloader_requires -%else -Requires: perl-Bootloader -%endif +Summary: UEFI shim loader +Requires: perl-Bootloader %description -n shim shim is a trivial EFI application that, when run, attempts to open and @@ -55,14 +46,7 @@ rpm2cpio %{SOURCE0} | cpio --extract --unconditional --preserve-modification-tim cp -a * %{buildroot} %post -n shim -%if 0%{?update_bootloader_check_type_reinit_post:1} -%update_bootloader_check_type_reinit_post grub2-efi -%else /sbin/update-bootloader --reinit || true -%endif - -%posttrans -n shim -%{?update_bootloader_posttrans} %files -n shim /etc/uefi From 6067657b30283e606a886095740bc7fcb53ba4bf76e63c5fadbc2630519022f7 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 29 Dec 2016 21:51:44 +0000 Subject: [PATCH 2/4] Accepting request 447868 from devel:openSUSE:Factory - Update shim to 0.9-13.1 + Update shim-install to support "--no-nvram" and improve removable media and fallback mode handling (bsc#985568, bsc#999818) (Fix from mchang@suse.com) OBS-URL: https://build.opensuse.org/request/show/447868 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shim-leap?expand=0&rev=2 --- shim-0.9-11.1.x86_64.rpm | 3 --- shim-0.9-13.1.x86_64.rpm | 3 +++ shim-leap.changes | 8 ++++++++ shim-leap.spec | 12 +++++++----- 4 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 shim-0.9-11.1.x86_64.rpm create mode 100644 shim-0.9-13.1.x86_64.rpm diff --git a/shim-0.9-11.1.x86_64.rpm b/shim-0.9-11.1.x86_64.rpm deleted file mode 100644 index 9b3b5ab..0000000 --- a/shim-0.9-11.1.x86_64.rpm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11f2cb2b2c9db38e0bca7af732cb73b78347bb4fdfafe8a4b33fa193316a33ec -size 457406 diff --git a/shim-0.9-13.1.x86_64.rpm b/shim-0.9-13.1.x86_64.rpm new file mode 100644 index 0000000..f60260c --- /dev/null +++ b/shim-0.9-13.1.x86_64.rpm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93537270ce66a583e06ba4dcb00cc23b5d4c803066f63f160455a6bdccc8363c +size 459013 diff --git a/shim-leap.changes b/shim-leap.changes index 9d30c78..35e9bc3 100644 --- a/shim-leap.changes +++ b/shim-leap.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 27 05:47:23 UTC 2016 - glin@suse.com + +- Update shim to 0.9-13.1 + + Update shim-install to support "--no-nvram" and improve + removable media and fallback mode handling (bsc#985568, + bsc#999818) (Fix from mchang@suse.com) + ------------------------------------------------------------------- Fri Oct 7 09:31:29 UTC 2016 - jsegitz@novell.com diff --git a/shim-leap.spec b/shim-leap.spec index 6854a23..3c57e20 100644 --- a/shim-leap.spec +++ b/shim-leap.spec @@ -1,7 +1,7 @@ # # spec file for package shim-leap # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: shim-leap Version: 0.9 Release: 0 -License: BSD-2-Clause Summary: UEFI shim loader +License: BSD-2-Clause Group: System/Boot -Source: shim-0.9-11.1.x86_64.rpm +Source: shim-0.9-13.1.x86_64.rpm BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 @@ -29,8 +30,9 @@ ExclusiveArch: x86_64 does not exist %package -n shim -Summary: UEFI shim loader -Requires: perl-Bootloader +Summary: UEFI shim loader +Group: System/Boot +Requires: perl-Bootloader %description -n shim shim is a trivial EFI application that, when run, attempts to open and From 142460da6538194d50d90f6382ef6fe3940d8bbaac442a7f96c5c62e0fbac8f5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 19 Feb 2017 00:03:19 +0000 Subject: [PATCH 3/4] Accepting request 458606 from devel:openSUSE:Factory 1 OBS-URL: https://build.opensuse.org/request/show/458606 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shim-leap?expand=0&rev=3 --- shim-leap.changes | 6 ++++++ shim-leap.spec | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/shim-leap.changes b/shim-leap.changes index 35e9bc3..c870309 100644 --- a/shim-leap.changes +++ b/shim-leap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 17 04:04:36 UTC 2017 - glin@suse.com + +- Support %posttrans with marcos provided by update-bootloader-rpm-macros + package (bsc#997317) (fix from mchang@suse.com) + ------------------------------------------------------------------- Tue Dec 27 05:47:23 UTC 2016 - glin@suse.com diff --git a/shim-leap.spec b/shim-leap.spec index 3c57e20..84fe1a4 100644 --- a/shim-leap.spec +++ b/shim-leap.spec @@ -1,7 +1,7 @@ # # spec file for package shim-leap # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,14 @@ does not exist %package -n shim Summary: UEFI shim loader Group: System/Boot +%if 0%{?suse_version} > 1320 +BuildRequires: update-bootloader-rpm-macros +%endif +%if 0%{?update_bootloader_requires:1} +%update_bootloader_requires +%else Requires: perl-Bootloader +%endif %description -n shim shim is a trivial EFI application that, when run, attempts to open and @@ -48,7 +55,14 @@ rpm2cpio %{SOURCE0} | cpio --extract --unconditional --preserve-modification-tim cp -a * %{buildroot} %post -n shim +%if 0%{?update_bootloader_check_type_reinit_post:1} +%update_bootloader_check_type_reinit_post grub2-efi +%else /sbin/update-bootloader --reinit || true +%endif + +%posttrans -n shim +%{?update_bootloader_posttrans} %files -n shim /etc/uefi From 3d486cb7036979a209c7a140605556ac55a9e862899e4c7b58111a87e88345aa Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 21 Feb 2017 21:47:11 +0000 Subject: [PATCH 4/4] Accepting request 459557 from openSUSE:Factory Revert shim-leap OBS-URL: https://build.opensuse.org/request/show/459557 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shim-leap?expand=0&rev=4 --- shim-leap.changes | 6 ------ shim-leap.spec | 16 +--------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/shim-leap.changes b/shim-leap.changes index c870309..35e9bc3 100644 --- a/shim-leap.changes +++ b/shim-leap.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Feb 17 04:04:36 UTC 2017 - glin@suse.com - -- Support %posttrans with marcos provided by update-bootloader-rpm-macros - package (bsc#997317) (fix from mchang@suse.com) - ------------------------------------------------------------------- Tue Dec 27 05:47:23 UTC 2016 - glin@suse.com diff --git a/shim-leap.spec b/shim-leap.spec index 84fe1a4..3c57e20 100644 --- a/shim-leap.spec +++ b/shim-leap.spec @@ -1,7 +1,7 @@ # # spec file for package shim-leap # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,14 +32,7 @@ does not exist %package -n shim Summary: UEFI shim loader Group: System/Boot -%if 0%{?suse_version} > 1320 -BuildRequires: update-bootloader-rpm-macros -%endif -%if 0%{?update_bootloader_requires:1} -%update_bootloader_requires -%else Requires: perl-Bootloader -%endif %description -n shim shim is a trivial EFI application that, when run, attempts to open and @@ -55,14 +48,7 @@ rpm2cpio %{SOURCE0} | cpio --extract --unconditional --preserve-modification-tim cp -a * %{buildroot} %post -n shim -%if 0%{?update_bootloader_check_type_reinit_post:1} -%update_bootloader_check_type_reinit_post grub2-efi -%else /sbin/update-bootloader --reinit || true -%endif - -%posttrans -n shim -%{?update_bootloader_posttrans} %files -n shim /etc/uefi