From 4b38c153a9412529c7ce9c45bb229ef877efef9e Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 8 Dec 2011 23:36:06 -0800 Subject: [PATCH] bugtool: move plugins data from /etc/openvswitch to /usr/share/openvswitch This is in repsonse to the following rpmlint warnings: W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/system-configuration/openvswitch.xml W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/system-logs/openvswitch.xml W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/system-configuration.xml W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/network-status/openvswitch.xml W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/kernel-info/openvswitch.xml The xenserver specfile still places them in /etc/xensource/bugtool since that's a distro policy. Of course, the rpmlint warnings are as well, however, this seems like a more logical place for the bugtool plugins. Signed-off-by: Chris Wright Signed-off-by: Ben Pfaff --- debian/openvswitch-common.install | 2 +- rhel/openvswitch.spec.in | 2 +- utilities/bugtool/automake.mk | 2 +- utilities/bugtool/ovs-bugtool.in | 2 +- xenserver/openvswitch-xen.spec | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/openvswitch-common.install b/debian/openvswitch-common.install index 282519a13..597fb8d66 100644 --- a/debian/openvswitch-common.install +++ b/debian/openvswitch-common.install @@ -1,4 +1,3 @@ -etc/openvswitch/bugtool-plugins usr/bin/ovs-appctl usr/bin/ovs-benchmark usr/bin/ovs-ofctl @@ -6,6 +5,7 @@ usr/bin/ovs-parse-leaks usr/bin/ovs-pki usr/bin/ovsdb-client usr/sbin/ovs-bugtool +usr/share/openvswitch/bugtool-plugins usr/share/openvswitch/scripts/ovs-bugtool-cfm-show usr/share/openvswitch/scripts/ovs-bugtool-lacp-show usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in index 3d6cda3b4..0c2daf320 100644 --- a/rhel/openvswitch.spec.in +++ b/rhel/openvswitch.spec.in @@ -109,7 +109,6 @@ exit 0 %config(noreplace) /etc/logrotate.d/openvswitch /etc/sysconfig/network-scripts/ifup-ovs /etc/sysconfig/network-scripts/ifdown-ovs -/etc/openvswitch/bugtool-plugins/* /usr/bin/ovs-appctl /usr/bin/ovs-benchmark /usr/bin/ovs-dpctl @@ -144,6 +143,7 @@ exit 0 /usr/share/man/man8/ovs-vlan-test.8.gz /usr/share/man/man8/ovs-vsctl.8.gz /usr/share/man/man8/ovs-vswitchd.8.gz +/usr/share/openvswitch/bugtool-plugins/ /usr/share/openvswitch/python/ /usr/share/openvswitch/scripts/ovs-bugtool-* /usr/share/openvswitch/scripts/ovs-ctl diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk index 63762f133..9e625ceee 100644 --- a/utilities/bugtool/automake.mk +++ b/utilities/bugtool/automake.mk @@ -18,7 +18,7 @@ bugtool_scripts = \ utilities/bugtool/ovs-bugtool-ovsdb-dump scripts_SCRIPTS += $(bugtool_scripts) -bugtoolpluginsdir = $(sysconfdir)/openvswitch/bugtool-plugins +bugtoolpluginsdir = $(pkgdatadir)/bugtool-plugins INSTALL_DATA_LOCAL += bugtool-install-data-local bugtool-install-data-local: for plugin in $(bugtool_plugins); do \ diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in index 6a4316aff..f78289dee 100755 --- a/utilities/bugtool/ovs-bugtool.in +++ b/utilities/bugtool/ovs-bugtool.in @@ -67,7 +67,7 @@ OS_RELEASE = platform.release() APT_SOURCES_LIST = "/etc/apt/sources.list" APT_SOURCES_LIST_D = "/etc/apt/sources.list.d" BUG_DIR = "/var/log/ovs-bugtool" -PLUGIN_DIR = "@sysconfdir@/openvswitch/bugtool-plugins" +PLUGIN_DIR = "@pkgdatadir@/bugtool-plugins" GRUB_CONFIG = '/boot/grub/menu.lst' BOOT_KERNEL = '/boot/vmlinuz-' + OS_RELEASE BOOT_INITRD = '/boot/initrd-' + OS_RELEASE + '.img' diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index 4dbc71b12..56db2e5b2 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -108,7 +108,7 @@ install python/compat/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python install python/compat/argparse.py $RPM_BUILD_ROOT/usr/share/openvswitch/python install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool -mv $RPM_BUILD_ROOT/etc/openvswitch/bugtool-plugins/* $RPM_BUILD_ROOT/etc/xensource/bugtool +mv $RPM_BUILD_ROOT/usr/share/openvswitch/bugtool-plugins/* $RPM_BUILD_ROOT/etc/xensource/bugtool # Get rid of stuff we don't want to make RPM happy. rm \ -- 2.43.0