From 58f20b90ee59c393706abaf022c809a03414b7a4 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Wed, 12 Apr 2017 20:23:18 -0700 Subject: [PATCH] redhat: Fix dependencies for rpm package - Add bison, flex & autoconf - Remove systemd for systems without it (i.e. CentOS 6) - Update doc to reflect dependencies Signed-off-by: Martin Winter --- redhat/README.rpm_build.md | 12 ++++++++++-- redhat/frr.spec.in | 8 +++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/redhat/README.rpm_build.md b/redhat/README.rpm_build.md index d3fd271c62..fa1d56e0ef 100644 --- a/redhat/README.rpm_build.md +++ b/redhat/README.rpm_build.md @@ -6,10 +6,18 @@ Building your own FRRouting RPM yum install git autoconf automake libtool make gawk readline-devel \ texinfo dejagnu net-snmp-devel groff rpm-build net-snmp-devel \ - libcap-devel texi2html + libcap-devel texi2html bison flex + + Additionally, on systems with systemd (CentOS 7, Fedora) + + yum install systemd-devel (use `dnf install` on new Fedora instead of `yum install`) - + + **CentOS 6:** Please check doc/Building_FRR_on_CentOS6.md for details on + how to install required version of autoconf, automake and bison. The + versions in the common Repo are too old. + 2. Checkout FRR under a **unpriviledged** user account git clone https://github.com/frrouting/frr.git frr diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 0d3bf6db20..385d5f4202 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -106,16 +106,16 @@ Requires: ncurses json-c Requires(pre): /sbin/install-info Requires(preun): /sbin/install-info Requires(post): /sbin/install-info -BuildRequires: texi2html texinfo autoconf patch libcap-devel groff +BuildRequires: texi2html texinfo autoconf automake patch libcap-devel groff BuildRequires: readline readline-devel ncurses ncurses-devel -BuildRequires: json-c-devel bison flex +BuildRequires: json-c-devel bison >= 2.7 flex Requires: ncurses initscripts %if %{with_pam} BuildRequires: pam-devel Requires: pam %endif %if "%{initsystem}" == "systemd" -BuildRequires: systemd +BuildRequires: systemd systemd-devel Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -242,7 +242,9 @@ developing OSPF-API and frr applications. %endif --enable-gcc-rdynamic \ --enable-isisd=yes \ +%if "%{initsystem}" == "systemd" --enable-systemd=yes \ +%endif --enable-poll=yes make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" -- 2.39.5