[arch-commits] Commit in hal/repos (3 files)

[Jan de Groot]

    Date: Tuesday, August 4, 2009 @ 15:52:45
  Author: jgc
Revision: 49206

Merged revisions 49205 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/hal/trunk

........
  r49205 | jgc | 2009-08-04 21:52:08 +0200 (Tue, 04 Aug 2009) | 2 lines
  
  upgpkg: hal 0.5.13-2
      Revert commit that adds SSB bus support. This commit breaks b43 and b44 wlan and lan
........

Added:
  hal/repos/testing-x86_64/revert-ssb.patch
    (from rev 49205, hal/trunk/revert-ssb.patch)
Modified:
  hal/repos/testing-x86_64/	(properties)
  hal/repos/testing-x86_64/PKGBUILD

------------------+
 PKGBUILD         |    9 +++--
 revert-ssb.patch |   86 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 3 deletions(-)


Property changes on: hal/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /hal/trunk:1-48324
   + /hal/trunk:1-49205

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-08-04 19:52:08 UTC (rev 49205)
+++ testing-x86_64/PKGBUILD	2009-08-04 19:52:45 UTC (rev 49206)
@@ -4,7 +4,7 @@
 
 pkgname=hal
 pkgver=0.5.13
-pkgrel=1
+pkgrel=2
 pkgdesc="Hardware Abstraction Layer"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
@@ -17,18 +17,21 @@
         hal
         cryptsetup_location.patch
         hal-0.5.9-hide-diagnostic.patch
-        mdraid-segfault.patch)
+        mdraid-segfault.patch
+        revert-ssb.patch)
 md5sums=('46ecc5d2e5bd964fb78099688f01bb6a'
          '277e96ac130d7bfce0b30f0b80db8782'
          'c688a3c6574699365926f4fef7441545'
          '4d4b6801a1cedca22b8bdd9db73b16fb'
-         '3732682a5fe3b2b5279ced988909f554')
+         '3732682a5fe3b2b5279ced988909f554'
+         'a802697cfff3f30968f9d929f814c518')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/cryptsetup_location.patch" || return 1
   patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch" || return 1
   patch -Np1 -i "${srcdir}/mdraid-segfault.patch" || return 1
+  patch -Np1 -R -i "${srcdir}/revert-ssb.patch" || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \

Copied: hal/repos/testing-x86_64/revert-ssb.patch (from rev 49205, hal/trunk/revert-ssb.patch)
===================================================================
--- testing-x86_64/revert-ssb.patch	                        (rev 0)
+++ testing-x86_64/revert-ssb.patch	2009-08-04 19:52:45 UTC (rev 49206)
@@ -0,0 +1,86 @@
+From 36d076bf26350e022731cb7c2c9f4e840dd25e37 Mon Sep 17 00:00:00 2001
+From: Matthew Garrett <mjg59 at srcf.ucam.org>
+Date: Wed, 15 Jul 2009 06:54:36 +0000
+Subject: add support for devices on the SSB bus
+
+This provides detection of e. g. Broadcom wifi (b43) or ethernet (b44) devices.
+
+This doesn't update the spec for the new bus, but has been used successfully
+for years, and other buses were recently committed without spec updates as
+well. With hal being phased out and in maintenance mode, that should be
+appropriate now.
+
+See thread at http://lists.freedesktop.org/archives/hal/2007-April/008080.html
+---
+diff --git a/hald/linux/device.c b/hald/linux/device.c
+index 2823650..5ebde5a 100644
+--- a/hald/linux/device.c
++++ b/hald/linux/device.c
+@@ -850,6 +850,43 @@ ide_compute_udi (HalDevice *d)
+ /*--------------------------------------------------------------------------------------------------------------*/
+ 
+ static HalDevice *
++ssb_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path)
++{
++	HalDevice *d;
++
++	d = hal_device_new ();
++	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
++	hal_device_property_set_string (d, "linux.sysfs_path_device", sysfs_path);
++	hal_device_property_set_string (d, "info.bus", "ssb");
++	if (parent_dev != NULL) {
++		hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
++	} else {
++		hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer");
++	}
++
++	hal_util_set_driver (d, "info.linux.driver", sysfs_path);
++
++	hal_device_property_set_string (d, "ssb.bus_id",
++					hal_util_get_last_element (sysfs_path));
++	return d;
++}
++
++static gboolean
++ssb_compute_udi (HalDevice *d)
++{
++	gchar udi[256];
++
++	hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
++			      "/org/freedesktop/Hal/devices/ssb_%s",
++			      hal_device_property_get_string (d, "xen.bus_id"));
++	hal_device_set_udi (d, udi);
++	hal_device_property_set_string (d, "info.udi", udi);
++	return TRUE;
++}
++
++/*--------------------------------------------------------------------------------------------------------------*/
++
++static HalDevice *
+ ieee1394_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path)
+ {
+ 	HalDevice *d;
+@@ -4283,6 +4320,13 @@ static DevHandler dev_handler_bluetooth =
+ 	.remove       = dev_remove
+ };
+ 
++static DevHandler dev_handler_ssb = {
++	.subsystem   = "ssb",
++	.add         = ssb_add,
++	.compute_udi = ssb_compute_udi,
++	.remove      = dev_remove
++};
++
+ /* s390 specific busses */
+ static DevHandler dev_handler_ccw = {
+ 	.subsystem   = "ccw",
+@@ -4683,6 +4727,7 @@ static DevHandler *dev_handlers[] = {
+ 	&dev_handler_serial,
+ 	&dev_handler_serio,
+ 	&dev_handler_sound,
++	&dev_handler_ssb,
+ 	&dev_handler_tape,
+ 	&dev_handler_tape390,
+ 	/* Don't change order of usbclass and usb */
+--
+cgit v0.8.2