[oe-commits] Andrea Adami : opie-networksettings: unbreak builds against *actual* linux-2.6.31

git version control git at git.openembedded.org
Sun Nov 22 00:08:57 UTC 2009


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 157c888f6c6e289dacad6f19e596b4557bea9646
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=157c888f6c6e289dacad6f19e596b4557bea9646

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Sun Nov 22 01:05:14 2009 +0100

opie-networksettings: unbreak builds against *actual* linux-2.6.31
headers.

Acked-by: Paul Eggleton <bluelightning at bluelightning.org>

---

 recipes/opie-networksettings/files/wireless.patch  |   16 +++++++---------
 .../opie-networksettings/opie-networksettings.inc  |    2 ++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/recipes/opie-networksettings/files/wireless.patch b/recipes/opie-networksettings/files/wireless.patch
index 5d8d42a..001a310 100644
--- a/recipes/opie-networksettings/files/wireless.patch
+++ b/recipes/opie-networksettings/files/wireless.patch
@@ -1,13 +1,11 @@
-diff --git a/wlan/wextensions.h b/wlan/wextensions.h
-index a89e33a..356aada 100644
---- a/wlan/wextensions.h
-+++ b/wlan/wextensions.h
-@@ -4,6 +4,8 @@
+--- a/wlan/wextensions.h	2009-11-22 00:29:50.000000000 +0100
++++ b/wlan/wextensions.h	2009-11-07 00:53:29.000000000 +0100
+@@ -3,7 +3,7 @@
+ 
  #include <qstring.h>
  
+-#include <net/if.h>
++//#include <net/if.h>
  #include <netinet/ip.h>
-+#include <linux/if.h>
-+#include <linux/types.h>
+ #include <linux/types.h>
  #include <linux/wireless.h>
- 
- class WExtensions {
diff --git a/recipes/opie-networksettings/opie-networksettings.inc b/recipes/opie-networksettings/opie-networksettings.inc
index e84f9da..8bda9f0 100644
--- a/recipes/opie-networksettings/opie-networksettings.inc
+++ b/recipes/opie-networksettings/opie-networksettings.inc
@@ -5,6 +5,8 @@ LICENSE = "GPL"
 PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
 APPNAME = "networksettings"
 
+SRC_URI_append = " file://wireless.patch;patch=1"
+
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie





More information about the Openembedded-commits mailing list