From 9aac0d6e1302a2a8d18eb9d88d397ea2eff373ca Mon Sep 17 00:00:00 2001 From: "Martin, Chen" Date: Wed, 28 Nov 2018 03:06:56 +0000 Subject: [PATCH] remove libevent meta patch which disable test folder building removed patch base/libevent/files/libevent-disable-tests.patch Test: Build successfuly and deploy with 1 controller and 1 compute Both nodes enabled after deployment Task: 28040 Story: 2004203 Change-Id: I4d0e286d1398842189f196662cc0c20d8128209b --- .../spec-include-TiS-patches.patch | 6 ++--- .../files/libevent-disable-tests.patch | 26 ------------------- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 base/libevent/files/libevent-disable-tests.patch diff --git a/base/libevent/centos/meta_patches/spec-include-TiS-patches.patch b/base/libevent/centos/meta_patches/spec-include-TiS-patches.patch index 3ee7472c6..38cb9be49 100644 --- a/base/libevent/centos/meta_patches/spec-include-TiS-patches.patch +++ b/base/libevent/centos/meta_patches/spec-include-TiS-patches.patch @@ -2,21 +2,19 @@ diff --git a/SPECS/libevent.spec b/SPECS/libevent.spec index fd59ca3..9c6cc3e 100644 --- a/SPECS/libevent.spec +++ b/SPECS/libevent.spec -@@ -13,6 +13,8 @@ BuildRequires: doxygen openssl-devel +@@ -13,6 +13,7 @@ BuildRequires: doxygen openssl-devel Patch00: libevent-2.0.10-stable-configure.patch # Disable network tests Patch01: libevent-nonettests.patch +Patch02: libevent-ipv6-client-socket.patch -+Patch03: libevent-disable-tests.patch %description The libevent API provides a mechanism to execute a callback function -@@ -49,6 +51,8 @@ need to install %{name}-doc. +@@ -49,6 +50,7 @@ need to install %{name}-doc. # 477685 - libevent-devel multilib conflict %patch00 -p1 %patch01 -p1 -b .nonettests +%patch02 -p1 -+%patch03 -p1 %build %configure \ diff --git a/base/libevent/files/libevent-disable-tests.patch b/base/libevent/files/libevent-disable-tests.patch deleted file mode 100644 index c23f84ede..000000000 --- a/base/libevent/files/libevent-disable-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 42879a3..dc90359 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -126,7 +126,7 @@ else - noinst_LTLIBRARIES = $(LIBEVENT_LIBS_LA) - endif - --SUBDIRS = . include sample test -+SUBDIRS = . include sample - - if BUILD_WIN32 - -diff --git a/Makefile.in b/Makefile.in -index ac27389..aff0cf3 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -534,7 +534,7 @@ LIBEVENT_LIBS_LA = libevent.la libevent_core.la libevent_extra.la \ - @INSTALL_LIBEVENT_TRUE@lib_LTLIBRARIES = $(LIBEVENT_LIBS_LA) - @INSTALL_LIBEVENT_TRUE@pkgconfig_DATA = $(LIBEVENT_PKGCONFIG) - @INSTALL_LIBEVENT_FALSE@noinst_LTLIBRARIES = $(LIBEVENT_LIBS_LA) --SUBDIRS = . include sample test -+SUBDIRS = . include sample - @BUILD_WIN32_FALSE@SYS_LIBS = - @BUILD_WIN32_TRUE@SYS_LIBS = -lws2_32 -lshell32 -ladvapi32 - @BUILD_WIN32_FALSE@SYS_SRC = $(am__append_5) $(am__append_6) \