Hello community,

here is the log from the commit of package shim-leap for openSUSE:Factory 
checked in at 2017-04-28 09:13:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
 and      /work/SRC/openSUSE:Factory/.shim-leap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "shim-leap"

Fri Apr 28 09:13:19 2017 rev:5 rq:490912 version:0.9

Changes:
--------
--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes      2017-02-21 
22:47:12.001423777 +0100
+++ /work/SRC/openSUSE:Factory/.shim-leap.new/shim-leap.changes 2017-04-28 
09:13:36.123554900 +0200
@@ -1,0 +2,7 @@
+Tue Apr 25 03:44:04 UTC 2017 - [email protected]
+
+- Update shim to 0.9-15.3.1
+  + shim-install: add option --suse-enable-tpm (fate#315831)
+    (Fix from [email protected])
+
+-------------------------------------------------------------------

Old:
----
  shim-0.9-13.1.x86_64.rpm

New:
----
  shim-0.9-15.3.1.x86_64.rpm

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ shim-leap.spec ++++++
--- /var/tmp/diff_new_pack.Ziscd2/_old  2017-04-28 09:13:37.235398112 +0200
+++ /var/tmp/diff_new_pack.Ziscd2/_new  2017-04-28 09:13:37.239397548 +0200
@@ -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
@@ -22,7 +22,7 @@
 Summary:        UEFI shim loader
 License:        BSD-2-Clause
 Group:          System/Boot
-Source:         shim-0.9-13.1.x86_64.rpm
+Source:         shim-0.9-15.3.1.x86_64.rpm
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64
 

++++++ shim-0.9-13.1.x86_64.rpm -> shim-0.9-15.3.1.x86_64.rpm ++++++
Binary files old/usr/lib64/efi/MokManager.efi and 
new/usr/lib64/efi/MokManager.efi differ
Binary files old/usr/lib64/efi/fallback.efi and new/usr/lib64/efi/fallback.efi 
differ
Binary files old/usr/lib64/efi/shim-opensuse.efi and 
new/usr/lib64/efi/shim-opensuse.efi differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/usr/sbin/shim-install new/usr/sbin/shim-install
--- old/usr/sbin/shim-install   2016-12-15 16:57:45.000000000 +0100
+++ new/usr/sbin/shim-install   2017-04-12 11:43:48.000000000 +0200
@@ -18,6 +18,7 @@
 self="`basename $0`"
 grub_cfg="/boot/grub2/grub.cfg"
 update_boot=no
+def_grub_efi="${source_dir}/grub.efi"
 
 # Get GRUB_DISTRIBUTOR.
 if test -f "${sysconfdir}/default/grub" ; then
@@ -58,6 +59,7 @@
     echo "--efi-directory=DIR use DIR as the EFI System Partition root."
     echo "--config-file=FILE use FILE as config file, default is $grub_cfg."
     echo "--clean remove all installed files and configs."
+    echo "--suse-enable-tpm install grub.efi with TPM support."
     echo
     echo "INSTALL_DEVICE must be system device filename."
 }
@@ -121,6 +123,9 @@
     --no-nvram)
        no_nvram=yes ;;
 
+    --suse-enable-tpm)
+        source_grub_efi="/usr/lib/grub2/x86_64-efi/grub-tpm.efi" ;;
+
     --clean)
        clean=yes ;;
 
@@ -235,7 +240,18 @@
 fi
 
 cp "${source_dir}/MokManager.efi" "${efidir}"
-cp "${source_dir}/grub.efi" "${efidir}"
+
+if test -n "$source_grub_efi" && ! test -f "$source_grub_efi"; then
+    echo "File $source_grub_efi doesn't exist, fallback to default one" 1>&2
+    source_grub_efi=""
+fi
+
+if test -z "$source_grub_efi"; then
+    source_grub_efi="$def_grub_efi"
+fi
+
+echo "copying $source_grub_efi to ${efidir}/grub.efi"
+cp "$source_grub_efi" "${efidir}/grub.efi"
 
 if test "$efidir" != "$efibootdir" ; then 
     cp "${source_dir}/shim.efi" "${efidir}"


Reply via email to