diff options
| author |   Romanos Skiadas <rski@intracom-telecom.com> | 2017-01-20 16:49:26 -0500 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-02-17 20:41:45 -0500 |
| commit | a7155293dba7c21f060b671b15fc36a66b84de83 (patch) | |
| tree | 104967a3691d4e042f086d2a2dba57a6b93da9cf /build/patches/fix_zrpcd_make_dist.patch | |
| parent | 5e4c2ffc86d0426113f60b8069e81482f82bbc8d (diff) | |
Adding Quagga to build
Builds 6Wind ZRPC, Quagga, and dependencies required for OpenDaylight
with BGPVPN scenario. Packages are built into RPMs, and left on the
overcloud disk in /root/quagga. They are then installed at deploy time
if VPN feature flag is enabled. Note, for proper upstream we should
create a zrpc OOO service, but that can be a follow up patch. For that
we would also need official packaging/build system upstream somewhere.
JIRA: APEX-357
Changes Include:
- Build thrift rpm
- Build c-capnproto rpm
- Build quagga rpm
- Build zrpcd rpm
- Configure bgpd
- Detect deploy with VPN and install pkgs
- Enable zrpcd with systemd
Change-Id: I9825694f46aaab48a3d1cd5fc4d9a24c7370e8fa
Signed-off-by: Tim Rozet <trozet@redhat.com>
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
Diffstat (limited to 'build/patches/fix_zrpcd_make_dist.patch')
| -rw-r--r-- | build/patches/fix_zrpcd_make_dist.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/build/patches/fix_zrpcd_make_dist.patch b/build/patches/fix_zrpcd_make_dist.patch new file mode 100644 index 00000000..a0f65b7f --- /dev/null +++ b/build/patches/fix_zrpcd_make_dist.patch @@ -0,0 +1,29 @@ +From ad66cdee4ffe8225d4534137734cf62944ce45c8 Mon Sep 17 00:00:00 2001 +From: Romanos Skiadas <rski@intracom-telecom.com> +Date: Mon, 6 Feb 2017 18:43:12 +0000 +Subject: [PATCH] make dist: Include all headers required for compilation + +Some headers where missing from the archive resulting from 'make dist'. + +Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com> +--- + zrpcd/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/zrpcd/Makefile.am b/zrpcd/Makefile.am +index 50db7fa..f4081d3 100644 +--- a/zrpcd/Makefile.am ++++ b/zrpcd/Makefile.am +@@ -18,6 +18,9 @@ libzrpc_a_SOURCES = \ + qzmqclient.c qzcclient.capnp.c qzcclient.c zrpc_util.c \ + zrpc_bgp_capnp.c + ++pkginclude_HEADERS = \ ++ zrpc_os_wrapper.h zrpc_global.h ++ + noinst_HEADERS = \ + bgp_configurator.h bgp_updater.h vpnservice_types.h zrpc_bgp_updater.h \ + zrpc_bgp_configurator.h zrpc_bgp_updater.h zrpc_debug.h zrpc_memory.h \ +-- +1.8.3.1 + |