From d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 2 May 2018 12:34:38 -0400 Subject: Migrates master to use direct upstream We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet --- build/rpm_specs/c_capnproto.spec | 45 ---------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 build/rpm_specs/c_capnproto.spec (limited to 'build/rpm_specs/c_capnproto.spec') diff --git a/build/rpm_specs/c_capnproto.spec b/build/rpm_specs/c_capnproto.spec deleted file mode 100644 index 2d95494c..00000000 --- a/build/rpm_specs/c_capnproto.spec +++ /dev/null @@ -1,45 +0,0 @@ -Name: c-capnproto -Version: 0.1 -Release: 0 -Summary: C library/compiler for the Cap'n Proto serialization/RPC protocol - -Group: System Environment -License: Apache 2.0 -URL: https://gerrit.opnfv.org/gerrit/apex.git -Source0: %{name}-%{version}.tar.gz - -Provides: c_capnproto - -%description -C library/compiler for the Cap'n Proto serialization/RPC protocol - -%prep -%setup -q - -%build -%configure --without-gtest - -%install -rm -rf $RPM_BUILD_ROOT -%make_install -find %{buildroot} -name '*.la' -exec rm -f {} ';' -find %{buildroot} -name '*.a' -exec rm -f {} ';' -mkdir -p $RPM_BUILD_ROOT/%{_includedir}/c-capnproto/ -# These are the headers/libs quagga/zrpcd link against -install -m 700 $RPM_BUILD_ROOT/%{_includedir}/capn.h $RPM_BUILD_ROOT/%{_includedir}/c-capnproto/ -install -m 700 $RPM_BUILD_ROOT/%{_libdir}/libcapn.so $RPM_BUILD_ROOT/%{_libdir}/libcapn_c.so - -%files -%defattr(644,root,root) -%{_bindir}/capnpc-c -%{_includedir}/capn.h -%{_includedir}/c-capnproto/capn.h -%{_libdir}/libcapn.so* -%{_libdir}/libcapn_c.so - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%changelog -* Mon Jan 23 2017 Tim Rozet - 1.0-1 -- Initial version -- cgit 1.2.3-korg