Ubuntu
openvswitch package

Merge lp:~lynxman/ubuntu/oneiric/openvswitch/dkmsfix into lp:ubuntu/oneiric/openvswitch

  1. Oneiric (11.10)
  2. dkmsfix
  3. Merge into oneiric
Proposed by Marc Cluet
Status: Merged
Merged at revision: 19
Proposed branch: lp:~lynxman/ubuntu/oneiric/openvswitch/dkmsfix
Merge into: lp:ubuntu/oneiric/openvswitch
Diff against target: 32 lines (+11/-3)
2 files modified
debian/changelog (+8/-0)
debian/dkms.conf.in (+3/-3)
To merge this branch: bzr merge lp:~lynxman/ubuntu/oneiric/openvswitch/dkmsfix
Reviewer Review Type Date Requested Status
Michael Terry Approve
Ubuntu branches Pending
Review via email: mp+73073@code.launchpad.net

Description of the change

* Fix on debian/dkms.conf.in (LP: #829250)
  - Merged changes in upstream for DKMS build to fix
    problem building with kernel 3.0

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-08-24 23:49:19 +0000
3+++ debian/changelog 2011-08-26 16:08:25 +0000
4@@ -1,3 +1,11 @@
5+openvswitch (1.2.0-1ubuntu3) oneiric; urgency=low
6+
7+ * Fix on debian/dkms.conf.in (LP: #829250)
8+ - Merged changes in upstream for DKMS build to fix
9+ problem building with kernel 3.0
10+
11+ -- Marc Cluet <marc.cluet@ubuntu.com> Fri, 26 Aug 2011 16:48:37 +0100
12+
13 openvswitch (1.2.0-1ubuntu2) oneiric; urgency=low
14
15 * Fix on openvswitch-controller.init (LP: #822142)
16
17=== modified file 'debian/dkms.conf.in'
18--- debian/dkms.conf.in 2010-11-27 22:25:05 +0000
19+++ debian/dkms.conf.in 2011-08-26 16:08:25 +0000
20@@ -1,9 +1,9 @@
21 PACKAGE_NAME="openvswitch"
22 PACKAGE_VERSION="__VERSION__"
23-MAKE="./configure --with-l26=/usr/src/linux-headers-`uname -r` ; make -C datapath/linux-2.6"
24+MAKE="./configure --with-linux=/usr/src/linux-headers-`uname -r` ; make -C datapath/linux"
25 BUILT_MODULE_NAME[0]=openvswitch_mod
26 BUILT_MODULE_NAME[1]=brcompat_mod
27-BUILT_MODULE_LOCATION[0]=datapath/linux-2.6/
28-BUILT_MODULE_LOCATION[1]=datapath/linux-2.6/
29+BUILT_MODULE_LOCATION[0]=datapath/linux/
30+BUILT_MODULE_LOCATION[1]=datapath/linux/
31 DEST_MODULE_LOCATION[0]=/kernel/drivers/net/openvswitch/
32 DEST_MODULE_LOCATION[1]=/kernel/drivers/net/openvswitch/

Subscribers

People subscribed via source and target branches

to all changes: