diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-01-07 15:52:58 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-01-26 09:46:42 -0800 |
| commit | 00732bf5b5da6f1d71dc4f4b42f54224c03f71f6 (patch) | |
| tree | 8f3ed22139ab32e9dbaf8a28c889b006d3d14239 /debian | |
| parent | bda8868801ebe49b785f4810e055fb6bf80a1dc6 (diff) | |
Cleanly separate IDL annotations from OVSDB schema information.
Until now, the OVSDB IDL annotations have been glommed together with the
schema information in a single file, and then we've used ovsdb-idlc to
extract the schema from that file. This commit reverses the process:
the schema and the annotations are stored separately and then glommed
together as necessary at build time.
This new arrangement has a few advantages:
- We can now easily have multiple different sets of IDL annotations
for a single OVSDB schema. For example, some users may not need
access to columns that other users do.
- Bugs in ovsdb-idlc cannot screw up the underlying schema (as shown
by a recent commit).
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/openvswitch-common.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/debian/openvswitch-common.install b/debian/openvswitch-common.install index 314c7625..c46d9be3 100644 --- a/debian/openvswitch-common.install +++ b/debian/openvswitch-common.install @@ -4,4 +4,4 @@ _debian/utilities/ovs-appctl usr/sbin _debian/utilities/ovs-ofctl usr/sbin _debian/utilities/ovs-parse-leaks usr/bin _debian/utilities/ovs-pki usr/sbin -_debian/vswitchd/vswitch-idl.ovsschema usr/share/openvswitch +vswitchd/vswitch-idl.ovsschema usr/share/openvswitch diff --git a/debian/rules b/debian/rules index 99d1f09a..0d0abf16 100755 --- a/debian/rules +++ b/debian/rules @@ -85,10 +85,6 @@ install-arch: build-arch $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/openvswitch install cp debian/openvswitch-switch-config.overrides debian/openvswitch-switch-config/usr/share/lintian/overrides/openvswitch-switch-config cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template - @# If we are working from a "make dist" tarball then make sure that - @# the ovsschema file is available in the build directory. - test -e _debian/vswitchd/vswitch-idl.ovsschema || \ - cp vswitchd/vswitch-idl.ovsschema _debian/vswitchd/vswitch-idl.ovsschema dh_install -s env TERMINFO=debian/openvswitch-switchui/usr/share/terminfo tic -x extras/ezio/ezio3.ti |