Accepting request 213587 from Kernel:kdump
Update to 2.0.4 (forwarded request 213586 from jones_tony) OBS-URL: https://build.opensuse.org/request/show/213587 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kexec-tools?expand=0&rev=96
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
9e230d6144
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:936c89c7229928fe165571c81a13c2837a73d8747779331ef11606bb1f8c8d55
|
||||
size 300199
|
||||
3
kexec-tools-2.0.4.tar.bz2
Normal file
3
kexec-tools-2.0.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ad3b8d1219f6fb98c89166f9e0069418ebdd4a48986783e0d52b5bd9f9051a4d
|
||||
size 300973
|
||||
@ -10,7 +10,7 @@ Fedora). Also one less file for usr_merge
|
||||
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -176,8 +176,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
|
||||
@@ -177,8 +177,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
|
||||
PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
|
||||
|
||||
MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE)
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
From: Tony Jones
|
||||
Date: Tue Oct 9 17:35:14 2012
|
||||
Subject: kexec: fix Makefile.in binaries_arch
|
||||
Git-commit: aaedd5321b239a919a080da84ed5c96fb4481ed2
|
||||
|
||||
--- a/Makefile.in 2011-10-03 00:56:38.000000000 +0200
|
||||
+++ b/Makefile.in 2012-09-26 18:36:44.232086000 +0200
|
||||
@@ -176,8 +176,8 @@
|
||||
PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
|
||||
|
||||
MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE)
|
||||
-BINARIES_i386:=$(KEXEC_TEST) $(KEXEC_TEST)
|
||||
-BINARIES_x86_64:=$(KEXEC) $(KDUMP) $(BINARIES_$(ARCH))
|
||||
+BINARIES_i386:=$(KEXEC_TEST)
|
||||
+BINARIES_x86_64:=$(KEXEC_TEST)
|
||||
BINARIES:=$(KEXEC) $(KDUMP) $(VMCORE_DMESG) $(BINARIES_$(ARCH))
|
||||
|
||||
TARGETS:=$(BINARIES) $(MAN_PAGES)
|
||||
@ -1,24 +0,0 @@
|
||||
Index: kexec-tools-2.0.2/kexec/arch/ppc64/fs2dt.c
|
||||
===================================================================
|
||||
--- kexec-tools-2.0.2.orig/kexec/arch/ppc64/fs2dt.c
|
||||
+++ kexec-tools-2.0.2/kexec/arch/ppc64/fs2dt.c
|
||||
@@ -594,7 +594,7 @@ static void putnode(void)
|
||||
* pseries/hvcterminal is supported.
|
||||
*/
|
||||
strcpy(filename, pathname);
|
||||
- strncat(filename, "linux,stdout-path", MAXPATH);
|
||||
+ strncat(filename, "linux,stdout-path", MAXPATH-strlen(filename)-1);
|
||||
fd = open(filename, O_RDONLY);
|
||||
if (fd == -1) {
|
||||
printf("Unable to find %s, printing from purgatory is diabled\n",
|
||||
@@ -618,8 +618,8 @@ static void putnode(void)
|
||||
read(fd, buff, statbuf.st_size);
|
||||
close(fd);
|
||||
strncpy(filename, "/proc/device-tree/", MAXPATH);
|
||||
- strncat(filename, buff, MAXPATH);
|
||||
- strncat(filename, "/compatible", MAXPATH);
|
||||
+ strncat(filename, buff, MAXPATH-strlen(filename)-1);
|
||||
+ strncat(filename, "/compatible", MAXPATH-strlen(filename)-1);
|
||||
fd = open(filename, O_RDONLY);
|
||||
if (fd == -1) {
|
||||
printf("Unable to find %s printing from purgatory is diabled\n",
|
||||
@ -1,34 +0,0 @@
|
||||
From: Bernhard Walle <bwalle@suse.de>
|
||||
Subject: [PATCH] Don't print setup_linux_vesafb message
|
||||
Patch-mainline: never
|
||||
|
||||
This looks ugly:
|
||||
|
||||
linux-nisf:/var/crash # rckdump start
|
||||
Loading kdump setup_linux_vesafb: 1024x768x16 @ e0000000 +600000
|
||||
|
||||
Don't display the setup_linux_vesafb message.
|
||||
|
||||
|
||||
Signed-off-by: Bernhard Walle <bwalle@suse.de>
|
||||
|
||||
---
|
||||
kexec/arch/i386/x86-linux-setup.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
--- a/kexec/arch/i386/x86-linux-setup.c
|
||||
+++ b/kexec/arch/i386/x86-linux-setup.c
|
||||
@@ -149,9 +149,13 @@ int setup_linux_vesafb(struct x86_linux_
|
||||
real_mode->rsvd_pos = var.transp.offset;
|
||||
real_mode->rsvd_size = var.transp.length;
|
||||
}
|
||||
+
|
||||
+#if 0
|
||||
fprintf(stderr, "%s: %dx%dx%d @ %lx +%x\n", __FUNCTION__,
|
||||
var.xres, var.yres, var.bits_per_pixel,
|
||||
fix.smem_start, fix.smem_len);
|
||||
+#endif
|
||||
+
|
||||
return 0;
|
||||
|
||||
out:
|
||||
@ -9,10 +9,8 @@ Disable ballooning before doing kexec.
|
||||
kexec/kexec.c | 6 ++
|
||||
3 files changed, 119 insertions(+), 6 deletions(-)
|
||||
|
||||
Index: kexec-tools-2.0.2/kexec/crashdump-xen.c
|
||||
===================================================================
|
||||
--- kexec-tools-2.0.2.orig/kexec/crashdump-xen.c
|
||||
+++ kexec-tools-2.0.2/kexec/crashdump-xen.c
|
||||
--- a/kexec/crashdump-xen.c
|
||||
+++ b/kexec/crashdump-xen.c
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <limits.h>
|
||||
#include <sys/types.h>
|
||||
@ -42,7 +40,7 @@ Index: kexec-tools-2.0.2/kexec/crashdump-xen.c
|
||||
static jmp_buf xen_sigill_jmp;
|
||||
void xen_sigill_handler(int sig)
|
||||
{
|
||||
@@ -81,29 +93,118 @@ found:
|
||||
@@ -84,29 +96,118 @@ found:
|
||||
return regs[0];
|
||||
}
|
||||
|
||||
@ -167,7 +165,7 @@ Index: kexec-tools-2.0.2/kexec/crashdump-xen.c
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -122,6 +223,11 @@ int xen_present(void)
|
||||
@@ -125,6 +226,11 @@ int xen_present(void)
|
||||
return is_dom0 > 0;
|
||||
}
|
||||
|
||||
@ -179,11 +177,9 @@ Index: kexec-tools-2.0.2/kexec/crashdump-xen.c
|
||||
unsigned long xen_architecture(struct crash_elf_info *elf_info)
|
||||
{
|
||||
unsigned long machine = elf_info->machine;
|
||||
Index: kexec-tools-2.0.2/kexec/crashdump.h
|
||||
===================================================================
|
||||
--- kexec-tools-2.0.2.orig/kexec/crashdump.h
|
||||
+++ kexec-tools-2.0.2/kexec/crashdump.h
|
||||
@@ -50,6 +50,7 @@ unsigned long phys_to_virt(struct crash_
|
||||
--- a/kexec/crashdump.h
|
||||
+++ b/kexec/crashdump.h
|
||||
@@ -57,6 +57,7 @@ unsigned long phys_to_virt(struct crash_
|
||||
unsigned long paddr);
|
||||
|
||||
int xen_present(void);
|
||||
@ -191,11 +187,9 @@ Index: kexec-tools-2.0.2/kexec/crashdump.h
|
||||
unsigned long xen_architecture(struct crash_elf_info *elf_info);
|
||||
int xen_get_nr_phys_cpus(void);
|
||||
int xen_get_note(int cpu, uint64_t *addr, uint64_t *len);
|
||||
Index: kexec-tools-2.0.2/kexec/kexec.c
|
||||
===================================================================
|
||||
--- kexec-tools-2.0.2.orig/kexec/kexec.c
|
||||
+++ kexec-tools-2.0.2/kexec/kexec.c
|
||||
@@ -1048,6 +1048,7 @@ int main(int argc, char *argv[])
|
||||
--- a/kexec/kexec.c
|
||||
+++ b/kexec/kexec.c
|
||||
@@ -1054,6 +1054,7 @@ int main(int argc, char *argv[])
|
||||
int do_shutdown = 1;
|
||||
int do_sync = 1;
|
||||
int do_ifdown = 0;
|
||||
@ -203,7 +197,7 @@ Index: kexec-tools-2.0.2/kexec/kexec.c
|
||||
int do_unload = 0;
|
||||
int do_reuse_initrd = 0;
|
||||
void *entry = 0;
|
||||
@@ -1082,6 +1083,7 @@ int main(int argc, char *argv[])
|
||||
@@ -1088,6 +1089,7 @@ int main(int argc, char *argv[])
|
||||
do_shutdown = 0;
|
||||
do_sync = 1;
|
||||
do_ifdown = 1;
|
||||
@ -211,7 +205,7 @@ Index: kexec-tools-2.0.2/kexec/kexec.c
|
||||
do_exec = 1;
|
||||
break;
|
||||
case OPT_LOAD:
|
||||
@@ -1100,6 +1102,7 @@ int main(int argc, char *argv[])
|
||||
@@ -1106,6 +1108,7 @@ int main(int argc, char *argv[])
|
||||
do_shutdown = 0;
|
||||
do_sync = 1;
|
||||
do_ifdown = 1;
|
||||
@ -219,7 +213,7 @@ Index: kexec-tools-2.0.2/kexec/kexec.c
|
||||
do_exec = 1;
|
||||
break;
|
||||
case OPT_LOAD_JUMP_BACK_HELPER:
|
||||
@@ -1222,6 +1225,9 @@ int main(int argc, char *argv[])
|
||||
@@ -1228,6 +1231,9 @@ int main(int argc, char *argv[])
|
||||
if ((result == 0) && do_ifdown) {
|
||||
ifdown();
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de>
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -160,7 +160,8 @@ fi
|
||||
@@ -161,7 +161,8 @@ fi
|
||||
dnl find Xen control stack libraries
|
||||
if test "$with_xen" = yes ; then
|
||||
AC_CHECK_HEADER(xenctrl.h,
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 9 21:04:46 UTC 2014 - tonyj@suse.com
|
||||
|
||||
- Update to version 2.0.4
|
||||
- Drop patches (mainline):
|
||||
kexec-tools-fix-makefile-binaries.patch (aaedd532)
|
||||
kexec-tools-fix-strncat.patch (d5efc524)
|
||||
kexec-tools-no-vga-output.patch (f1facd4b)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 5 08:06:01 UTC 2014 - coolo@suse.com
|
||||
|
||||
|
||||
@ -26,19 +26,16 @@ PreReq: %insserv_prereq %fillup_prereq
|
||||
Summary: Tools for fast kernel loading
|
||||
License: GPL-2.0+
|
||||
Group: System/Kernel
|
||||
Version: 2.0.3
|
||||
Version: 2.0.4
|
||||
Release: 0
|
||||
Source: ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
|
||||
Source1: kexec-bootloader
|
||||
Source2: kexec-bootloader.8.txt
|
||||
Source3: kexec.init
|
||||
Source4: %{name}-%{version}-rpmlintrc
|
||||
Patch0: %{name}-no-vga-output.patch
|
||||
Patch1: %{name}-xen-static.patch
|
||||
Patch2: %{name}-fix-strncat.patch
|
||||
Patch3: %{name}-xen-balloon-up.patch
|
||||
Patch4: %{name}-fix-makefile-binaries.patch
|
||||
Patch5: %{name}-disable-test.patch
|
||||
Patch2: %{name}-xen-balloon-up.patch
|
||||
Patch3: %{name}-disable-test.patch
|
||||
Url: ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#!BuildIgnore: fop
|
||||
@ -61,12 +58,9 @@ the loaded kernel after it panics.
|
||||
|
||||
%prep
|
||||
%setup -q -n kexec-tools-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
# disable as-needed
|
||||
|
||||
Loading…
Reference in New Issue
Block a user