On 1/18/23 17:55, Dumitru Ceara wrote:
> Recently OVS enabled AF_XDP support by default and that broke our RPM
> build because of missing dependencies.
> 
> Suggested-by: Ilya Maximets <[email protected]>
> Signed-off-by: Dumitru Ceara <[email protected]>
> ---
>  .ci/ovn-kubernetes/Dockerfile | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile
> index 1cb26d0d0e..1b99f12259 100644
> --- a/.ci/ovn-kubernetes/Dockerfile
> +++ b/.ci/ovn-kubernetes/Dockerfile
> @@ -23,6 +23,8 @@ RUN mkdir /tmp/ovn
>  COPY . /tmp/ovn
>  WORKDIR /tmp/ovn/ovs
>  
> +RUN sed -e 's/@VERSION@/0.0.1/' rhel/openvswitch-fedora.spec.in > 
> /tmp/ovs.spec
> +RUN dnf builddep -y /tmp/ovs.spec
>  RUN ./boot.sh
>  RUN ./configure -v
>  RUN make rpm-fedora
> @@ -30,6 +32,8 @@ RUN rm rpm/rpmbuild/RPMS/x86_64/*debug*
>  RUN rm rpm/rpmbuild/RPMS/x86_64/*devel*
>  
>  WORKDIR /tmp/ovn
> +RUN sed -e 's/@VERSION@/0.0.1/' rhel/ovn-fedora.spec.in > /tmp/ovn.spec
> +RUN dnf builddep -y /tmp/ovn.spec
>  RUN ./boot.sh
>  RUN ./configure
>  RUN make rpm-fedora

I suppose most of the 'install needed rpms' is not needed after that.
You should only need rpm-build and dnf-plugins-core installed, all
the rest will be installed by builddep.

And you probably need to move the 'dnf clean' command after all the
installations.  Maybe just at the end of this container build.

What do you think?

Best regards, Ilya Maximets.
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to