diff options
author | Arthur Jones <arthur.jones@riverbed.com> | 2018-03-19 18:04:00 +0100 |
---|---|---|
committer | Arthur Jones <arthur.jones@riverbed.com> | 2018-03-19 19:37:58 +0100 |
commit | a61bbca8312023d74dcc2ddf3a6dc3f93d3af03e (patch) | |
tree | e5756ce865aa7ead671189aa5ce8d6ea0b121e0a /redhat | |
parent | Merge pull request #1908 from donaldsharp/peer_established (diff) | |
download | frr-a61bbca8312023d74dcc2ddf3a6dc3f93d3af03e.tar.xz frr-a61bbca8312023d74dcc2ddf3a6dc3f93d3af03e.zip |
redhat: enable dist tarball to build in a chroot
When building the rpms, we can use a chroot (in my case docker) to
ensure that the BuildRequires are complete. This test failed with
errors like:
checking for CARES... no
configure: error: trying to build nhrpd, but libcares not found. install c-ares and its -dev headers.
error: Bad exit status from /var/tmp/rpm-tmp.FewvLf (%build)
This is due to a couple missing BuildRequires in the spec file. Here, we
add those in for all RPM builds.
Testing done:
Ran a docker build on CentOS7 which succeeded. Loaded the modules onto
CentOS6 to make sure they were at least valid there, that succeeded.
Issue: https://github.com/FRRouting/frr/issues/1930
Signed-off-by: Arthur Jones <arthur.jones@riverbed.com>
Diffstat (limited to 'redhat')
-rw-r--r-- | redhat/frr.spec.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 8e0cc86a9..14fb91021 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -146,6 +146,7 @@ Requires(post): /sbin/install-info BuildRequires: gcc patch libcap-devel BuildRequires: readline readline-devel ncurses ncurses-devel BuildRequires: json-c-devel bison >= 2.7 flex make +BuildRequires: c-ares-devel texinfo %if 0%{?rhel} && 0%{?rhel} < 7 #python27-devel is available from ius community repo for RedHat/CentOS 6 BuildRequires: python27-devel python27-sphinx |