[kexec-tools] Resolves: bz716388

Neil Horman nhorman at fedoraproject.org
Fri Jun 24 19:14:49 UTC 2011


commit bf110a7bbd9e4319e930a90058ab1d9fdd3c442a
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Fri Jun 24 15:14:23 2011 -0400

    Resolves: bz716388

 .gitignore                                 |    1 +
 kexec-tools-2.0.2-purgatory-makefile.patch |   12 ++++++++++++
 kexec-tools.spec                           |   13 ++++++-------
 sources                                    |    1 +
 4 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c5063c0..7f41e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ dracut-files.tbz2
 kexec-tools-2.0.0.tar.bz2
 kexec-tools-po.tar.gz
 makedumpfile-1.3.5.tar.gz
+/kexec-tools-2.0.2.tar.bz2
diff --git a/kexec-tools-2.0.2-purgatory-makefile.patch b/kexec-tools-2.0.2-purgatory-makefile.patch
new file mode 100644
index 0000000..4e9dbd1
--- /dev/null
+++ b/kexec-tools-2.0.2-purgatory-makefile.patch
@@ -0,0 +1,12 @@
+diff -up kexec-tools-2.0.2/purgatory/Makefile.orig kexec-tools-2.0.2/purgatory/Makefile
+--- kexec-tools-2.0.2/purgatory/Makefile.orig	2011-06-24 15:01:00.228479843 -0400
++++ kexec-tools-2.0.2/purgatory/Makefile	2011-06-24 15:01:06.614650435 -0400
+@@ -56,7 +56,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO
+ 			-I$(srcdir)/include \
+ 			-I$(shell $(CC) -print-file-name=include)
+ $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
+-			--no-undefined -nostartfiles -nostdlib -nodefaultlibs \
++			-nostartfiles -nostdlib -nodefaultlibs \
+ 			-e purgatory_start -r
+ 
+ $(PURGATORY): $(PURGATORY_OBJS)
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 5cf6acb..96e3081 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
-Version: 2.0.0 
-Release: 47%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -47,8 +47,6 @@ Obsoletes: diskdumputils netdump
 #
 # Patches 101 through 200 are meant for x86_64 kexec-tools enablement
 #
-Patch101: kexec-tools-2.0.0-fix-page-offset.patch
-Patch102: kexec-tools-2.0.0-x8664-kernel-text-size.patch
 
 #
 # Patches 201 through 300 are meant for ia64 kexec-tools enablement
@@ -74,7 +72,7 @@ Patch602: kexec-tools-2.0.0-makedumpfile-dynamic-build.patch
 Patch603: kexec-tools-2.0.0-makedumpfile-2.6.32-utsname.patch
 Patch604: kexec-tools-2.0.0-makedumpfile-boption.patch
 Patch605: kexec-tools-2.0.0-makedumpfile-2.6.32-sparsemem.patch
-Patch606: kexec-tools-2.0.0-purgatory-makefile.patch
+Patch606: kexec-tools-2.0.2-purgatory-makefile.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -89,8 +87,6 @@ component of the kernel's kexec feature.
 mkdir -p -m755 kcp
 tar -z -x -v -f %{SOURCE9}
 
-%patch101 -p1
-%patch102 -p1
 
 %patch601 -p1
 %patch602 -p1
@@ -282,6 +278,9 @@ done
 
 
 %changelog
+* Fri Jun 24 2011 Neil Horman <nhorman at redhat.com> - 2.0.2-1
+- Updated to upstream version 2.0.2
+
 * Mon Jun 02 2011 Neil Horman <nhorman at redhat.com> - 2.0.0-47
 - Fixed misuse of readlink command after directory change (bz 710744)
 
diff --git a/sources b/sources
index b5e574a..e2ae88e 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
 3e802d638dce0080b910f15908c04a24  kexec-tools-po.tar.gz
 e3a813bd6d7dace903a05c1296e20d57  makedumpfile-1.3.5.tar.gz
+8e359dd03731b93a2082bd37cc2a4a4c  kexec-tools-2.0.2.tar.bz2


More information about the scm-commits mailing list