| Message ID | 20210918135355.13017-1-odivlad@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] spec: add tcpdump to BuildRequires | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
On Sat, Sep 18, 2021 at 9:54 AM Vladislav Odintsov <odivlad@gmail.com> wrote: > > tcpdump is used in tests. When RPM package is built it > appropriate test fails if tcpdump package is not installed. > > This commit fixes this issue by adding a new conditional > BuildRequires: tcpdump to specfile. > > Signed-off-by: Vladislav Odintsov <odivlad@gmail.com> Thanks. I applied the patch to the main branch. Numan > --- > rhel/ovn-fedora.spec.in | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/rhel/ovn-fedora.spec.in b/rhel/ovn-fedora.spec.in > index 5fe0f990f..1b1ffdd24 100644 > --- a/rhel/ovn-fedora.spec.in > +++ b/rhel/ovn-fedora.spec.in > @@ -36,6 +36,9 @@ Provides: openvswitch-ovn-common = %{?epoch:%{epoch}:}%{version}-%{release} > %define ovsver @OVSVERSION@ > %define ovsdir openvswitch-%{ovsver} > > +# to skip running checks, pass --without check > +%bcond_without check > + > # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the > # lib/sflow*.[ch] files are SISSL > License: ASL 2.0 and LGPLv2+ and SISSL > @@ -56,6 +59,9 @@ BuildRequires: procps-ng > %if %{with libcapng} > BuildRequires: libcap-ng libcap-ng-devel > %endif > +%if %{with check} > +BuildRequires: tcpdump > +%endif > BuildRequires: unbound unbound-devel > > Requires: openssl hostname iproute module-init-tools openvswitch > @@ -64,9 +70,6 @@ Requires(post): systemd-units > Requires(preun): systemd-units > Requires(postun): systemd-units > > -# to skip running checks, pass --without check > -%bcond_without check > - > %description > OVN, the Open Virtual Network, is a system to support virtual network > abstraction. OVN complements the existing capabilities of OVS to add > -- > 2.30.0 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/rhel/ovn-fedora.spec.in b/rhel/ovn-fedora.spec.in index 5fe0f990f..1b1ffdd24 100644 --- a/rhel/ovn-fedora.spec.in +++ b/rhel/ovn-fedora.spec.in @@ -36,6 +36,9 @@ Provides: openvswitch-ovn-common = %{?epoch:%{epoch}:}%{version}-%{release} %define ovsver @OVSVERSION@ %define ovsdir openvswitch-%{ovsver} +# to skip running checks, pass --without check +%bcond_without check + # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL License: ASL 2.0 and LGPLv2+ and SISSL @@ -56,6 +59,9 @@ BuildRequires: procps-ng %if %{with libcapng} BuildRequires: libcap-ng libcap-ng-devel %endif +%if %{with check} +BuildRequires: tcpdump +%endif BuildRequires: unbound unbound-devel Requires: openssl hostname iproute module-init-tools openvswitch @@ -64,9 +70,6 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -# to skip running checks, pass --without check -%bcond_without check - %description OVN, the Open Virtual Network, is a system to support virtual network abstraction. OVN complements the existing capabilities of OVS to add
tcpdump is used in tests. When RPM package is built it appropriate test fails if tcpdump package is not installed. This commit fixes this issue by adding a new conditional BuildRequires: tcpdump to specfile. Signed-off-by: Vladislav Odintsov <odivlad@gmail.com> --- rhel/ovn-fedora.spec.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)