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_quagga_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_quagga_make_dist.patch')
-rw-r--r-- | build/patches/fix_quagga_make_dist.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/build/patches/fix_quagga_make_dist.patch b/build/patches/fix_quagga_make_dist.patch new file mode 100644 index 00000000..8f854e50 --- /dev/null +++ b/build/patches/fix_quagga_make_dist.patch @@ -0,0 +1,28 @@ +From c31749157aabca758ef731ad4d15ddf4cc2efe66 Mon Sep 17 00:00:00 2001 +From: Romanos Skiadas <rski@intracom-telecom.com> +Date: Mon, 6 Feb 2017 15:28:44 +0200 +Subject: [PATCH] lib: Include missing ccapnproto header in Makefile + +Without this make dist doesn't include the header and the resulting +archive doesn't build. + +Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com> +--- + lib/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index c286833..c7682ed 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -43,6 +43,7 @@ endif + if HAVE_CCAPNPROTO + libzebra_la_SOURCES += qzc.capnp.c + BUILT_SOURCES += qzc.capnp.c ++pkginclude_HEADERS += qzc.capnp.h + endif + + EXTRA_DIST = \ +-- +1.8.3.1 + |