rpm/kexec-tools
SHA256
1
0
Fork 0
forked from pool/kexec-tools
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2008-10-09 17:20:27 +00:00 committed by Git OBS Bridge
parent c50239f780
commit 8c2ff91cbc
3 changed files with 197 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
kexec-tools-device-tree-return.diff Normal file
View File

@ -0,0 +1,41 @@
From 344883869c1e7e7dd873e920a709950ce0546140 Mon Sep 17 00:00:00 2001
From: Bernhard Walle <bwalle@suse.de>
Date: Thu, 9 Oct 2008 18:58:12 +0200
Subject: [PATCH] Use return value of count_dyn_reconf_memory_ranges()
This patch fixes the build error
kexec/arch/ppc64/kexec-ppc64.c:140: \
warning: control reaches end of non-void function
The patch returns 0 on success, and checks when the function is called
for a non-zero value.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
---
kexec/arch/ppc64/kexec-ppc64.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/kexec/arch/ppc64/kexec-ppc64.c
+++ b/kexec/arch/ppc64/kexec-ppc64.c
@@ -137,6 +137,8 @@ static int count_dyn_reconf_memory_range
num_of_lmbs = ((unsigned int *)buf)[0];
max_memory_ranges += num_of_lmbs;
fclose(file);
+
+ return 0;
}
/*
@@ -158,7 +160,8 @@ static int count_memory_ranges(void)
while ((dentry = readdir(dir)) != NULL) {
if (!strncmp(dentry->d_name,
"ibm,dynamic-reconfiguration-memory", 35)){
- count_dyn_reconf_memory_ranges();
+ if (count_dyn_reconf_memory_ranges() != 0)
+ return -1;
continue;
}

5
kexec-tools.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 09 19:00:04 CEST 2008 - bwalle@suse.de
- PPC64: Use return value of count_dyn_reconf_memory_ranges().
-------------------------------------------------------------------
Thu Oct 09 18:39:45 CEST 2008 - bwalle@suse.de

159
kexec-tools.spec
View File

@ -1,15 +1,23 @@
#
# spec file for package kexec-tools (Version 1.101)
# spec file for package kexec-tools (Version 2.0.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: kexec-tools
%ifarch ppc
BuildRequires: gcc-64bit glibc-devel-64bit
@ -21,7 +29,7 @@ PreReq: %insserv_prereq %fillup_prereq
AutoReqProv: on
Summary: Tools for fast kernel loading
Version: 2.0.0
Release: 0
Release: 39
Source: %{name}-%{version}.tar.bz2
Source1: kexec-bootloader
Source2: kexec-bootloader.8.txt
@ -35,7 +43,8 @@ Patch5: %{name}-ia64-kdump-PT_LOAD-order.diff
Patch6: %{name}-crash-memory-ranges-drconf.diff
Patch7: %{name}-add-usable-drconf-memory-node-to-device-tree.diff
Patch8: %{name}-get-details-dynamic-reconfiguration-memory-node.diff
Url: http://www.vergenet.net/linux/kexec/kexec-tools/
Patch9: %{name}-device-tree-return.diff
Url: http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: zlib-devel
%if 0%{?suse_version} >= 1110
@ -70,6 +79,7 @@ Authors:
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
%{?suse_update_config -f}
@ -108,12 +118,11 @@ install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
%if 0%{?suse_version} >= 1110
%post
%{fillup_and_insserv -n kexec kexec}
%endif
#
#%preun
@ -137,6 +146,140 @@ install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec
%endif
%changelog
* Thu Oct 09 2008 bwalle@suse.de
- PPC64: Use return value of count_dyn_reconf_memory_ranges().
* Thu Oct 09 2008 bwalle@suse.de
- Fix empty /proc/vmcore on PPC64 (bnc#431492).
o kexec/kdump: read crash memory ranges from drconf memory.
o kexec/kdump: add a new linux, usable-drconf-memory node to the
device tree.
o kexec/kdump: get details of ibm, dynamic-reconfiguration-memory
node of device tree.
* Thu Oct 09 2008 bwalle@suse.de
- Add newline in error message of "kexec-bootloader".
- Add error handling when Bootloader::Tools::GetDefaultSection()
fails.
* Wed Oct 08 2008 bwalle@suse.de
- IA64: Order of operations bug in PT_LOAD segment reader.
* Wed Oct 08 2008 bwalle@suse.de
- ia64: Do not include uncached memory to vmcore.
- ia64: Make PA() work for both physical identity-mapped virtual
addresses.
- PPC64: Let kexec work on IBM QS2x blade servers
- Fix build warnings.
* Mon Oct 06 2008 bwalle@suse.de
- Implement -h (help) option (bnc#432386).
- Remove documentation of -o (options) option that never existed.
* Wed Aug 27 2008 bwalle@suse.de
- only install and build /etc/init.d/kexec with openSUSE 11.1 /
SLES 11 and later
* Sat Aug 16 2008 bwalle@suse.de
- mark /etc/init.d/kexec as %%config
- remove (empty) %%preun
* Fri Aug 15 2008 bwalle@suse.de
- add /etc/init.d/kexec to be able to reboot with kexec(8)
(FATE#302238)
* Sat Jul 19 2008 bwalle@suse.de
- update to kexec-tools 2.0.0 (final)
o Allow BUILD_CFLAGS and TARGET_CFLAGS to be specified at
configure time
* Mon Jul 14 2008 bwalle@suse.de
- update to kexec-tools 2.0.0-rc1
o implement support for /sys/firmware/memmap interface
o Allow 32 bit kexec binary to boot kdump kernel on ppc64
architecture
o kexec/crashdump.c: remove file descriptor leaks; make
kdump_info argument to get_vmcoreinfo() const
o Fix implicit declaration of inb/outb
o EDD implementation
o Specify the arch on kexec_unload
o Update KEXEC_ARCH_* constants from Linux kernel headers
o lots of code cleanup
o Add --reuse-cmdline
o documentation update (manpage, boot protocol)
o ensure that extra rtas segment is a multiple of PAGE_SIZE
o Allow building for ppc32 platforms
o Die on early EOF in slurp_file, instead of infinite-looping
o Fix copy-paste bug: entry16 does not start at entry16_debug
o Fix undefined symbol errors on readw/writew: arch/io.h, not
sys/io.h
o extract vmcoreinfo from /proc/vmcore for Xen
o Give installed files user-writable permission
o Use separate CPPFLAGS and LDFLAGS for purgatory
- dropped kexec-tools-fix-arch-on-unload: merged upstream
- dropped kexec-tools-edd-fix: merged upstream
- dropped kexec-tools-refactor-architecture-detection: merged
upstram
- dropped kexec-tools.gcc-bug.patch: merged upstream
- dropped kexec-tools.ppc32-64bit-purgatory.patch: merged upstream
- kexec-tools-edd-support: merged upstream
- kexec-tools-32bit-kexec-with-64bit-ppc64.patch: merged upstream
- removed README.SUSE: information not necessary any more
* Thu Jul 03 2008 bwalle@suse.de
- fix 32 bit kexec to boot on 64 bit ppc64 (bnc#405015)
* Tue May 27 2008 bwalle@suse.de
- fix EDD support when the BIOS-reported length is smaller than
the sysfs raw_data size (bnc#388754)
* Mon May 26 2008 bwalle@suse.de
- fix kexec unload (rckdump stop) on ppc64 (bnc#394216)
* Tue May 13 2008 bwalle@suse.de
- implement EDD (bnc#383210)
* Tue Mar 25 2008 bwalle@suse.de
- update to kexec-tools-testing v20080324
o tarball update (version), no functional changes between
v20080318-rc and v20080324
* Tue Mar 18 2008 bwalle@suse.de
- update to kexec-tools-testing v20080318-rc
o ia64 kern_vaddr_start was calculated incorrectly
o ia64: make load_crashdump_segments 80col wide
o fix i386 EFI boot using efifb
o mipsel: mipsel port
o fix kexec-tools on x86_64 (see bnc#368138)
o fix valid_memory_range region merging
o arm: invalid initialisation of iomem in get_memory_ranges()
o arm: use proc_iomem()
o no machine machine to proc_iomem()
* Fri Mar 14 2008 bwalle@suse.de
- update to kexec-tools-testing v20080227-git
(current git snapshot, fixes x86_64, bnc#368138)
- kexec-tools-portability-issue deleted: mainline
* Wed Feb 27 2008 bwalle@suse.de
- update to kexec-tools-testing v20080227
(only increased version number)
* Tue Feb 26 2008 bwalle@suse.de
- update to kexec-tools-testing v20080226-rc
o build: include configure and include/config.h.in in dist
tarball
- adjusted kexec-tools-portability-issue to build without warnings
on 32 bit systems
* Thu Feb 21 2008 bwalle@suse.de
- update to kexec-tools-testing v20080221-rc
o Only include needed files in distribution tarball
o Clean up whitespace in include/x86/x86-linux.h
o Kexec command line length
- removed kexec-longer-cmdline.diff: fixed mainline differently
* Wed Feb 20 2008 bwalle@suse.de
- update to kexec-tools-testing v20080219-rc
o Fix the feature determining ELF32/ELF64 automatically
o Enable building a 32 bit binary for ppc64 platforms.
o Consolidate BOOTLOADER defines
o Use config.h for defines
o Add gamecube to config.h defines
o removed partially duplicated system headers
o Use general _SRCS and _OBJS, rather and _C_{SRCS, OBJS} and
_S_{SRCS, OBJS}
o build system fixes
o Add documentation on creating include/config.h.in to INSTALL
o Log unknown reloc name instead of its number
o Use zlib if present
o kexec buffer overflow on ppc platform
o sh: Remove hardcoded PAGE_SIZE in NetBSD loader
o Add ARM support to kexec
o Remove some extraneous whitespace
o kexec: Use target linker for purgatory
- removed kexec-tools-elf32-elf64-fix: mainline
- removed kexec-tools.ppc64-32bit-build.patch: mainline
- removed kexec-tools.fread-buffer-overflow.patch: mainline
* Wed Jan 30 2008 sassmann@suse.de
- fix fread buffer overflow on ppc
* Tue Jan 22 2008 ro@suse.de
@ -165,7 +308,7 @@ install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec
package
* Wed Aug 29 2007 bwalle@suse.de
- add reset_devices kernel parameter as default
* Sat Aug 25 2007 olh@suse.de
* Sun Aug 26 2007 olh@suse.de
- do not require kdump-helpers on s390
* Fri Jul 27 2007 bwalle@suse.de
- update documentation for deleting all dumps (#302257)