Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2018-08-13 09:54:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Mon Aug 13 09:54:03 2018 rev:191 rq:628303 version:2.02
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2018-08-02
14:49:01.627352530 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-08-13
09:54:07.974806819 +0200
@@ -1,0 +2,22 @@
+Thu Aug 9 02:48:18 UTC 2018 - mch...@suse.com
+
+- Downgrade libburnia-tools to suggest as minimal system can't afford pulling
+ in tcl/tk and half of the x11 stack (bsc#1102515)
+ * modified grub2.spec
+
+-------------------------------------------------------------------
+Wed Aug 8 15:17:13 UTC 2018 - dims...@opensuse.org
+
+- Add grub2-binutils2.31.patch: x86-64: Treat R_X86_64_PLT32 as
+ R_X86_64_PC32. Starting from binutils commit bd7ab16b x86-64
+ assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
+ 32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32
+ as R_X86_64_PC32.
+
+-------------------------------------------------------------------
+Mon Aug 6 09:02:45 UTC 2018 - josef.moell...@suse.com
+
+- The grubxenarch packages are now architecture-independent.
+ [bsc#953297, grub2.spec, grub2-rpmlintrc]
+
+-------------------------------------------------------------------
New:
----
grub2-binutils2.31.patch
grub2-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.rknVNM/_old 2018-08-13 09:54:09.170809241 +0200
+++ /var/tmp/diff_new_pack.rknVNM/_new 2018-08-13 09:54:09.170809241 +0200
@@ -161,6 +161,7 @@
# required hook for systemd-sleep (bsc#941758)
Source17: grub2-systemd-sleep.sh
Source18: grub2-check-default.sh
+Source999: grub2-rpmlintrc
Source1000: PATCH_POLICY
Patch1: rename-grub-info-file-to-grub2.patch
Patch2: grub2-linux.patch
@@ -218,6 +219,7 @@
Patch87: 0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch
Patch88: unix-exec-avoid-atexit-handlers-when-child-exits.patch
Patch89: 0001-xfs-Accept-filesystem-with-sparse-inodes.patch
+Patch90: grub2-binutils2.31.patch
# Btrfs snapshot booting related patches
Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
Patch102: grub2-btrfs-02-export-subvolume-envvars.patch
@@ -299,7 +301,8 @@
Recommends: os-prober
%endif
# xorriso not available using grub2-mkrescue (bnc#812681)
-Recommends: libburnia-tools
+# downgrade to suggest as minimal system can't afford pulling in tcl/tk and
half of the x11 stack (bsc#1102515)
+Suggests: libburnia-tools
Recommends: mtools
%endif
Requires(post): /sbin/install-info
@@ -414,6 +417,7 @@
Group: System/Boot
Provides: %{name}-xen = %{version}-%{release}
Obsoletes: %{name}-xen < %{version}-%{release}
+BuildArch: noarch
%description %{grubxenarch}
The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
@@ -510,6 +514,7 @@
%patch87 -p1
%patch88 -p1
%patch89 -p1
+%patch90 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
++++++ grub2-binutils2.31.patch ++++++
>From 842c390469e2c2e10b5aa36700324cd3bde25875 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.to...@gmail.com>
Date: Sat, 17 Feb 2018 06:47:28 -0800
Subject: x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as
R_X86_64_PC32.
Signed-off-by: H.J. Lu <hjl.to...@gmail.com>
Reviewed-by: Daniel Kiper <daniel.ki...@oracle.com>
---
grub-core/efiemu/i386/loadcore64.c | 1 +
grub-core/kern/x86_64/dl.c | 1 +
util/grub-mkimagexx.c | 1 +
util/grub-module-verifier.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/grub-core/efiemu/i386/loadcore64.c
b/grub-core/efiemu/i386/loadcore64.c
index e49d0b6..18facf4 100644
--- a/grub-core/efiemu/i386/loadcore64.c
+++ b/grub-core/efiemu/i386/loadcore64.c
@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t
segs,
break;
case R_X86_64_PC32:
+ case R_X86_64_PLT32:
err = grub_efiemu_write_value (addr,
*addr32 + rel->r_addend
+ sym.off
diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
index 4406906..3a73e6e 100644
--- a/grub-core/kern/x86_64/dl.c
+++ b/grub-core/kern/x86_64/dl.c
@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
break;
case R_X86_64_PC32:
+ case R_X86_64_PLT32:
{
grub_int64_t value;
value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index a2bb054..39d7efb 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr
*sections,
break;
case R_X86_64_PC32:
+ case R_X86_64_PLT32:
{
grub_uint32_t *t32 = (grub_uint32_t *) target;
*t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
index 9179285..a79271f 100644
--- a/util/grub-module-verifier.c
+++ b/util/grub-module-verifier.c
@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
-1
}, (int[]){
R_X86_64_PC32,
+ R_X86_64_PLT32,
-1
}
},
--
cgit v1.0-41-gc330
++++++ grub2-rpmlintrc ++++++
addFilter('arch-independent-package-contains-binary-or-object')
