Hello community, here is the log from the commit of package shim for openSUSE:Factory checked in at 2017-08-24 18:23:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shim (Old) and /work/SRC/openSUSE:Factory/.shim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shim" Thu Aug 24 18:23:17 2017 rev:60 rq:518043 version:12 Changes: -------- --- /work/SRC/openSUSE:Factory/shim/shim.changes 2017-08-01 09:24:32.706751144 +0200 +++ /work/SRC/openSUSE:Factory/.shim.new/shim.changes 2017-08-24 18:23:21.550846588 +0200 @@ -1,0 +2,9 @@ +Tue Aug 22 04:51:08 UTC 2017 - glin@suse.com + +- Add shim-arch-independent-names.patch to use the Arch-independent + names. (bsc#1054712) +- Refresh shim-change-debug-file-path.patch +- Disable shim-opensuse-cert-prompt.patch automatically in SLE +- Diable AArch64 until we have a real user and aarch64 signature + +------------------------------------------------------------------- New: ---- shim-arch-independent-names.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shim.spec ++++++ --- /var/tmp/diff_new_pack.crmXDz/_old 2017-08-24 18:23:22.478715939 +0200 +++ /var/tmp/diff_new_pack.crmXDz/_new 2017-08-24 18:23:22.482715376 +0200 @@ -45,6 +45,8 @@ Source99: SIGNATURE_UPDATE.txt # PATCH-FIX-SUSE shim-only-os-name.patch glin@suse.com -- Only include the OS name in version.c Patch1: shim-only-os-name.patch +# PATCH-FIX-SUSE shim-only-os-name.patch glin@suse.com -- Use the Arch-independent names +Patch2: shim-arch-independent-names.patch # PATCH-FIX-OPENSUSE shim-change-debug-file-path.patch glin@suse.com -- Change the default debug file path Patch50: shim-change-debug-file-path.patch # PATCH-FIX-OPENSUSE shim-opensuse-cert-prompt.patch glin@suse.com -- Show the prompt to ask whether the user trusts openSUSE certificate or not @@ -65,7 +67,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # For shim-install script Requires: grub2-efi -ExclusiveArch: x86_64 aarch64 +# Disable AArch64 until we have the signature +ExclusiveArch: x86_64 %description shim is a trivial EFI application that, when run, attempts to open and @@ -92,14 +95,15 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %patch50 -p1 +%if 0%{?is_opensuse} == 1 %patch100 -p1 +%endif %build # first, build MokManager and fallback as they don't depend on a # specific certificate -make EFI_PATH=/usr/lib64 RELEASE=0 mmx64.efi fbx64.efi 2>/dev/null -rename mmx64 MokManager mmx64.* -rename fbx64 fallback fbx64.* +make EFI_PATH=/usr/lib64 RELEASE=0 MokManager.efi fallback.efi 2>/dev/null # now build variants of shim that embed different certificates default='' @@ -154,8 +158,7 @@ cp $cert2 shim.crt fi # make sure cast warnings don't trigger post build check - make EFI_PATH=/usr/lib64 RELEASE=0 VENDOR_CERT_FILE=shim-$suffix.der ENABLE_HTTPBOOT=1 shimx64.efi - rename shimx64 shim shimx64.* + make EFI_PATH=/usr/lib64 RELEASE=0 VENDOR_CERT_FILE=shim-$suffix.der ENABLE_HTTPBOOT=1 shim.efi # # assert correct certificate embedded grep -q "$verify" shim.efi ++++++ shim-arch-independent-names.patch ++++++
From 927d98bacff515fdbac1ba13c6ca655385f3d6a7 Mon Sep 17 00:00:00 2001 From: Gary Lin
Date: Tue, 22 Aug 2017 12:43:36 +0800 Subject: [PATCH] Make the names of EFI binaries arch-independent
Since we only build the 64-bit binaries, we don't have the issue of the
mixed architecture binaries in the same directory. Besides, we will use
the same install script for x86_64 and AArch64. It's easier to maintain
the script with the same names.
Signed-off-by: Gary Lin