From 5eb6be0c3bf1739e688194cf68a7f4a5d1f9e89e118c9a5b7bec66088b2e8d68 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 28 Aug 2008 00:05:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kexec-tools?expand=0&rev=53 --- kexec-tools.changes | 10 ++++++++-- kexec-tools.spec | 29 +++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/kexec-tools.changes b/kexec-tools.changes index 2c05005..3bedfdc 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 27 11:59:55 CEST 2008 - bwalle@suse.de + +- only install and build /etc/init.d/kexec with openSUSE 11.1 / + SLES 11 and later + ------------------------------------------------------------------- Sat Aug 16 11:04:55 CEST 2008 - bwalle@suse.de @@ -24,8 +30,8 @@ Mon Jul 14 17:32:17 CEST 2008 - bwalle@suse.de 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 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 diff --git a/kexec-tools.spec b/kexec-tools.spec index 4a87761..2de9a86 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -29,14 +29,17 @@ PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Tools for fast kernel loading Version: 2.0.0 -Release: 14 +Release: 24 Source: %{name}-%{version}.tar.bz2 Source1: kexec-bootloader Source2: kexec-bootloader.8.txt Source3: kexec.init Url: http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: asciidoc zlib-devel +BuildRequires: zlib-devel +%if 0%{?suse_version} >= 1110 +BuildRequires: asciidoc +%endif %description Kexec is a user space utility for loading another kernel and asking the @@ -77,41 +80,55 @@ make cp %{S:1} . cp %{S:2} . cp %{S:3} . +%if 0%{?suse_version} >= 1110 a2x -d manpage -f manpage kexec-bootloader.8.txt +%endif %install make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install -c -m 0644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8 +%if 0%{?suse_version} >= 1110 install -c -m 0644 kexec-bootloader.8 $RPM_BUILD_ROOT%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT%{_sbindir} install -m 0755 kexec-bootloader $RPM_BUILD_ROOT%{_sbindir} mkdir -p ${RPM_BUILD_ROOT}/etc/init.d install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec +%endif %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%if 0%{?suse_version} >= 1110 %post %{fillup_and_insserv -n kexec kexec} -# %preun -# no stop on removal because the "rckexec stop" actually loads kernel +%endif +# +#%preun %postun +%if 0%{?suse_version} >= 1110 %insserv_cleanup +%endif %files %defattr(-, root, root) %doc AUTHORS COPYING News TODO doc %doc %{_mandir}/man*/* /sbin/* +%if 0%{?suse_version} >= 1110 %{_sbindir}/kexec-bootloader +/etc/init.d/kexec %config /etc/init.d/kexec +%endif %ifarch %ix86 x86_64 /%_lib/kexec-tools* %endif %changelog +* 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 @@ -127,8 +144,8 @@ install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec 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 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