← Back to branch summary

~ubuntu-branches/ubuntu/raring/openvswitch/raring

« back to all changes in this revision

Viewing changes to debian/patches/linux-Makefile.main.in-acinclude-preparation-for-lin.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-02-07 15:32:38 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20130207153238-4fw3p72zc0ms1g8p
Tags: 1.9.0~git20130207.84b39f2-0ubuntu1
https://launchpad.net/bugs/1098324
* New upstream snapshot from 1.9 branch:
  - d/p/support-linux-3.8.patch,
    d/p/linux-Makefile.main.in-acinclude-preparation-for-lin.patch:
    Dropped as included upstream.
* Fix dependencies for ovsdbmonitor (LP: #1098324):
  - d/control: Add dependency on python-twisted-conch.
* d/control: Bumped Standards-Version, no changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/linux-Makefile.main.in-acinclude-preparation-for-lin.patch
1
 
From 2520f4528742decf78a8b375f5389b50977f5e4b Mon Sep 17 00:00:00 2001
2
 
From: Isaku Yamahata <yamahata@valinux.co.jp>
3
 
Date: Fri, 7 Dec 2012 12:37:02 +0900
4
 
Subject: [PATCH] linux/Makefile.main.in, acinclude: preparation for linux 3.7.0+
5
 
 
6
 
The version.h is moved from include/linux/version.h to
7
 
include/generated/uapi/linux/version.h.
8
 
So check both pathes.
9
 
 
10
 
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
11
 
Signed-off-by: Jesse Gross <jesse@nicira.com>
12
 
---
13
 
 acinclude.m4                    |    3 ++-
14
 
 datapath/linux/Makefile.main.in |    5 ++++-
15
 
 2 files changed, 6 insertions(+), 2 deletions(-)
16
 
 
17
 
diff --git a/acinclude.m4 b/acinclude.m4
18
 
index d502b00..02dc952 100644
19
 
--- a/acinclude.m4
20
 
+++ b/acinclude.m4
21
 
@@ -144,7 +144,8 @@ AC_DEFUN([OVS_CHECK_LINUX], [
22
 
          AC_ERROR([Linux kernel in build tree $KBUILD (source tree $KSRC) is version $kversion, but version 2.6 or later is required])
23
 
        fi
24
 
     fi
25
 
-    if test ! -e "$KBUILD"/include/linux/version.h || \
26
 
+    if (test ! -e "$KBUILD"/include/linux/version.h && \
27
 
+        test ! -e "$KBUILD"/include/generated/uapi/linux/version.h)|| \
28
 
        (test ! -e "$KBUILD"/include/linux/autoconf.h && \
29
 
         test ! -e "$KBUILD"/include/generated/autoconf.h); then
30
 
        AC_MSG_ERROR([Linux kernel source in $KBUILD is not configured])
31
 
diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in
32
 
index 6b46c0c..9df3ad1 100644
33
 
--- a/datapath/linux/Makefile.main.in
34
 
+++ b/datapath/linux/Makefile.main.in
35
 
@@ -53,7 +53,10 @@ endif
36
 
 
37
 
 VERSION_FILE := $(KOBJ)/include/linux/version.h
38
 
 ifeq (,$(wildcard $(VERSION_FILE)))
39
 
-  $(error Linux kernel source not configured - missing version.h)
40
 
+  VERSION_FILE := $(KOBJ)/include/generated/uapi/linux/version.h
41
 
+  ifeq (,$(wildcard $(VERSION_FILE)))
42
 
+    $(error Linux kernel source not configured - missing version.h)
43
 
+  endif
44
 
 endif
45
 
 
46
 
 CONFIG_FILE := $(KSRC)/include/generated/autoconf.h
47
 
1.7.1
48