Package: makedumpfile
Version: 1.5.4-1
Severity: serious
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* 0003-powerpc-vmap_area_list.patch: Apply patch from RedHat to add
vmap_area_list definitions on powerpc and ppc64 to fix the FTBFS.
The patch itself should be fairly self-explanatory when compared to
the failed build logs. Cheers.
... Adam
-- System Information:
Debian Release: wheezy/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.12.0-1-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru makedumpfile-1.5.4/debian/changelog makedumpfile-1.5.4/debian/changelog
diff -Nru makedumpfile-1.5.4/debian/control makedumpfile-1.5.4/debian/control
--- makedumpfile-1.5.4/debian/control 2013-11-04 14:05:35.000000000 -0700
+++ makedumpfile-1.5.4/debian/control 2013-11-04 22:25:16.000000000 -0700
@@ -1,8 +1,7 @@
Source: makedumpfile
Section: devel
Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
-XSBC-Original-Maintainer: John Wright <j...@debian.org>
+Maintainer: John Wright <j...@debian.org>
Uploaders: Louis Bouchard <louis.bouch...@ubuntu.com>
Standards-Version: 3.8.2
Build-Depends: debhelper (>= 7.0.50), libelf-dev, libz-dev, libdw-dev (>= 0.141-2ubuntu1), libbz2-dev
diff -Nru makedumpfile-1.5.4/debian/patches/0003-powerpc-vmap_area_list.patch makedumpfile-1.5.4/debian/patches/0003-powerpc-vmap_area_list.patch
--- makedumpfile-1.5.4/debian/patches/0003-powerpc-vmap_area_list.patch 1969-12-31 17:00:00.000000000 -0700
+++ makedumpfile-1.5.4/debian/patches/0003-powerpc-vmap_area_list.patch 2013-11-04 22:20:42.000000000 -0700
@@ -0,0 +1,43 @@
+From 150b58eb299066c65ef7713a93effc35c00be03a Mon Sep 17 00:00:00 2001
+Message-Id: <150b58eb299066c65ef7713a93effc35c00be03a.1374133991.git.bhe at redhat.com>
+From: Baoquan He <bhe at redhat.com>
+Date: Mon, 15 Jul 2013 20:37:14 +0800
+Subject: [PATCH] [PATCH] Add vmap_area_list definition for ppc/ppc64.
+
+vmap_area_list is added to get vmalloc_start for ppc/ppc64, but its
+definition is missing, now add them.
+
+Signed-off-by: Baoquan He <bhe at redhat.com>
+---
+ makedumpfile-1.5.4/arch/ppc.c | 2 +-
+ makedumpfile-1.5.4/arch/ppc64.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/makedumpfile-1.5.4/arch/ppc.c b/makedumpfile-1.5.4/arch/ppc.c
+index a9b4812..a3e1a12 100644
+--- makedumpfile-1.5.4/arch/ppc.c
++++ makedumpfile-1.5.4/arch/ppc.c
+@@ -28,7 +28,7 @@
+ int
+ get_machdep_info_ppc(void)
+ {
+- unsigned long vmlist, vmalloc_start;
++ unsigned long vmlist, vmap_area_list, vmalloc_start;
+
+ info->section_size_bits = _SECTION_SIZE_BITS;
+ info->max_physmem_bits = _MAX_PHYSMEM_BITS;
+diff --git a/makedumpfile-1.5.4/arch/ppc64.c b/makedumpfile-1.5.4/arch/ppc64.c
+index c229ede..85144f6 100644
+--- makedumpfile-1.5.4/arch/ppc64.c
++++ makedumpfile-1.5.4/arch/ppc64.c
+@@ -49,7 +49,7 @@ set_ppc64_max_physmem_bits(void)
+ int
+ get_machdep_info_ppc64(void)
+ {
+- unsigned long vmlist, vmalloc_start;
++ unsigned long vmlist, vmap_area_list, vmalloc_start;
+
+ info->section_size_bits = _SECTION_SIZE_BITS;
+ if (!set_ppc64_max_physmem_bits()) {
+--
+1.7.1
diff -Nru makedumpfile-1.5.4/debian/patches/series makedumpfile-1.5.4/debian/patches/series
--- makedumpfile-1.5.4/debian/patches/series 2013-07-30 03:23:52.000000000 -0600
+++ makedumpfile-1.5.4/debian/patches/series 2013-11-04 22:20:57.000000000 -0700
@@ -1,2 +1,3 @@
0001-Remove-libebl-linkage.patch
0002-Use-install-instead-of-cp-in-Makefile.patch
+0003-powerpc-vmap_area_list.patch
