Internal restructuring of stx-integ
Create new directories:
ceph
config
config-files
filesystem
kernel
kernel/kernel-modules
ldap
logging
strorage-drivers
tools
utilities
virt
Retire directories:
connectivity
core
devtools
support
extended
Delete two packages:
tgt
irqbalance
Relocated packages:
base/
dhcp
initscripts
libevent
lighttpd
linuxptp
memcached
net-snmp
novnc
ntp
openssh
pam
procps
sanlock
shadow
sudo
systemd
util-linux
vim
watchdog
ceph/
python-cephclient
config/
facter
puppet-4.8.2
puppet-modules
filesystem/
e2fsprogs
nfs-utils
nfscheck
kernel/
kernel-std
kernel-rt
kernel/kernel-modules/
mlnx-ofa_kernel
ldap/
nss-pam-ldapd
openldap
logging/
syslog-ng
logrotate
networking/
lldpd
iproute
mellanox
python-ryu
mlx4-config
python/
python-2.7.5
python-django
python-gunicorn
python-setuptools
python-smartpm
python-voluptuous
security/
shim-signed
shim-unsigned
tboot
strorage-drivers/
python-3parclient
python-lefthandclient
virt/
cloud-init
libvirt
libvirt-python
qemu
tools/
storage-topology
vm-topology
utilities/
tis-extensions
namespace-utils
nova-utils
update-motd
Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
7
base/libevent/.gitignore
vendored
Normal file
7
base/libevent/.gitignore
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
!.distro
|
||||
.distro/centos7/rpmbuild/RPMS
|
||||
.distro/centos7/rpmbuild/SRPMS
|
||||
.distro/centos7/rpmbuild/BUILD
|
||||
.distro/centos7/rpmbuild/BUILDROOT
|
||||
.distro/centos7/rpmbuild/SOURCES/libevent*tar.gz
|
||||
.distro/centos7/rpmbuild/SOURCES/*.patch
|
||||
19
base/libevent/PKG-INFO
Normal file
19
base/libevent/PKG-INFO
Normal file
@@ -0,0 +1,19 @@
|
||||
Metadata-Version: 1.1
|
||||
Name: libevent
|
||||
Version: 2.0.21
|
||||
Summary: Abstract asynchronous event notification library
|
||||
Home-page:
|
||||
Author:
|
||||
Author-email:
|
||||
License: BSD
|
||||
|
||||
Description:
|
||||
The libevent API provides a mechanism to execute a callback function
|
||||
when a specific event occurs on a file descriptor or after a timeout
|
||||
has been reached. libevent is meant to replace the asynchronous event
|
||||
loop found in event driven network servers. An application just needs
|
||||
to call event_dispatch() and can then add or remove events dynamically
|
||||
without having to change the event loop.
|
||||
|
||||
|
||||
Platform: UNKNOWN
|
||||
2
base/libevent/centos/build_srpm.data
Normal file
2
base/libevent/centos/build_srpm.data
Normal file
@@ -0,0 +1,2 @@
|
||||
COPY_LIST="files/*"
|
||||
TIS_PATCH_VER=2
|
||||
@@ -0,0 +1,24 @@
|
||||
From d63b56b8511b808a4c23c4c15ed81e368f9b020c Mon Sep 17 00:00:00 2001
|
||||
From: Don Penney <don.penney@windriver.com>
|
||||
Date: Tue, 27 Sep 2016 10:59:20 -0400
|
||||
Subject: [PATCH] Update package versioning for TIS format
|
||||
|
||||
---
|
||||
SPECS/libevent.spec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/libevent.spec b/SPECS/libevent.spec
|
||||
index 9c6cc3e..7d98b8f 100644
|
||||
--- a/SPECS/libevent.spec
|
||||
+++ b/SPECS/libevent.spec
|
||||
@@ -1,6 +1,6 @@
|
||||
Name: libevent
|
||||
Version: 2.0.21
|
||||
-Release: 4%{?dist}
|
||||
+Release: 4.el7%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Abstract asynchronous event notification library
|
||||
|
||||
Group: System Environment/Libraries
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
2
base/libevent/centos/meta_patches/PATCH_ORDER
Normal file
2
base/libevent/centos/meta_patches/PATCH_ORDER
Normal file
@@ -0,0 +1,2 @@
|
||||
spec-include-TiS-patches.patch
|
||||
0001-Update-package-versioning-for-TIS-format.patch
|
||||
@@ -0,0 +1,22 @@
|
||||
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
|
||||
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.
|
||||
# 477685 - libevent-devel multilib conflict
|
||||
%patch00 -p1
|
||||
%patch01 -p1 -b .nonettests
|
||||
+%patch02 -p1
|
||||
+%patch03 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
1
base/libevent/centos/srpm_path
Normal file
1
base/libevent/centos/srpm_path
Normal file
@@ -0,0 +1 @@
|
||||
mirror:Source/libevent-2.0.21-4.el7.src.rpm
|
||||
26
base/libevent/files/libevent-disable-tests.patch
Normal file
26
base/libevent/files/libevent-disable-tests.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
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) \
|
||||
55
base/libevent/files/libevent-ipv6-client-socket.patch
Normal file
55
base/libevent/files/libevent-ipv6-client-socket.patch
Normal file
@@ -0,0 +1,55 @@
|
||||
---
|
||||
http.c | 25 ++++++++++++++++++-------
|
||||
1 file changed, 18 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/http.c
|
||||
+++ b/http.c
|
||||
@@ -1325,6 +1325,9 @@ evhttp_error_cb(struct bufferevent *bufe
|
||||
struct evhttp_connection *evcon = arg;
|
||||
struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
|
||||
|
||||
+ if (evcon->fd == -1)
|
||||
+ evcon->fd = bufferevent_getfd(bufev);
|
||||
+
|
||||
switch (evcon->state) {
|
||||
case EVCON_CONNECTING:
|
||||
if (what & BEV_EVENT_TIMEOUT) {
|
||||
@@ -1390,6 +1393,9 @@ evhttp_connection_cb(struct bufferevent
|
||||
int error;
|
||||
ev_socklen_t errsz = sizeof(error);
|
||||
|
||||
+ if (evcon->fd == -1)
|
||||
+ evcon->fd = bufferevent_getfd(bufev);
|
||||
+
|
||||
if (!(what & BEV_EVENT_CONNECTED)) {
|
||||
/* some operating systems return ECONNREFUSED immediately
|
||||
* when connecting to a local address. the cleanup is going
|
||||
@@ -2189,16 +2195,21 @@ evhttp_connection_connect(struct evhttp_
|
||||
EVUTIL_ASSERT(!(evcon->flags & EVHTTP_CON_INCOMING));
|
||||
evcon->flags |= EVHTTP_CON_OUTGOING;
|
||||
|
||||
- evcon->fd = bind_socket(
|
||||
- evcon->bind_address, evcon->bind_port, 0 /*reuse*/);
|
||||
- if (evcon->fd == -1) {
|
||||
- event_debug(("%s: failed to bind to \"%s\"",
|
||||
- __func__, evcon->bind_address));
|
||||
- return (-1);
|
||||
+ if (evcon->bind_address || evcon->bind_port) {
|
||||
+ evcon->fd = bind_socket(
|
||||
+ evcon->bind_address, evcon->bind_port, 0 /*reuse*/);
|
||||
+ if (evcon->fd == -1) {
|
||||
+ event_debug(("%s: failed to bind to \"%s\"",
|
||||
+ __func__, evcon->bind_address));
|
||||
+ return (-1);
|
||||
+ }
|
||||
+
|
||||
+ bufferevent_setfd(evcon->bufev, evcon->fd);
|
||||
+ } else {
|
||||
+ bufferevent_setfd(evcon->bufev, -1);
|
||||
}
|
||||
|
||||
/* Set up a callback for successful connection setup */
|
||||
- bufferevent_setfd(evcon->bufev, evcon->fd);
|
||||
bufferevent_setcb(evcon->bufev,
|
||||
NULL /* evhttp_read_cb */,
|
||||
NULL /* evhttp_write_cb */,
|
||||
Reference in New Issue
Block a user