| Message ID | 375cb4373aadacca48c4c40db89679c32397e84c.1654849219.git.tredaelli@redhat.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | rhel: use the complete version as OVS version | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/intel-ovs-compilation | success | test: success |
Timothy Redaelli <tredaelli@redhat.com> writes: > Since on CentOS/RHEL the builds are based on stable branches and not on > tags for debugging purpose it's better to have the downstream version as > version so it's easier to know which commits are included in a build. > > This commit changes the version of OVS on Fedora/CentOS/RHEL to be aligned > with the downstream one. > > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> > --- > rhel/openvswitch-fedora.spec.in | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in > index 16ef1ac3a..f8398c74c 100644 > --- a/rhel/openvswitch-fedora.spec.in > +++ b/rhel/openvswitch-fedora.spec.in > @@ -162,6 +162,9 @@ This package provides IPsec tunneling support for OVS tunnels. > %setup -q > > %build > +# Append release to version > +sed -i -e "s/^AC_INIT(openvswitch,.*,/AC_INIT(openvswitch, %{version}-%{release},/" configure.ac > + If we're making this change here, why not also just run sed across the .te.in file (from patch 1/2) rather than making that change a dist wide one. We could simply add something like (NOTE: the syntax is untested): sed -i -e "s/%{version}-%{release}/%{version}/" selinux/openvswitch-custom.te Maybe there's also an alternative where we use an extra_dist kind of variable to create a version file that we use in those places we will want to use the full version? > %configure \ > %if %{with libcapng} > --enable-libcapng \
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 16ef1ac3a..f8398c74c 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -162,6 +162,9 @@ This package provides IPsec tunneling support for OVS tunnels. %setup -q %build +# Append release to version +sed -i -e "s/^AC_INIT(openvswitch,.*,/AC_INIT(openvswitch, %{version}-%{release},/" configure.ac + %configure \ %if %{with libcapng} --enable-libcapng \
Since on CentOS/RHEL the builds are based on stable branches and not on tags for debugging purpose it's better to have the downstream version as version so it's easier to know which commits are included in a build. This commit changes the version of OVS on Fedora/CentOS/RHEL to be aligned with the downstream one. Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> --- rhel/openvswitch-fedora.spec.in | 3 +++ 1 file changed, 3 insertions(+)