[ovs-dev] [PATCH 2/4] Install the vswitch schema with "make install".

Ben Pfaff blp at nicira.com
Thu Mar 4 00:57:53 UTC 2010


This is a convenience for the system administrator, in case the database
gets deleted, to make it easy to create a new one.

Also, once "make install" does this, the XenServer code doesn't have to
duplicate the work.
---
 vswitchd/automake.mk       |    2 +-
 xenserver/vswitch-xen.spec |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index c38add6..0ed1a5b 100644
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -33,12 +33,12 @@ EXTRA_DIST += \
 	vswitchd/ovs-vswitchd.8.in \
 	vswitchd/ovs-brcompatd.8.in
 
-
 # vswitch schema and IDL
 OVSIDL_BUILT += \
 	vswitchd/vswitch-idl.c \
 	vswitchd/vswitch-idl.h \
 	vswitchd/vswitch-idl.ovsidl
+dist_pkgdata_DATA += vswitchd/vswitch.ovsschema
 VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema vswitchd/vswitch-idl.ann
 noinst_DATA += vswitchd/vswitch-idl.txt
 EXTRA_DIST += $(VSWITCH_IDL_FILES) vswitchd/vswitch-idl.txt
diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
index 49fb8cb..f0d6ce1 100644
--- a/xenserver/vswitch-xen.spec
+++ b/xenserver/vswitch-xen.spec
@@ -68,8 +68,6 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/xapi.d/plugins
 install -m 755 xenserver/etc_xapi.d_plugins_vswitch-cfg-update \
          $RPM_BUILD_ROOT/etc/xapi.d/plugins/vswitch-cfg-update
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/vswitch/scripts
-install -m 644 vswitchd/vswitch.ovsschema \
-         $RPM_BUILD_ROOT/usr/share/vswitch/vswitch.ovsschema
 install -m 755 xenserver/opt_xensource_libexec_interface-reconfigure \
              $RPM_BUILD_ROOT/usr/share/vswitch/scripts/interface-reconfigure
 install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigure.py \
-- 
1.6.6.1





More information about the dev mailing list