Accepting request 313849 from Kernel:kdump

1

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

kexec-tools-2.0.10.tar.xz

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

kexec-tools-2.0.9.tar.xz

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

kexec-tools-callback-function-proto.patch

@@ -1,45 +0,0 @@
-From: Bernhard Übelacker <bernhardu@vr-web.de>
-Subject: Fix callback functions given to kexec_iomem_for_each_line
-References: https://bugs.debian.org/771671
-References: bnc#905090
-Upstream: pending
-
---- kexec-tools-2.0.7.orig/kexec/arch/i386/crashdump-x86.c
-+++ kexec-tools-2.0.7/kexec/arch/i386/crashdump-x86.c
-@@ -1041,8 +1041,8 @@ int get_max_crash_kernel_limit(uint64_t
- 
- static int crashkernel_mem_callback(void *UNUSED(data), int nr,
-                                           char *UNUSED(str),
--                                          unsigned long base,
--                                          unsigned long length)
-+                                          unsigned long long base,
-+                                          unsigned long long length)
- {
- 	if (nr >= CRASH_RESERVED_MEM_NR)
- 		return 1;
---- kexec-tools-2.0.7.orig/kexec/arch/sh/crashdump-sh.c
-+++ kexec-tools-2.0.7/kexec/arch/sh/crashdump-sh.c
-@@ -34,8 +34,8 @@ static struct memory_range crash_memory_
- static int crash_sh_range_nr;
- static int crash_sh_memory_range_callback(void *UNUSED(data), int UNUSED(nr),
- 					  char *str,
--					  unsigned long base,
--					  unsigned long length)
-+					  unsigned long long base,
-+					  unsigned long long length)
- {
- 
- 	struct memory_range *range = crash_memory_range;
---- kexec-tools-2.0.7.orig/kexec/arch/sh/kexec-sh.c
-+++ kexec-tools-2.0.7/kexec/arch/sh/kexec-sh.c
-@@ -24,8 +24,8 @@ static struct memory_range memory_range[
- 
- static int kexec_sh_memory_range_callback(void *UNUSED(data), int nr,
- 					  char *UNUSED(str),
--					  unsigned long base,
--					  unsigned long length)
-+					  unsigned long long base,
-+					  unsigned long long length)
- {
- 	if (nr < MAX_MEMORY_RANGES) {
- 		memory_range[nr].start = base;

kexec-tools-xen-balloon-up.patch

@@ -179,15 +179,15 @@ Disable ballooning before doing kexec.
  	unsigned long machine = elf_info->machine;
 --- a/kexec/kexec.c
 +++ b/kexec/kexec.c
-@@ -1173,6 +1173,7 @@ int main(int argc, char *argv[])
+@@ -1168,6 +1168,7 @@ int main(int argc, char *argv[])
  	int do_shutdown = 1;
- 	int do_sync = 1;
+ 	int do_sync = 1, skip_sync = 0;
- 	int do_ifdown = 0;
+ 	int do_ifdown = 0, skip_ifdown = 0;
 +	int do_balloon = 0;
  	int do_unload = 0;
  	int do_reuse_initrd = 0;
  	int do_kexec_file_syscall = 0;
-@@ -1227,6 +1228,7 @@ int main(int argc, char *argv[])
+@@ -1225,6 +1226,7 @@ int main(int argc, char *argv[])
  			do_shutdown = 0;
  			do_sync = 1;
  			do_ifdown = 1;
@@ -195,7 +195,7 @@ Disable ballooning before doing kexec.
  			do_exec = 1;
  			break;
  		case OPT_LOAD:
-@@ -1247,6 +1249,7 @@ int main(int argc, char *argv[])
+@@ -1245,6 +1247,7 @@ int main(int argc, char *argv[])
  			do_shutdown = 0;
  			do_sync = 1;
  			do_ifdown = 1;
@@ -203,7 +203,7 @@ Disable ballooning before doing kexec.
  			do_exec = 1;
  			break;
  		case OPT_LOAD_JUMP_BACK_HELPER:
-@@ -1384,6 +1387,9 @@ int main(int argc, char *argv[])
+@@ -1387,6 +1390,9 @@ int main(int argc, char *argv[])
  	if ((result == 0) && do_ifdown) {
  		ifdown();
  	}
@@ -215,7 +215,7 @@ Disable ballooning before doing kexec.
  	}
 --- a/kexec/kexec.h
 +++ b/kexec/kexec.h
-@@ -305,5 +305,6 @@ int xen_present(void);
+@@ -307,5 +307,6 @@ int xen_present(void);
  int xen_kexec_load(struct kexec_info *info);
  int xen_kexec_unload(uint64_t kexec_flags);
  void xen_kexec_exec(void);

kexec-tools-xen-static.patch

@@ -14,13 +14,13 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -161,7 +161,8 @@ fi
+@@ -164,7 +164,8 @@ fi
  dnl find Xen control stack libraries
  if test "$with_xen" = yes ; then
  	AC_CHECK_HEADER(xenctrl.h,
--		AC_CHECK_LIB(xenctrl, xc_kexec_load, ,
+-		[AC_CHECK_LIB(xenctrl, xc_kexec_load, ,
-+		AC_CHECK_LIB(xenctrl, xc_kexec_load,
++		[AC_CHECK_LIB(xenctrl, xc_kexec_load,
-+		[AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [[LIBS="-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS"]]],
++		[AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
- 		AC_MSG_NOTICE([Xen support disabled])))
+ 		AC_MSG_NOTICE([Xen support disabled]))])
  fi
  

kexec-tools.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jun 26 07:33:16 UTC 2015 - ptesarik@suse.cz
+
+- Upgrade to kexec-2.0.10: This is a feature release coinciding
+  with the release of the v4.1 Linux Kernel.
+- Refreshed patches:
+  * kexec-tools-xen-static.patch
+  * kexec-tools-xen-balloon-up.patch
+- Dropped patches (now upstream):
+  * kexec-tools-callback-function-proto.patch
+
 -------------------------------------------------------------------
 Sun Mar 29 01:53:16 UTC 2015 - crrodriguez@opensuse.org
 

kexec-tools.spec

@@ -26,7 +26,7 @@ PreReq:         %fillup_prereq
 Summary:        Tools for fast kernel loading
 License:        GPL-2.0+
 Group:          System/Kernel
-Version:        2.0.9
+Version:        2.0.10
 Release:        0
 Source:         ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 Source1:        kexec-bootloader
@@ -38,7 +38,6 @@ Patch2:         %{name}-xen-balloon-up.patch
 Patch3:         %{name}-disable-test.patch
 Patch4:         %{name}-enable-aarch64.patch
 Patch5:         %{name}-enable-aarch64-fixup.patch
-Patch6:         %{name}-callback-function-proto.patch
 
 Url:            ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -65,7 +64,6 @@ the loaded kernel after it panics.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 # disable as-needed