rpms/hal/FC-5 hal-0.5.7-pcmcia-readers.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 hal.spec, 1.93, 1.94 sources, 1.40, 1.41
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 26 19:04:21 UTC 2006
Author: johnp
Update of /cvs/dist/rpms/hal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20687
Modified Files:
.cvsignore hal.spec sources
Added Files:
hal-0.5.7-pcmcia-readers.patch
Log Message:
- Point release from upstream that fixes HAL with new kernels
- Up minimum kernel version to 2.6.15
- Make PCMCIA card readers work again (#185557)
hal-0.5.7-pcmcia-readers.patch:
fdi/information/10freedesktop/10-usb-card-readers.fdi | 7 +++++++
hald/linux2/blockdev.c | 6 ++++++
2 files changed, 13 insertions(+)
--- NEW FILE hal-0.5.7-pcmcia-readers.patch ---
Index: fdi/information/10freedesktop/10-usb-card-readers.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi,v
retrieving revision 1.6
diff -u -p -r1.6 10-usb-card-readers.fdi
--- fdi/information/10freedesktop/10-usb-card-readers.fdi 15 Jan 2006 16:54:05 -0000 1.6
+++ fdi/information/10freedesktop/10-usb-card-readers.fdi 26 Mar 2006 20:44:28 -0000
@@ -3,6 +3,13 @@
<deviceinfo version="0.2">
<device>
+ <!-- Should probably move to separate file for pcmcia devices -->
+ <match key="storage.bus" string="pcmcia">
+ <match key="storage.model" contains="FLASH">
+ <merge key="storage.drive_type" type="string">compact_flash</merge>
+ </match>
+ </match>
+
<!-- Should probably move to separate file for firewire devices -->
<match key="storage.bus" string="ieee1394">
<match key="storage.model" string="FWIRE CF READER">
Index: hald/linux2/blockdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v
retrieving revision 1.39
diff -u -p -r1.39 blockdev.c
--- hald/linux2/blockdev.c 10 Mar 2006 18:46:16 -0000 1.39
+++ hald/linux2/blockdev.c 26 Mar 2006 20:44:29 -0000
@@ -768,6 +768,12 @@ hotplug_event_begin_add_blockdev (const
physdev = d_it;
physdev_udi = udi_it;
hal_device_property_set_string (d, "storage.bus", "ide");
+ /* want to continue here, because it may be pcmcia */
+ } else if (strcmp (bus, "pcmcia") == 0) {
+ physdev = d_it;
+ physdev_udi = udi_it;
+ is_hotpluggable = TRUE;
+ hal_device_property_set_string (d, "storage.bus", "pcmcia");
break;
} else if (strcmp (bus, "mmc") == 0) {
physdev = d_it;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 24 Feb 2006 17:17:34 -0000 1.39
+++ .cvsignore 26 Jul 2006 19:04:18 -0000 1.40
@@ -27,3 +27,4 @@
hal-0.5.5.1.cvs20060111.tar.gz
hal-0.5.7-0.cvs20060213.tar.gz
hal-0.5.7.tar.gz
+hal-0.5.7.1.tar.gz
Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/hal.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- hal.spec 25 Jul 2006 15:54:44 -0000 1.93
+++ hal.spec 26 Jul 2006 19:04:18 -0000 1.94
@@ -8,7 +8,7 @@
%define util_linux_version 2.12a-16
%define doxygen_version 1.3.9.1-1
%define initscripts_version 8.04-1
-%define kernel_version 2.6.11
+%define kernel_version 2.6.15
%define gettext_version 0.14.1-14
%define libusb_version 0.1.10a-1
%define dmidecode_version 2.7
@@ -18,15 +18,15 @@
Summary: Hardware Abstraction Layer
Name: hal
-Version: 0.5.7
-Release: 3.fc5.4
+Version: 0.5.7.1
+Release: 1%{?dist}
URL: http://www.freedesktop.org/Software/hal
Source0: %{name}-%{version}.tar.gz
Source1: 99-redhat-storage-policy-fixed-drives.fdi
Patch0: hal-0.5.7-fix-fedora-power-save.patch
Patch1: hal-0.5.7-lid-open-fix.patch
Patch2: hal-0.5.7-fix-for-nfs-and-autofs.patch
-Patch3: hal-0.5.7-expand-sysfs-names.patch
+Patch3: hal-0.5.7-pcmcia-readers.patch
License: AFL/GPL
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-root
@@ -92,7 +92,8 @@
%patch0 -p0 -b .fix-fedora-powersave
%patch1 -p1 -b .lid-open-fix
%patch2 -p1 -b .fix-for-nfs-and-autofs
-%patch3 -p1 -b .expand-sysfs-names
+%patch3 -p1 -b .pcmcia-readers
+
%build
%configure --disable-docbook-docs --with-os-type=redhat
@@ -197,6 +198,11 @@
%{_bindir}/hal-device-manager
%changelog
+* Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7.1-1
+- Point release from upstream that fixes HAL with new kernels
+- Up minimum kernel version to 2.6.15
+- Make PCMCIA card readers work again (#185557)
+
* Tue Jul 25 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-3.fc5.4
- Add patch so HAL can work with the larger sysfs name length in newer kernel
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 24 Feb 2006 17:17:34 -0000 1.40
+++ sources 26 Jul 2006 19:04:18 -0000 1.41
@@ -1 +1 @@
-4163afb8285db64e00e7b1392b401d92 hal-0.5.7.tar.gz
+d7a7741808ba130f8aff3f5d3b5689e4 hal-0.5.7.1.tar.gz
More information about the fedora-cvs-commits
mailing list