Browse code

Revert "Envoy dependencies - backward-cpp, http-parser, lightstep-tracer, spdlog, protobuf3. Update mesos."

This reverts commit def94a14a72de993ce3ad65ff8dd2eb2f315a7fe.

Change-Id: I27107c73ab3783ff07a3ca9b55aa1738d8be0925
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3091
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>

Vinay Kulkarni authored on 2017/06/29 07:40:55
Showing 7 changed files
1 1
deleted file mode 100644
... ...
@@ -1,42 +0,0 @@
1
-Summary:        Pretty stack trace printer for C++.
2
-Name:           backward-cpp
3
-Version:        1.3
4
-Release:        1%{?dist}
5
-License:        MIT
6
-URL:            https://github.com/bombela/backward-cpp
7
-Source0:        %{name}-v%{version}.tar.gz
8
-%define sha1    backward-cpp=c5e2672604bbe231bf489ce20369af095fe13fdf
9
-Group:          Development/Tools
10
-Vendor:         VMware, Inc.
11
-Distribution:   Photon
12
-BuildRequires:  automake
13
-BuildRequires:  autoconf
14
-BuildRequires:  cmake
15
-BuildRequires:  gcc
16
-
17
-%description
18
-Backward is a beautiful stack trace pretty printer for C++.
19
-
20
-%prep
21
-%setup -q
22
-
23
-%build
24
-mkdir -p build
25
-cd build
26
-cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DBUILD_SHARED_LIBS=ON ..
27
-make %{?_smp_mflags}
28
-
29
-%install
30
-cd build
31
-make DESTDIR=%{buildroot} install
32
-install -vm644 libbackward.so %{buildroot}%{_libdir}/
33
-
34
-%files
35
-%defattr(-,root,root)
36
-%{_includedir}/backward.hpp
37
-%{_libdir}/backward/BackwardConfig.cmake
38
-%{_libdir}/libbackward.so
39
-
40
-%changelog
41
-*    Tue Jun 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.3-1
42
--    Initial version of backward-cpp package for Photon.
43 1
deleted file mode 100644
... ...
@@ -1,45 +0,0 @@
1
-Summary:	C based http parser for high performance applications.
2
-Name:		http-parser
3
-Version:	2.7.1
4
-Release:	1%{?dist}
5
-License:	MIT
6
-URL:		https://github.com/nodejs/http-parser
7
-Source0:	%{name}-v%{version}.tar.gz
8
-%define sha1    http-parser=e122b1178ec5c9920186cc8293aca9eca7584b12
9
-Group:		Development/Tools
10
-Vendor:		VMware, Inc.
11
-Distribution: 	Photon
12
-BuildRequires:  gcc
13
-
14
-%description
15
-This is a parser for HTTP messages written in C. It parses both requests and responses. The parser is designed to be used in performance HTTP applications. It does not make any syscalls nor allocations, it does not buffer data, it can be interrupted at anytime.
16
-
17
-%package devel
18
-Summary:        http-parser devel
19
-Group:          Development/Tools
20
-Requires:       %{name} = %{version}
21
-%description devel
22
-This contains development tools and libraries for http-parser.
23
-
24
-%prep
25
-%setup -q
26
-sed -i 's/ln -s \$(LIBDIR)\/\$(SONAME) \$(LIBDIR)\/libhttp_parser.\$(SOEXT)/pushd \$(LIBDIR) \&\& ln -s  \$(SONAME)  libhttp_parser.\$(SOEXT) \&\& popd/g' Makefile
27
-
28
-%build
29
-make PREFIX=%{_prefix} %{?_smp_mflags}
30
-
31
-%install
32
-make PREFIX="%{buildroot}%{_prefix}" DESTDIR="%{buildroot}" install
33
-
34
-%files
35
-%defattr(-,root,root)
36
-%{_libdir}/libhttp_parser.so.*
37
-
38
-%files devel
39
-%defattr(-,root,root)
40
-%{_includedir}/http_parser.h
41
-%{_libdir}/libhttp_parser.so
42
-
43
-%changelog
44
-*    Fri Jun 09 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.7.1-1
45
--    Initial version of http-parser package for Photon.
46 1
deleted file mode 100644
... ...
@@ -1,48 +0,0 @@
1
-Summary:        LightStep distributed tracing library for C++
2
-Name:           lightstep-tracer-cpp
3
-Version:        0.19
4
-Release:        1%{?dist}
5
-License:        MIT
6
-URL:            https://github.com/lightstep/lightstep-tracer-cpp
7
-Source0:        https://github.com/lightstep/lightstep-tracer-cpp/releases/download/v0_19/%{name}-%{version}.tar.gz
8
-%define sha1    lightstep-tracer-cpp=ed536c8954ad7a47d9023b9bff8070361b44d06d
9
-Group:          Development/Tools
10
-Vendor:         VMware, Inc.
11
-Distribution:   Photon
12
-BuildRequires:  autoconf
13
-BuildRequires:  automake
14
-BuildRequires:  clang
15
-BuildRequires:  c-ares
16
-BuildRequires:  c-ares-devel
17
-BuildRequires:  gcc
18
-BuildRequires:  protobuf
19
-BuildRequires:  protobuf-devel
20
-Requires:       protobuf
21
-
22
-%description
23
-LightStep distributed tracing library for C++.
24
-
25
-%prep
26
-%setup -q
27
-
28
-%build
29
-./configure                     \
30
-        --disable-silent-rules  \
31
-        --prefix=%{_prefix}     \
32
-        --disable-static        \
33
-        --enable-shared         \
34
-        --disable-grpc
35
-
36
-%install
37
-make DESTDIR=%{buildroot} install
38
-find %{buildroot} -name '*.la' -delete
39
-
40
-%files
41
-%defattr(-,root,root)
42
-%{_includedir}/lightstep/*.h
43
-%{_includedir}/mapbox_variant/*.hpp
44
-%{_libdir}/liblightstep_*
45
-
46
-%changelog
47
-*    Wed Jun 14 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.19-1
48
--    Initial version of lightstep-tracer-cpp package for Photon.
49 1
deleted file mode 100644
... ...
@@ -1,22 +0,0 @@
1
-diff -Naur mesos-1.1.0.orig/src/linux/fs.cpp mesos-1.1.0/src/linux/fs.cpp
2
-+++ mesos-1.1.0/src/linux/fs.cpp	2017-03-24 23:17:15.332465310 -0700
3
-@@ -17,6 +17,7 @@
4
- #include <errno.h>
5
- #include <stdio.h>
6
- #include <string.h>
7
-+#include <sys/sysmacros.h>
8
- 
9
- #include <linux/limits.h>
10
- #include <linux/unistd.h>
11
-diff -Naur mesos-1.1.0.orig/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp mesos-1.1.0/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
12
-+++ mesos-1.1.0/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp	2017-03-25 00:12:23.657869169 -0700
13
-@@ -15,6 +15,7 @@
14
- // limitations under the License.
15
- 
16
- #include <stdint.h>
17
-+#include <sys/sysmacros.h>
18
- 
19
- #include <algorithm>
20
- #include <list>
... ...
@@ -1,17 +1,14 @@
1
-%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
2
-
3 1
 Summary:	Mesos
4 2
 Name:		mesos
5
-Version:	1.2.0
6
-Release:	1%{?dist}
3
+Version:	0.28.2
4
+Release:	3%{?dist}
7 5
 License:	Apache
8 6
 URL:		http://mesos.apache.org
9 7
 Group:		Applications/System
10 8
 Vendor:		VMware, Inc.
11 9
 Distribution: 	Photon
12 10
 Source0:	http://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
13
-%define sha1 mesos=1d570504498c90697b690e3b221feba63d0a800b
14
-Patch0:         mesos-sysmacros.patch
11
+%define sha1 mesos=a8675ef59b4c34d4337553215a5295eebf2e4265
15 12
 BuildRequires:	openjre >= %{JAVA_VERSION}
16 13
 BuildRequires:  openjdk >= %{JAVA_VERSION}
17 14
 BuildRequires:	curl
... ...
@@ -56,11 +53,10 @@ Requires:	%{name} = %{version}
56 56
 
57 57
 %prep
58 58
 %setup -q
59
-%patch0 -p1
60 59
 
61 60
 %build
62
-sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/Makefile.am
63
-sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/libprocess/3rdparty/Makefile.am
61
+sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/Makefile.in
62
+sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/libprocess/3rdparty/Makefile.in
64 63
 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
65 64
 ./configure \
66 65
 	CFLAGS="%{optflags} -Wno-deprecated-declarations"  \
... ...
@@ -69,7 +65,7 @@ export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
69 69
 	--prefix=%{_prefix} \
70 70
 	--bindir=%{_bindir} \
71 71
 	--libdir=%{_libdir}
72
-make %{?_smp_mflags}
72
+make
73 73
 
74 74
 %check
75 75
 make check
... ...
@@ -88,30 +84,26 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
88 88
 %{_libexecdir}/mesos/mesos-*
89 89
 %{_prefix}/etc/mesos/*
90 90
 %{_prefix}/share/mesos/*
91
-%{_libdir}/libload_qos_controller-*.so
91
+%{_libdir}/libload_qos_controller-0.28.2.so
92 92
 %{_libdir}/libload_qos_controller.so
93
-%{_libdir}/liblogrotate_container_logger-*.so
93
+%{_libdir}/liblogrotate_container_logger-0.28.2.so
94 94
 %{_libdir}/liblogrotate_container_logger.so
95
-%{_libdir}/mesos/modules/libfixed_resource_estimator-*.so
95
+%{_libdir}/mesos/modules/libfixed_resource_estimator-0.28.2.so
96 96
 %{_libdir}/mesos/modules/libfixed_resource_estimator.so
97
-%{_libdir}/mesos/modules/libload_qos_controller-*.so
97
+%{_libdir}/mesos/modules/libload_qos_controller-0.28.2.so
98 98
 %{_libdir}/mesos/modules/libload_qos_controller.so
99
-%{_libdir}/mesos/modules/liblogrotate_container_logger-*.so
99
+%{_libdir}/mesos/modules/liblogrotate_container_logger-0.28.2.so
100 100
 %{_libdir}/mesos/modules/liblogrotate_container_logger.so
101
-%exclude %{_bindir}/easy_install
102
-%exclude %{_bindir}/easy_install-2.7
103 101
 
104 102
 %files devel
105 103
 %{_includedir}/*
106 104
 %{_libdir}/libfixed_resource_estimator*
107 105
 %{_libdir}/pkgconfig/mesos.pc
106
+%{_libdir}/python2.7/site-packages/*
108 107
 %{_prefix}/etc/mesos/*
109
-%{python2_sitelib}/*
110 108
 %exclude %{_libdir}/debug/
111 109
 
112 110
 %changelog
113
-*	Mon Jun 26 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.2.0-1
114
--	Upgrade to mesos 1.2.0
115 111
 *	Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.28.2-3
116 112
 -	Use JAVA_VERSION macro instead of hard coding version.
117 113
 *	Mon Apr 24 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.28.2-2
... ...
@@ -1,17 +1,16 @@
1 1
 Summary:        Google's data interchange format
2 2
 Name:           protobuf
3
-Version:        3.0.0
4
-Release:        1%{?dist}
3
+Version:        2.6.1
4
+Release:        4%{?dist}
5 5
 License:        BSD-3-Clause
6 6
 Group:          Development/Libraries
7 7
 Vendor:         VMware, Inc.
8 8
 Distribution:   Photon
9 9
 URL:            https://github.com/google/protobuf/
10 10
 Source0:        protobuf-%{version}.tar.gz
11
-%define         sha1 protobuf=cffdb9bd6eed66b7c3322197740510fd103bb6df
11
+%define         sha1 protobuf=a8f11eced7352edfefa814996ebf086ab3cfbaa0
12 12
 BuildRequires:  autoconf
13 13
 BuildRequires:  automake
14
-BuildRequires:  cmake
15 14
 BuildRequires:  libtool
16 15
 BuildRequires:	which
17 16
 BuildRequires:  libstdc++
... ...
@@ -70,7 +69,6 @@ This contains protobuf python3 libraries.
70 70
 %package        java
71 71
 Summary:        protobuf java
72 72
 Group:          Development/Libraries
73
-BuildRequires:  chkconfig
74 73
 BuildRequires:  openjre >= %{JAVA_VERSION}
75 74
 BuildRequires:  openjdk >= %{JAVA_VERSION}
76 75
 BuildRequires:  apache-maven >= 3.3.3
... ...
@@ -86,6 +84,7 @@ autoreconf -iv
86 86
 %build
87 87
 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
88 88
 %configure --disable-silent-rules
89
+
89 90
 make %{?_smp_mflags}
90 91
 pushd python
91 92
 python setup.py build
... ...
@@ -104,8 +103,7 @@ popd
104 104
 pushd java
105 105
 mvn install
106 106
 install -vdm755 %{buildroot}%{_libdir}/java/protobuf
107
-install -vm644 core/target/%{name}-java-%{version}.jar %{buildroot}%{_libdir}/java/protobuf
108
-install -vm644 util/target/%{name}-java-util-%{version}.jar %{buildroot}%{_libdir}/java/protobuf
107
+install -vm644 target/protobuf-java-2.6.1.jar %{buildroot}%{_libdir}/java/protobuf
109 108
 popd
110 109
 
111 110
 %check
... ...
@@ -148,8 +146,6 @@ make check
148 148
 %{_libdir}/java/protobuf/*.jar
149 149
 
150 150
 %changelog
151
-*   Wed Jun 14 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.0.0-1
152
--   Update to protobuf v3.0.0
153 151
 *   Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.6.1-4
154 152
 -   Use JAVA_VERSION macro instead of hard coded version.
155 153
 *   Thu Apr 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-3
156 154
deleted file mode 100644
... ...
@@ -1,40 +0,0 @@
1
-Summary:	Very fast, header only, C++ logging library.
2
-Name:		spdlog
3
-Version:	0.13.0
4
-Release:	1%{?dist}
5
-License:	MIT
6
-URL:		https://github.com/gabime/spdlog
7
-Source0:	%{name}-v%{version}.tar.gz
8
-%define sha1    spdlog=e9968ab555f9f7bb86d6257e98d7a92313a91297
9
-Group:		Development/Tools
10
-Vendor:		VMware, Inc.
11
-Distribution: 	Photon
12
-BuildRequires:  automake
13
-BuildRequires:  cmake
14
-BuildRequires:  gcc
15
-
16
-%description
17
-Very fast, header only, C++ logging library.
18
-
19
-%prep
20
-%setup -q
21
-
22
-%build
23
-mkdir -p build
24
-cd build
25
-cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DBUILD_SHARED_LIBS=ON ..
26
-make %{?_smp_mflags}
27
-
28
-%install
29
-cd build
30
-make DESTDIR=%{buildroot} install
31
-
32
-%files
33
-%defattr(-,root,root)
34
-%{_includedir}/%{name}/*
35
-%{_libdir}/cmake/%{name}/*.cmake
36
-%{_libdir}/pkgconfig/spdlog.pc
37
-
38
-%changelog
39
-*    Fri Jun 09 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.13.0-1
40
--    Initial version of spdlog package for Photon.