| Message ID | 1f8c433ccf69a398770d97c8e576172b7ccb6a7c.1541930657.git.tredaelli@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] ipsec: Install ovs-monitor-ipsec in script directory | expand |
On Sun, Nov 11, 2018 at 11:04:17AM +0100, Timothy Redaelli wrote: > In commit d5cc46e3d185 ("ipsec: Use @PYTHON@ directly instead of > "/usr/bin/env python"") ovs-monitor-ipsec is installed in bin directory, > but it's supposed to be installed in script directory. > > This commit removes also the manual copy of "ovs-monitor-ipsec" in spec file > since it's installed directly in "make install". > > Fixes: d5cc46e3d185 ("ipsec: Use @PYTHON@ directly instead of "/usr/bin/env python"") > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> Thanks, applied to master.
diff --git a/ipsec/automake.mk b/ipsec/automake.mk index 66515e8f8..dc16f49a3 100644 --- a/ipsec/automake.mk +++ b/ipsec/automake.mk @@ -5,6 +5,6 @@ # notice and this notice are preserved. This file is offered as-is, # without warranty of any kind. -bin_SCRIPTS += ipsec/ovs-monitor-ipsec +scripts_SCRIPTS += ipsec/ovs-monitor-ipsec EXTRA_DIST += ipsec/ovs-monitor-ipsec.in FLAKE8_PYFILES += ipsec/ovs-monitor-ipsec.in diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 574e89eb5..13457a245 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -341,10 +341,6 @@ install -p -D -m 0755 \ rhel/usr_share_openvswitch_scripts_ovs-systemd-reload \ $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovs-systemd-reload -install -m 0755 \ - ipsec/ovs-monitor-ipsec \ - $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovs-monitor-ipsec - # remove unpackaged files rm -f $RPM_BUILD_ROOT%{_bindir}/ovs-parse-backtrace \ $RPM_BUILD_ROOT%{_sbindir}/ovs-vlan-bug-workaround \
In commit d5cc46e3d185 ("ipsec: Use @PYTHON@ directly instead of "/usr/bin/env python"") ovs-monitor-ipsec is installed in bin directory, but it's supposed to be installed in script directory. This commit removes also the manual copy of "ovs-monitor-ipsec" in spec file since it's installed directly in "make install". Fixes: d5cc46e3d185 ("ipsec: Use @PYTHON@ directly instead of "/usr/bin/env python"") Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> --- ipsec/automake.mk | 2 +- rhel/openvswitch-fedora.spec.in | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-)