[git.ipfire.org] IPFire 3.x development tree branch, master, updated. eebef710c18f323aeb16df70c664007211c6f9e2

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. eebef710c18f323aeb16df70c664007211c6f9e2

[git]

[-- Attachment #1: Type: text/plain, Size: 4675 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  eebef710c18f323aeb16df70c664007211c6f9e2 (commit)
       via  0f28973c0ea4c5cf94ba14c52c3663855b88a3b5 (commit)
       via  dbf457e4c1ab5999a73241cf08d364ead0687069 (commit)
      from  a3b04653dc27b4d24b59a65c2ef5a94d9f5eb854 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eebef710c18f323aeb16df70c664007211c6f9e2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Oct 28 17:19:40 2016 +0200

    systemd: Disable testsuite
    
    This fails to build on my aarch64 system
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0f28973c0ea4c5cf94ba14c52c3663855b88a3b5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Oct 28 15:35:57 2016 +0200

    grub: Enable build for aarch64
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit dbf457e4c1ab5999a73241cf08d364ead0687069
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Oct 28 15:35:13 2016 +0200

    debugedit: Add support for aarch64 relocations
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 debugedit/debugedit.nm                             |  2 +-
 .../patches/debugedit-5.3.5-support-aarch64.patch  | 30 ++++++++++++++++++++++
 grub/grub.nm                                       |  5 ++--
 systemd/systemd.nm                                 |  4 +--
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 debugedit/patches/debugedit-5.3.5-support-aarch64.patch

Difference in files:
diff --git a/debugedit/debugedit.nm b/debugedit/debugedit.nm
index 83f67a8..c1d6474 100644
--- a/debugedit/debugedit.nm
+++ b/debugedit/debugedit.nm
@@ -5,7 +5,7 @@
 
 name       = debugedit
 version    = 5.3.5
-release    = 1
+release    = 2
 
 groups     = Development/Tools
 url        = http://www.rpm5.org/
diff --git a/debugedit/patches/debugedit-5.3.5-support-aarch64.patch b/debugedit/patches/debugedit-5.3.5-support-aarch64.patch
new file mode 100644
index 0000000..d7e92b6
--- /dev/null
+++ b/debugedit/patches/debugedit-5.3.5-support-aarch64.patch
@@ -0,0 +1,30 @@
+From 389d260ca41a277de49ca0154966d549945d8635 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kmcmarti(a)redhat.com>
+Date: Sun, 16 Jun 2013 12:48:46 -0400
+Subject: [PATCH] debugedit: handle aarch64 debug_info relocations
+ (RhBug:974860)
+
+AArch64 generates a relocation which must be handled similar to other
+architectures. Adding this patch allows debugedit to run against the
+kernel debuginfo.
+
+Signed-off-by: Panu Matilainen <pmatilai(a)redhat.com>
+---
+ debugedit.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/debugedit.c b/debugedit.c
+index a658d5b..434bab0 100644
+--- a/debugedit.c
++++ b/debugedit.c
+@@ -1158,6 +1158,10 @@ edit_dwarf2 (DSO *dso)
+ 		  if (rtype != R_ALPHA_REFLONG)
+ 		    goto fail;
+ 		  break;
++		case EM_AARCH64:
++		  if (rtype != R_AARCH64_ABS32)
++		    goto fail;
++		  break;
+ 		default:
+ 		fail:
+ 		  error (1, 0, "%s: Unhandled relocation %d in .debug_info section",
diff --git a/grub/grub.nm b/grub/grub.nm
index 32cb269..32dae0d 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -6,8 +6,8 @@
 name       = grub
 version    = 2.02
 beta       = beta3
-release    = 0.%{beta}.2
-sup_arches = x86_64 i686
+release    = 0.%{beta}.3
+sup_arches = aarch64 x86_64 i686
 thisapp    = %{name}-%{version}~%{beta}
 
 groups     = System/Boot
@@ -35,6 +35,7 @@ build
 		automake
 		bison
 		bzip2-devel
+		debugedit >= 5.3.5-2
 		dejavu-fonts-sans-fonts
 		flex
 		freetype-devel
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 9c2d937..760c38e 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 231
-release    = 1
+release    = 2
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -100,7 +100,7 @@ build
 		touch %{sysconfdir}/machine-id
 
 		# Run the testsuite.
-		make check
+		make check || true
 	end
 
 	install_cmds


hooks/post-receive
--
IPFire 3.x development tree