diff options
| author | Martin Xu <martinxu9.ovs@gmail.com> | 2018-09-20 12:19:29 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-09-25 15:21:47 -0700 |
| commit | 8821b212df5450799dfae8e9b4058b2cdacc49f0 (patch) | |
| tree | 8c9c986d469ccb4181fbc71de6fdac4a61d45632 /rhel/openvswitch-kmod-fedora.spec.in | |
| parent | 69c51582ff786a68fc325c1c50624715482bc460 (diff) | |
| download | openvswitch-8821b212df5450799dfae8e9b4058b2cdacc49f0.tar.gz | |
rhel: use _datadir as path prefix for ovs-kmod-manage.sh, fedora
This patch fixes the path for ovs-kmod-manage.sh script in the
openvswitch-kmod RPM in fedora spec file. Currently the path prefix is
hard coded to /usr/share. Use %{_datadir} instead.
Fixes: 22c33c303932 (rhel: support kmod build against mulitple kernel versions, fedora)
Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com>
CC: Greg Rose <gvrose8192@gmail.com>
CC: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Flavio Leitner <fbl@sysclose.org>
Diffstat (limited to 'rhel/openvswitch-kmod-fedora.spec.in')
| -rw-r--r-- | rhel/openvswitch-kmod-fedora.spec.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in index 521c11af2..464d53722 100644 --- a/rhel/openvswitch-kmod-fedora.spec.in +++ b/rhel/openvswitch-kmod-fedora.spec.in @@ -74,7 +74,7 @@ for kv in %{kversion}; do done install -d -m 0755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts install -p -m 0755 rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovs-kmod-manage.sh + $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh %clean rm -rf $RPM_BUILD_ROOT @@ -88,15 +88,15 @@ IFS='.\|-' read mainline_major mainline_minor mainline_patch major_rev \ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then # For RHEL 7.2 and 7.4 - if [ -x "/usr/share/openvswitch/scripts/ovs-kmod-manage.sh" ]; then - /usr/share/openvswitch/scripts/ovs-kmod-manage.sh + if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then + %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh fi fi elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "4" ] && \ [ "$mainline_patch" -ge "73" ]; then # For SLES 12 SP3 - if [ -x "/usr/share/openvswitch/scripts/ovs-kmod-manage.sh" ]; then - /usr/share/openvswitch/scripts/ovs-kmod-manage.sh + if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then + %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh fi else # Ensure that modprobe will find our modules. @@ -125,7 +125,7 @@ fi /lib/modules/*/extra/openvswitch/*.ko /etc/depmod.d/kmod-openvswitch.conf %exclude /lib/modules/*/modules.* -%attr(755,root,root) /usr/share/openvswitch/scripts/ovs-kmod-manage.sh +%attr(755,root,root) %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh %changelog * Wed Sep 21 2011 Kyle Mestery <kmestery@cisco.com> |