Hello community, here is the log from the commit of package shim for openSUSE:Factory checked in at 2016-05-13 09:21:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shim (Old) and /work/SRC/openSUSE:Factory/.shim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim" Changes: -------- --- /work/SRC/openSUSE:Factory/shim/shim.changes 2016-03-16 10:25:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shim.new/shim.changes 2016-05-13 09:22:00.000000000 +0200 @@ -1,0 +2,10 @@ +Mon May 9 11:20:56 UTC 2016 - [email protected] + +- shim-install : support simple MD RAID1 target devices (FATE#314829) + +------------------------------------------------------------------- +Wed May 4 10:40:52 UTC 2016 - [email protected] + +- Add shim-fix-aarch64.patch to fix compilation on AArch64 (bsc#978438) + +------------------------------------------------------------------- New: ---- shim-fix-aarch64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shim.spec ++++++ --- /var/tmp/diff_new_pack.JUlMCV/_old 2016-05-13 09:22:02.000000000 +0200 +++ /var/tmp/diff_new_pack.JUlMCV/_new 2016-05-13 09:22:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package shim # -# Copyright (c) 2016 SUSE LINUX Products 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 @@ -50,6 +50,7 @@ Patch5: shim-gcc5.patch # PATCH-FIX-UPSTREAM shim-bsc950569-fix-cryptlib-va-functions.patch bsc#950569 [email protected] -- Fix the definition of the va functions to avoid the potential crash Patch6: shim-bsc950569-fix-cryptlib-va-functions.patch +Patch7: shim-fix-aarch64.patch # PATCH-FIX-OPENSUSE shim-change-debug-file-path.patch [email protected] -- Change the default debug file path Patch50: shim-change-debug-file-path.patch # PATCH-FIX-OPENSUSE shim-opensuse-cert-prompt.patch [email protected] -- Show the prompt to ask whether the user trusts openSUSE certificate or not @@ -93,6 +94,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %patch50 -p1 %patch100 -p1 %build ++++++ shim-fix-aarch64.patch ++++++ Index: shim-0.9/Makefile =================================================================== --- shim-0.9.orig/Makefile +++ shim-0.9/Makefile @@ -53,7 +53,7 @@ ifeq ($(ARCH),ia32) "-DDEBUGDIR=L\"/usr/lib/debug/usr/share/shim/ia32-$(VERSION)$(RELEASE)/\"" endif ifeq ($(ARCH),aarch64) - CFLAGS += "-DEFI_ARCH=L\"aa64\"" + CFLAGS += "-DEFI_ARCH=L\"aa64\"" \ "-DDEBUGDIR=L\"/usr/lib/debug/usr/share/shim/aa64-$(VERSION)$(RELEASE)/\"" endif ++++++ shim-install ++++++ --- /var/tmp/diff_new_pack.JUlMCV/_old 2016-05-13 09:22:02.000000000 +0200 +++ /var/tmp/diff_new_pack.JUlMCV/_new 2016-05-13 09:22:02.000000000 +0200 @@ -281,6 +281,21 @@ efidir_disk="$("$grub_probe" --target=disk --device-map= "$efidir")" if test -z "$efidir_drive" || test -z "$efidir_disk"; then echo "Can't find GRUB drive for $efidir; unable to create EFI Boot Manager entry." >&2 + elif [[ "$efidir_drive" == \(mduuid/* ]]; then + eval $(mdadm --detail --export "$efidir_disk" | + perl -ne 'print if m{^MD_LEVEL=}; push( @D, $1) if (m{^MD_DEVICE_\S+_DEV=(\S+)$}); + sub END() {print "MD_DEVS=\"", join( " ", @D), "\"\n";};') + if [ "$MD_LEVEL" != "raid1" ]; then + echo "GRUB drive for $efidir not on RAID1; unable to create EFI Boot Manager entry." >&2 + fi + for mddev in $MD_DEVS; do + efidir_drive="$("$grub_probe" --target=drive --device-map= -d "$mddev")" + efidir_disk="$("$grub_probe" --target=disk --device-map= -d "$mddev")" + efidir_part="$(echo "$efidir_drive" | sed 's/^([^,]*,[^0-9]*//; s/[^0-9].*//')" + efidir_d=${mddev#/dev/} + efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \ + -L "$bootloader_id ($efidir_d)" -l "\\EFI\\$efi_distributor\\$efi_file" + done else efidir_part="$(echo "$efidir_drive" | sed 's/^([^,]*,[^0-9]*//; s/[^0-9].*//')" efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \
