From 8e0b475887cec6e3a47e37a53a0ee576c339cf1a Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Sat, 21 Jan 2012 16:56:07 +0800 Subject: [PATCH] Disable kexec_test --- kexec-tools-2.0.3-disable-kexec-test.patch | 17 +++++++++++++++++ ...tools-2.0.3-makedumpfile-dynamic-build.patch | 4 ++-- kexec-tools.spec | 4 +++- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 kexec-tools-2.0.3-disable-kexec-test.patch rename kexec-tools-2.0.0-makedumpfile-dynamic-build.patch => kexec-tools-2.0.3-makedumpfile-dynamic-build.patch (82%) diff --git a/kexec-tools-2.0.3-disable-kexec-test.patch b/kexec-tools-2.0.3-disable-kexec-test.patch new file mode 100644 index 0000000..6fc73f2 --- /dev/null +++ b/kexec-tools-2.0.3-disable-kexec-test.patch @@ -0,0 +1,17 @@ +diff --git kexec-tools-2.0.3/kexec_test/Makefile kexec-tools-2.0.3/kexec_test/Makefile +index fec6210..2ed4d51 100644 +--- kexec-tools-2.0.3/kexec_test/Makefile ++++ kexec-tools-2.0.3/kexec_test/Makefile +@@ -8,12 +8,6 @@ dist += kexec_test/Makefile $(KEXEC_TEST_SRCS) \ + kexec_test/x86-setup-legacy-pic.S + + BUILD_KEXEC_TEST = no +-ifeq ($(ARCH),i386) +-BUILD_KEXEC_TEST = yes +-endif +-ifeq ($(ARCH),x86_64) +-BUILD_KEXEC_TEST = yes +-endif + + ifeq ($(BUILD_KEXEC_TEST),yes) + diff --git a/kexec-tools-2.0.0-makedumpfile-dynamic-build.patch b/kexec-tools-2.0.3-makedumpfile-dynamic-build.patch similarity index 82% rename from kexec-tools-2.0.0-makedumpfile-dynamic-build.patch rename to kexec-tools-2.0.3-makedumpfile-dynamic-build.patch index 727449e..466eabe 100644 --- a/kexec-tools-2.0.0-makedumpfile-dynamic-build.patch +++ b/kexec-tools-2.0.3-makedumpfile-dynamic-build.patch @@ -1,5 +1,5 @@ ---- kexec-tools-2.0.1/makedumpfile-1.4.1/Makefile.orig 2009-11-11 08:44:51.000000000 +0800 -+++ kexec-tools-2.0.1/makedumpfile-1.4.1/Makefile 2010-05-30 00:25:17.350869858 +0800 +--- 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) diff --git a/kexec-tools.spec b/kexec-tools.spec index e092314..b3142d9 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -71,7 +71,8 @@ Obsoletes: diskdumputils netdump # # Patches 601 onward are generic patches # -Patch601: kexec-tools-2.0.0-makedumpfile-dynamic-build.patch +Patch601: kexec-tools-2.0.3-makedumpfile-dynamic-build.patch +Patch602: kexec-tools-2.0.3-disable-kexec-test.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -88,6 +89,7 @@ tar -z -x -v -f %{SOURCE9} %patch601 -p1 +%patch602 -p1 tar -z -x -v -f %{SOURCE13}