diff --git a/.gitignore b/.gitignore index 91751eb..93271a9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ makedumpfile-1.3.5.tar.gz /kexec-tools-2.0.2.tar.bz2 /kexec-tools-2.0.3.tar.bz2 /makedumpfile-1.4.1.tar.gz +/makedumpfile-1.4.2.tar.gz diff --git a/kexec-tools-2.0.3-makedumpfile-dynamic-build.patch b/kexec-tools-2.0.3-makedumpfile-dynamic-build.patch deleted file mode 100644 index 466eabe..0000000 --- a/kexec-tools-2.0.3-makedumpfile-dynamic-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kexec-tools-2.0.3/makedumpfile-1.4.1/Makefile.orig 2009-11-11 08:44:51.000000000 +0800 -+++ kexec-tools-2.0.3/makedumpfile-1.4.1/Makefile 2010-05-30 00:25:17.350869858 +0800 -@@ -38,7 +38,7 @@ $(OBJ_ARCH): $(SRC_ARCH) - $(CC) $(CFLAGS_ARCH) -c -o ./$@ ./$(@:.o=.c) - - makedumpfile: $(SRC) $(OBJ_PART) $(OBJ_ARCH) -- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -o $@ $< -static -ldw -lbz2 -lebl -ldl -lelf -lz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -o $@ $< -ldw -lbz2 -lebl -ldl -lelf -lz - echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 - grep -v "^.TH MAKEDUMPFILE 8" makedumpfile.8 >> temp.8 - mv temp.8 makedumpfile.8 diff --git a/kexec-tools.spec b/kexec-tools.spec index a0b50fb..6937cf1 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools Version: 2.0.3 -Release: 37%{?dist} +Release: 38%{?dist} License: GPLv2 Group: Applications/System Summary: The kexec/kdump userspace component. @@ -13,7 +13,7 @@ Source5: kdump.sysconfig.ppc64 Source6: kdump.sysconfig.ia64 Source7: mkdumprd Source8: kdump.conf -Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.4.1/makedumpfile-1.4.1.tar.gz +Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.4.2/makedumpfile-1.4.2.tar.gz Source10: kexec-kdump-howto.txt Source11: firstboot_kdump.py Source12: mkdumprd.8 @@ -71,8 +71,7 @@ Obsoletes: diskdumputils netdump # # Patches 601 onward are generic patches # -Patch601: kexec-tools-2.0.3-makedumpfile-dynamic-build.patch -Patch602: kexec-tools-2.0.3-disable-kexec-test.patch +Patch601: kexec-tools-2.0.3-disable-kexec-test.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -89,7 +88,6 @@ tar -z -x -v -f %{SOURCE9} %patch601 -p1 -%patch602 -p1 tar -z -x -v -f %{SOURCE13} @@ -119,7 +117,7 @@ cp %{SOURCE10} . make %ifarch %{ix86} x86_64 ia64 ppc64 -make -C makedumpfile-1.4.1 +make -C makedumpfile-1.4.2 LINKTYPE=dynamic %endif make -C kexec-tools-po @@ -152,8 +150,8 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_mandir}/man5/kdump.conf.5 install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_unitdir}/kdump.service %ifarch %{ix86} x86_64 ia64 ppc64 -install -m 755 makedumpfile-1.4.1/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile -install -m 644 makedumpfile-1.4.1/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz +install -m 755 makedumpfile-1.4.2/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile +install -m 644 makedumpfile-1.4.2/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz %endif make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} @@ -289,6 +287,9 @@ done %changelog +* Fri Jan 27 2012 Cong Wang - 2.0.2-38 +- Pull the latest makedumpfile release, 1.4.2. + * Fri Jan 27 2012 Cong Wang - 2.0.2-37 - Add initial NFS dump support, experimental. diff --git a/sources b/sources index 85cddf6..73a18e7 100644 --- a/sources +++ b/sources @@ -1,7 +1,4 @@ -d9f2ecd3c3307905f24130a25816e6cc kexec-tools-2.0.0.tar.bz2 3e802d638dce0080b910f15908c04a24 kexec-tools-po.tar.gz -e3a813bd6d7dace903a05c1296e20d57 makedumpfile-1.3.5.tar.gz -8e359dd03731b93a2082bd37cc2a4a4c kexec-tools-2.0.2.tar.bz2 b3ced2097ce3981abba38ceedc84f939 kexec-tools-2.0.3.tar.bz2 -967f89bb947ca4db78f51beeaaee0bd8 makedumpfile-1.4.1.tar.gz 2132832b58a209c05192d5783031c79d dracut-files.tbz2 +a98917a8dab5e590549bff9fe7b3a5c2 makedumpfile-1.4.2.tar.gz