OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kexec-tools?expand=0&rev=34

kexec-longer-cmdline.diff

@@ -232,7 +232,7 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de>
 +
  #define KERN_VADDR_ALIGN	0x100000	/* 1MB */
  
- /* Read kernel physical load addr from /proc/iomem (Kernel Code) and
+ /* Read kernel physical load addr from the file returned by proc_iomem()
 @@ -494,7 +523,7 @@ static int cmdline_add_memmap(char *cmdl
  		strcat (str_mmap, "K");
  		len = strlen(str_mmap);

kexec-tools-testing-20071017-rc.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fdae956a1f3204407052a4d1179d2746c52aa3436364821e714c431f898182e
+size 211530

kexec-tools-testing.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a794f416e2b732c1075bf5ae1c44eccdd338a2598aae658f3a41334027e64e7
-size 1004081

kexec-tools.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Oct 17 08:35:24 CEST 2007 - bwalle@suse.de
+
+- update to kexec-tools-testing v20071017-rc
+  o Set alternate location for /proc/iomem on ia64 xen
+  o debugging output improvements
+  o Handle malloc() failure in xen_get_nr_phys_cpus()
+  o Added generic --reuseinitrd option
+  o ppc64: fix device-tree mem node
+  o ppc64: fix misaligned cmdline
+  o ppc64: cleanup get_devtree_details
+  o ppc64: Add arch specific --reuseinitrd hooks
+  o ppc64: use kernels slave loop for purgatory
+  o ppc64: correct @ha relocation
+- remove kexec-tools.check_reuse_initrd-close.patch (merged
+  mainline)
+
 -------------------------------------------------------------------
 Thu Oct 11 16:48:58 CEST 2007 - bwalle@suse.de
 

kexec-tools.check_reuse_initrd-close.patch

@@ -1,16 +0,0 @@
-kexec/kexec.c:793: warning: passing argument 1 of 'close' makes integer from pointer without a cast
----
- kexec/kexec.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/kexec/kexec.c
-+++ b/kexec/kexec.c
-@@ -790,7 +790,7 @@ void check_reuse_initrd(void)
- 		    "retain the initrd for reuse.\n");
- 	if (line)
- 		free(line);
--	close(fp);
-+	fclose(fp);
- }
- 
- /* Arch hook for reuse_initrd */

kexec-tools.spec

@@ -15,21 +15,20 @@ Name:           kexec-tools
 %ifarch ppc
 BuildRequires:  gcc42-64bit glibc-devel-64bit
 %endif
-%define package_version	        testing
+%define package_version	        testing-20071017-rc
 License:        GPL v2 or later
 Group:          System/Kernel
 Requires:       %insserv_prereq %fillup_prereq
 AutoReqProv:    on
 Summary:        Tools for fast kernel loading
 Version:        1.101
-Release:        141
+Release:        144
 Source:         %{name}-%{package_version}.tar.bz2
 Source1:        README.SUSE
 Url:            http://www.vergenet.net/linux/kexec/kexec-tools/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  zlib-devel
 Patch1:         kexec-longer-cmdline.diff
-Patch2:         kexec-tools.check_reuse_initrd-close.patch
 Patch20:        kexec-tools.ppc64-32bit-build.patch
 Patch21:        kexec-tools.ppc32-64bit-purgatory.patch
 Patch22:        kexec-tools.gcc-bug.patch
@@ -54,7 +53,6 @@ Authors:
 %prep
 %setup -q -n kexec-tools-%{package_version}
 %patch1 -p1
-%patch2 -p1
 #
 %patch20 -p1
 %patch21 -p1
@@ -93,6 +91,20 @@ install -c -m 0644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8
 /%_lib/kexec-tools*
 %endif
 %changelog
+* Wed Oct 17 2007 - bwalle@suse.de
+- update to kexec-tools-testing v20071017-rc
+  o Set alternate location for /proc/iomem on ia64 xen
+  o debugging output improvements
+  o Handle malloc() failure in xen_get_nr_phys_cpus()
+  o Added generic --reuseinitrd option
+  o ppc64: fix device-tree mem node
+  o ppc64: fix misaligned cmdline
+  o ppc64: cleanup get_devtree_details
+  o ppc64: Add arch specific --reuseinitrd hooks
+  o ppc64: use kernels slave loop for purgatory
+  o ppc64: correct @ha relocation
+- remove kexec-tools.check_reuse_initrd-close.patch (merged
+  mainline)
 * Thu Oct 11 2007 - bwalle@suse.de
 - remove kdump stuff from this package, that's now in the "kexec"
   package