pool/kexec-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 76009 from Kernel:kdump

Browse Source 
fix build on ppc (forwarded request 76008 from msmeissn)

OBS-URL: https://build.opensuse.org/request/show/76009
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kexec-tools?expand=0&rev=82
This commit is contained in:
Sascha Peilicke 2011-07-11 08:36:11 +00:00 committed by Git OBS Bridge
commit 4e20e7ac72
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kexec-fix-strncat.patch Normal file
View File

@ -0,0 +1,24 @@
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",

5
kexec-tools.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Jul 10 23:48:14 CEST 2011 - meissner@suse.de
- fixed strncat sizse argument on ppc
-------------------------------------------------------------------
Tue May 17 11:12:54 CEST 2011 - jslaby@suse.de

2
kexec-tools.spec
View File

@ -38,6 +38,7 @@ Source4: %{name}-%{version}-rpmlintrc
Patch0: %{name}-no-vga-output.diff
Patch1: %{name}-xen-static.diff
Patch2: gcc-no-undefined-flag-fix.patch
Patch3: kexec-fix-strncat.patch
Url: ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!BuildIgnore: fop
@ -72,6 +73,7 @@ Authors:
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
# disable as-needed