From bb6dd93d7a5e42143c182bcaed932894ae21f02a Mon Sep 17 00:00:00 2001 From: Bhupesh Sharma Date: Thu, 26 Jul 2018 16:03:34 +0530 Subject: [PATCH] kexec-tools.spec: Drop kexec-tools-2.0.3-disable-kexec-test.patch kexec_test seems to be no longer used upstream, so we had introduced the 'kexec-tools-2.0.3-disable-kexec-test.patch' earlier to disable the same from fedora kexec-tools as well. However an earlier patch "Remove obsolete kdump tool" now explicitly installs needed files via appropriate logic in .spec file, so we can drop this patch now to reduce the maintenance burden. Signed-off-by: Bhupesh Sharma --- kexec-tools-2.0.3-disable-kexec-test.patch | 17 ----------------- kexec-tools.spec | 2 -- 2 files changed, 19 deletions(-) delete mode 100644 kexec-tools-2.0.3-disable-kexec-test.patch diff --git a/kexec-tools-2.0.3-disable-kexec-test.patch b/kexec-tools-2.0.3-disable-kexec-test.patch deleted file mode 100644 index 6fc73f2..0000000 --- a/kexec-tools-2.0.3-disable-kexec-test.patch +++ /dev/null @@ -1,17 +0,0 @@ -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.spec b/kexec-tools.spec index 9468ab1..857fad9 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -87,7 +87,6 @@ Obsoletes: diskdumputils netdump kexec-tools-eppic # # Patches 601 onward are generic patches # -Patch601: kexec-tools-2.0.3-disable-kexec-test.patch Patch604: kexec-tools-2.0.16-koji-build-fail-workaround.patch %description @@ -111,7 +110,6 @@ tar -z -x -v -f %{SOURCE9} tar -z -x -v -f %{SOURCE19} tar -z -x -v -f %{SOURCE23} -%patch601 -p1 %patch604 -p1 %ifarch ppc