diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/hal/hal-0.5.11 | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/hal/hal-0.5.11')
-rw-r--r-- | packages/hal/hal-0.5.11/fix-configure.diff | 22 | ||||
-rw-r--r-- | packages/hal/hal-0.5.11/wifi-2.6.27.diff | 64 |
2 files changed, 0 insertions, 86 deletions
diff --git a/packages/hal/hal-0.5.11/fix-configure.diff b/packages/hal/hal-0.5.11/fix-configure.diff deleted file mode 100644 index 7d9d42d69f..0000000000 --- a/packages/hal/hal-0.5.11/fix-configure.diff +++ /dev/null @@ -1,22 +0,0 @@ -From: Rémi Cardona <remi@gentoo.org> -Date: Sat, 9 Aug 2008 15:04:07 +0000 (+0200) -Subject: add libtool-2.2 support -X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c8a1aedf87bbb200fc5daa0ec8559a2d84fbb61d - -add libtool-2.2 support - -Fix for aclocal to work properly with libtool 2.2 which no longer -checks for C++ automatically (this patch is of course backwards -compatible with libtool 1.5.x) ---- - ---- a/configure.in -+++ b/configure.in -@@ -29,6 +29,7 @@ AC_SUBST(LT_AGE) - - AC_ISC_POSIX - AC_PROG_CC -+AC_PROG_CXX - AM_PROG_CC_C_O - AC_HEADER_STDC - AC_PROG_LIBTOOL diff --git a/packages/hal/hal-0.5.11/wifi-2.6.27.diff b/packages/hal/hal-0.5.11/wifi-2.6.27.diff deleted file mode 100644 index 4b41c2881c..0000000000 --- a/packages/hal/hal-0.5.11/wifi-2.6.27.diff +++ /dev/null @@ -1,64 +0,0 @@ -Index: hal-0.5.11/hald/linux/device.c -=================================================================== ---- hal-0.5.11.orig/hald/linux/device.c -+++ hal-0.5.11/hald/linux/device.c -@@ -45,6 +45,10 @@ - #include <linux/input.h> - #endif - -+/* for wireless extensions */ -+#include <linux/if.h> -+#include <linux/wireless.h> -+ - #include <dbus/dbus.h> - #include <dbus/dbus-glib.h> - -@@ -532,10 +536,14 @@ net_add (const gchar *sysfs_path, const - const char *addr; - const char *parent_subsys; - char bridge_path[HAL_PATH_MAX]; -- char wireless_path[HAL_PATH_MAX]; -- char wiphy_path[HAL_PATH_MAX]; -+ char phy80211_path[HAL_PATH_MAX]; - struct stat s; - dbus_uint64_t mac_address = 0; -+ int ioctl_fd; -+ struct iwreq iwr; -+ -+ ioctl_fd = socket (PF_INET, SOCK_DGRAM, 0); -+ strncpy (iwr.ifr_ifrn.ifrn_name, ifname, IFNAMSIZ); - - addr = hal_device_property_get_string (d, "net.address"); - if (addr != NULL) { -@@ -554,9 +562,8 @@ net_add (const gchar *sysfs_path, const - } - - snprintf (bridge_path, HAL_PATH_MAX, "%s/bridge", sysfs_path); -- snprintf (wireless_path, HAL_PATH_MAX, "%s/wireless", sysfs_path); -- /* wireless dscape stack e.g. from rt2500pci driver*/ -- snprintf (wiphy_path, HAL_PATH_MAX, "%s/wiphy", sysfs_path); -+ /* cfg80211 */ -+ snprintf (phy80211_path, HAL_PATH_MAX, "%s/phy80211", sysfs_path); - parent_subsys = hal_device_property_get_string (parent_dev, "info.subsystem"); - - if (parent_subsys && strcmp(parent_subsys, "bluetooth") == 0) { -@@ -564,8 +571,8 @@ net_add (const gchar *sysfs_path, const - hal_device_property_set_string (d, "info.category", "net.bluetooth"); - hal_device_add_capability (d, "net.bluetooth"); - hal_device_property_set_uint64 (d, "net.bluetooth.mac_address", mac_address); -- } else if ((stat (wireless_path, &s) == 0 && (s.st_mode & S_IFDIR)) || -- (stat (wiphy_path, &s) == 0 && (s.st_mode & S_IFDIR))) { -+ } else if ((ioctl (ioctl_fd, SIOCGIWNAME, &iwr) == 0) || -+ (stat (phy80211_path, &s) == 0 && (s.st_mode & S_IFDIR))) { - hal_device_property_set_string (d, "info.product", "WLAN Interface"); - hal_device_property_set_string (d, "info.category", "net.80211"); - hal_device_add_capability (d, "net.80211"); -@@ -581,6 +588,8 @@ net_add (const gchar *sysfs_path, const - hal_device_add_capability (d, "net.80203"); - hal_device_property_set_uint64 (d, "net.80203.mac_address", mac_address); - } -+ -+ close (ioctl_fd); - } else if (media_type == ARPHRD_IRDA) { - hal_device_property_set_string (d, "info.product", "Networking Interface"); - hal_device_property_set_string (d, "info.category", "net.irda"); |