[ovs-git] Open vSwitch: datapath: Fix build with kernel header layout recently adopted by Debian. (master)

dev at openvswitch.org dev at openvswitch.org
Wed Nov 18 21:23:27 UTC 2009


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  7c9e113b712e72fcb4ccc6075da7334cb3391059 (commit)
      from  d377243b8557ae8e6c1d374d76b6ee29fd61ceb4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7c9e113b712e72fcb4ccc6075da7334cb3391059
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=7c9e113b712e72fcb4ccc6075da7334cb3391059
Author: Ben Pfaff <blp at nicira.com>
		
datapath: Fix build with kernel header layout recently adopted by Debian.
		
Recent Debian kernel-header packages divide kernel headers into two
directories: the "common" headers that are not architecture-specific,
which go in a directory named like
    /usr/src/kernel-headers-2.6.31-1-common,
and architecture-specific headers in a directory named, e.g.
    /usr/src/kernel-headers-2.6.31-1-686.
OVS needs to look at the ones in the "common" directory as part of its
configuration process, but the build directory provided on --with-l26 is
the architecture-specific directory.  We also need the
architecture-specific directory, since it is the one that we use as part
of the "make", so we can't simply make the user specify the common
directory on --with-l26.  Furthermore, there is no easy-to-see link
between the two directories, except as part of the text in a Makefile,
which is not the easiest language to parse.

This commit attempts to kluge around the problem by using the Debian
directory naming.  If the build directory does not contain the headers,
then we replace the last component of its name by "-common" and check
for the headers there.  This is not ideal, but it does solve the actual
problem at hand.

Tested with Debian's linux-headers-2.6.31-1-686 and with a few older
sets of headers that do not use this scheme.


-----------------------------------------------------------------------

Summary of changes:
 acinclude.m4                        |   71 ++++++++++++++++++++++------------
 configure.ac                        |    2 +-
 datapath/linux-2.6/Makefile.main.in |    2 +-
 3 files changed, 48 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
Open vSwitch




More information about the git mailing list