Hello community,
here is the log from the commit of package hal
checked in at Mon Nov 3 12:10:30 CET 2008.
--------
--- hal/hal.changes 2008-10-24 16:23:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2008-10-31 17:33:15.000000000 +0100
@@ -1,0 +2,40 @@
+Fri Oct 31 16:59:50 CET 2008 - dkukawka@suse.de
+
+- update HAL to latest git (689d0503c45161) of my tree
+- this update includes fixes for:
+ - fix dm-device/LUKS handling (bnc#440612)
+
+-------------------------------------------------------------------
+Thu Oct 30 19:10:23 CET 2008 - dkukawka@suse.de
+
+- update HAL to latest git (b04aef9f3666a5) of my tree
+- this udate includes fixes for:
+ - adds support for cciss devices with recent kernel versions
+ (fix for bnc#433772)
+ - define volume.fstype.alternative.preferred
+ - add code to check if the generic (acpi) video module handles
+ brightness changes directly (brightness_in_hardware)
+ - fix for md storage device handling
+ - remove unused code from brightness scripts which is now handled
+ by an addon
+
+-------------------------------------------------------------------
+Tue Oct 28 23:06:36 CET 2008 - dkukawka@suse.de
+
+- update HAL to latest git (ae92796e39b566) and updated hal-info to
+ 20081027
+- this udate includes fixes for:
+ - reverted BDI related changes since the can cause trouble,
+ this mean the problem from bnc#433772 isn't solved yet
+ - biometric and biometric.fingerprint_reader code is now upstream
+ - fixed some trouble with handling usb/usb_class devices
+ - spec now defines new handling/keys for alternative filesystem/
+ mounthandlers as ntfs-3g, current mount code is able to handle
+ the changes already
+ - fixed spec for missing existing keys/properties
+ - some new suspend quirks, USB music players and modems
+- removed patches:
+ - hal-20081023-add_biometric_namespaces.diff
+ - hal-20081023-add_fingerprint_reader_ACL.diff
+
+-------------------------------------------------------------------
hal-doc.changes: same change
calling whatdependson for head-i586
Old:
----
hal-20081023-add_biometric_namespaces.diff
hal-20081023-add_fingerprint_reader_ACL.diff
hal-info-20081024.tar.bz2
New:
----
hal-info-20081027.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.ep1445/_old 2008-11-03 12:09:53.000000000 +0100
+++ /var/tmp/diff_new_pack.ep1445/_new 2008-11-03 12:09:53.000000000 +0100
@@ -26,10 +26,10 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20081024
+%define hal_info_version 20081027
%define libsmbios_version 2.0.2
Version: 0.5.12
-Release: 2
+Release: 3
Url: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License
Group: System/Daemons
@@ -82,8 +82,6 @@
Patch10: hal-20080828-add-standby-support_v3.diff
# submitted (or planed to do in next time) upstream patches
Patch100: hal-20081021-fix-docking-support.diff
-Patch101: hal-20081023-add_biometric_namespaces.diff
-Patch102: hal-20081023-add_fingerprint_reader_ACL.diff
# backports from git master:
#Patch200: hal-update-to_.diff
# revert from HEAD:
@@ -172,8 +170,6 @@
%patch2 -p1
%patch10 -p0
%patch100 -p1
-%patch101 -p1
-%patch102 -p1
#%patch200 -p1
#%patch300 -p1
#%patch1000 -p1
@@ -368,6 +364,37 @@
%endif
%changelog
+* Fri Oct 31 2008 dkukawka@suse.de
+- update HAL to latest git (689d0503c45161) of my tree
+- this update includes fixes for:
+ - fix dm-device/LUKS handling (bnc#440612)
+* Thu Oct 30 2008 dkukawka@suse.de
+- update HAL to latest git (b04aef9f3666a5) of my tree
+- this udate includes fixes for:
+ - adds support for cciss devices with recent kernel versions
+ (fix for bnc#433772)
+ - define volume.fstype.alternative.preferred
+ - add code to check if the generic (acpi) video module handles
+ brightness changes directly (brightness_in_hardware)
+ - fix for md storage device handling
+ - remove unused code from brightness scripts which is now handled
+ by an addon
+* Wed Oct 29 2008 dkukawka@suse.de
+- update HAL to latest git (ae92796e39b566) and updated hal-info to
+ 20081027
+- this udate includes fixes for:
+ - reverted BDI related changes since the can cause trouble,
+ this mean the problem from bnc#433772 isn't solved yet
+ - biometric and biometric.fingerprint_reader code is now upstream
+ - fixed some trouble with handling usb/usb_class devices
+ - spec now defines new handling/keys for alternative filesystem/
+ mounthandlers as ntfs-3g, current mount code is able to handle
+ the changes already
+ - fixed spec for missing existing keys/properties
+ - some new suspend quirks, USB music players and modems
+- removed patches:
+ - hal-20081023-add_biometric_namespaces.diff
+ - hal-20081023-add_fingerprint_reader_ACL.diff
* Fri Oct 24 2008 dkukawka@suse.de
- update HAL to latest git (98c2686104fc1c) and updated hal-info to
20081024
@@ -532,7 +559,7 @@
- hal-info-20080716-fix-acer-keymapping.diff: fixed Acer mapping,
added keys to allow blacklisting, use it now only for laptops,
added a TM 660
-* Wed Jul 16 2008 dkukawka@suse.de
+* Tue Jul 15 2008 dkukawka@suse.de
- added new patch:
- hal-info-20080715-add-CDMA_USB_modem.diff: add a CDMA USB
modem, info for fdi-file contributed by reporter via bnc#405332
@@ -562,7 +589,7 @@
- updated patch:
- hal-20080701-fix-get_storage.model_from_SCSI.diff: read from
layer only for IDE devices
-* Tue Jul 01 2008 dkukawka@suse.de
+* Mon Jun 30 2008 dkukawka@suse.de
- added new patch:
- hal-20080630-reuse-check_priv-code_for_helper.diff: added new
files util_helper_priv.{c/h} to reuse code of check_priv() in
@@ -598,7 +625,7 @@
- updated hal to git master and hal-info to 20080605
- removed patches:
- hal-update-to_41073645ea95e.diff
-* Sat May 24 2008 dkukawka@suse.de
+* Fri May 23 2008 dkukawka@suse.de
- updated hal-info to 20080523 including:
- bnc#378674: fix huawei e220 umts-modem
- bnc#391289: fix entry for HP hs2300 Broadband Wireless
@@ -777,7 +804,7 @@
- added new patches:
- hal-fix-dont_add_pci_device_without_pciID.diff: don't add pci
devices which don't have a PCI vendor or product ID
-* Tue Nov 27 2007 dkukawka@suse.de
+* Mon Nov 26 2007 dkukawka@suse.de
- added new patches:
- hal-cleanup_set_suspend_hibernate_keys.diff: reuse code, call
other codepaths only if really needed
@@ -810,7 +837,7 @@
- hal-linux-ignore_drivers_modules_uvents.diff: ignore on linux
all events for drivers and module subsystem events. We don't
need them atm.
-* Wed Nov 14 2007 dkukawka@suse.de
+* Tue Nov 13 2007 dkukawka@suse.de
- added patch:
- hal-fix-libhal_checkUDI_addParameterChecks.diff: check if a
given UDI is minimal valid, added some more parameter checks
@@ -1147,7 +1174,7 @@
the kernel, added support for Gateway tablet PCs
* Wed Mar 07 2007 sbrabec@suse.cz
- Updated BuildRequires: PolicyKit -> PolicyKit-devel.
-* Tue Mar 06 2007 dkukawka@suse.de
+* Mon Mar 05 2007 dkukawka@suse.de
- updated to current git HEAD and included hal-info, install
also NEWS/COPYING/Changelog ...
- removed upstream gone patches:
@@ -1586,7 +1613,7 @@
and 'data=' to ext3 allowed mount options)
* Fri Jan 27 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Tue Jan 24 2006 dkukawka@suse.de
+* Mon Jan 23 2006 dkukawka@suse.de
- fixed patch for the mount script
* Mon Jan 23 2006 dkukawka@suse.de
- fixed bug #141228 with patch from Kay Sievers to add scsi.type,
@@ -1718,7 +1745,7 @@
- hal-fix-is_laptop_and_APM.diff (fixed APM and set depending
on ACPI/APM battery and/or ACPI LID system.formfactor to
laptop, see bug #128072)
-* Fri Oct 21 2005 dkukawka@suse.de
+* Thu Oct 20 2005 dkukawka@suse.de
* added patches:
- updated PNP ID list (hal-add-update_pnp_ids.diff)
- removed PNP ID list changes in hal-add-wacom_tabletPC.diff
@@ -1784,7 +1811,7 @@
- Provide hotplugctl as well to really fix (#112953)
* Sun Aug 28 2005 ro@suse.de
- Obsolete hotplugctl [#112953] (Again!)
-* Sat Aug 27 2005 dkukawka@suse.de
+* Fri Aug 26 2005 dkukawka@suse.de
* updated to current release 0.5.4, Released August 26, 2005
for more information about changes, read News file
- removed upstream gone patches:
@@ -1819,7 +1846,7 @@
* hal-fix-ACPI_seqfault.diff
* hal-add-advanced_medium_detect.diff (patch from ervin@kde.org
and fixed/reworked by dkukawka@suse.de)
-* Sun Aug 21 2005 dkukawka@suse.de
+* Sat Aug 20 2005 dkukawka@suse.de
- added patch:
- hal-fix-hybrid_CDs.diff (fix for bug #105643)
* Sat Aug 20 2005 dkukawka@suse.de
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.ep1445/_old 2008-11-03 12:09:53.000000000 +0100
+++ /var/tmp/diff_new_pack.ep1445/_new 2008-11-03 12:09:53.000000000 +0100
@@ -26,10 +26,10 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20081024
+%define hal_info_version 20081027
%define libsmbios_version 2.0.2
Version: 0.5.12
-Release: 2
+Release: 3
Url: http://freedesktop.org/Software/hal
License: GPL v2 or later; AFL
Group: System/Daemons
@@ -82,8 +82,6 @@
Patch10: hal-20080828-add-standby-support_v3.diff
# submitted (or planed to do in next time) upstream patches
Patch100: hal-20081021-fix-docking-support.diff
-Patch101: hal-20081023-add_biometric_namespaces.diff
-Patch102: hal-20081023-add_fingerprint_reader_ACL.diff
# backports from git master:
#Patch200: hal-update-to_.diff
# revert from HEAD:
@@ -171,8 +169,6 @@
%patch2 -p1
%patch10 -p0
%patch100 -p1
-%patch101 -p1
-%patch102 -p1
#%patch200 -p1
#%patch300 -p1
#%patch1000 -p1
@@ -367,6 +363,37 @@
%endif
%changelog
+* Fri Oct 31 2008 dkukawka@suse.de
+- update HAL to latest git (689d0503c45161) of my tree
+- this update includes fixes for:
+ - fix dm-device/LUKS handling (bnc#440612)
+* Thu Oct 30 2008 dkukawka@suse.de
+- update HAL to latest git (b04aef9f3666a5) of my tree
+- this udate includes fixes for:
+ - adds support for cciss devices with recent kernel versions
+ (fix for bnc#433772)
+ - define volume.fstype.alternative.preferred
+ - add code to check if the generic (acpi) video module handles
+ brightness changes directly (brightness_in_hardware)
+ - fix for md storage device handling
+ - remove unused code from brightness scripts which is now handled
+ by an addon
+* Wed Oct 29 2008 dkukawka@suse.de
+- update HAL to latest git (ae92796e39b566) and updated hal-info to
+ 20081027
+- this udate includes fixes for:
+ - reverted BDI related changes since the can cause trouble,
+ this mean the problem from bnc#433772 isn't solved yet
+ - biometric and biometric.fingerprint_reader code is now upstream
+ - fixed some trouble with handling usb/usb_class devices
+ - spec now defines new handling/keys for alternative filesystem/
+ mounthandlers as ntfs-3g, current mount code is able to handle
+ the changes already
+ - fixed spec for missing existing keys/properties
+ - some new suspend quirks, USB music players and modems
+- removed patches:
+ - hal-20081023-add_biometric_namespaces.diff
+ - hal-20081023-add_fingerprint_reader_ACL.diff
* Fri Oct 24 2008 dkukawka@suse.de
- update HAL to latest git (98c2686104fc1c) and updated hal-info to
20081024
@@ -531,7 +558,7 @@
- hal-info-20080716-fix-acer-keymapping.diff: fixed Acer mapping,
added keys to allow blacklisting, use it now only for laptops,
added a TM 660
-* Wed Jul 16 2008 dkukawka@suse.de
+* Tue Jul 15 2008 dkukawka@suse.de
- added new patch:
- hal-info-20080715-add-CDMA_USB_modem.diff: add a CDMA USB
modem, info for fdi-file contributed by reporter via bnc#405332
@@ -561,7 +588,7 @@
- updated patch:
- hal-20080701-fix-get_storage.model_from_SCSI.diff: read from
layer only for IDE devices
-* Tue Jul 01 2008 dkukawka@suse.de
+* Mon Jun 30 2008 dkukawka@suse.de
- added new patch:
- hal-20080630-reuse-check_priv-code_for_helper.diff: added new
files util_helper_priv.{c/h} to reuse code of check_priv() in
@@ -597,7 +624,7 @@
- updated hal to git master and hal-info to 20080605
- removed patches:
- hal-update-to_41073645ea95e.diff
-* Sat May 24 2008 dkukawka@suse.de
+* Fri May 23 2008 dkukawka@suse.de
- updated hal-info to 20080523 including:
- bnc#378674: fix huawei e220 umts-modem
- bnc#391289: fix entry for HP hs2300 Broadband Wireless
@@ -776,7 +803,7 @@
- added new patches:
- hal-fix-dont_add_pci_device_without_pciID.diff: don't add pci
devices which don't have a PCI vendor or product ID
-* Tue Nov 27 2007 dkukawka@suse.de
+* Mon Nov 26 2007 dkukawka@suse.de
- added new patches:
- hal-cleanup_set_suspend_hibernate_keys.diff: reuse code, call
other codepaths only if really needed
@@ -809,7 +836,7 @@
- hal-linux-ignore_drivers_modules_uvents.diff: ignore on linux
all events for drivers and module subsystem events. We don't
need them atm.
-* Wed Nov 14 2007 dkukawka@suse.de
+* Tue Nov 13 2007 dkukawka@suse.de
- added patch:
- hal-fix-libhal_checkUDI_addParameterChecks.diff: check if a
given UDI is minimal valid, added some more parameter checks
@@ -1146,7 +1173,7 @@
the kernel, added support for Gateway tablet PCs
* Wed Mar 07 2007 sbrabec@suse.cz
- Updated BuildRequires: PolicyKit -> PolicyKit-devel.
-* Tue Mar 06 2007 dkukawka@suse.de
+* Mon Mar 05 2007 dkukawka@suse.de
- updated to current git HEAD and included hal-info, install
also NEWS/COPYING/Changelog ...
- removed upstream gone patches:
@@ -1585,7 +1612,7 @@
and 'data=' to ext3 allowed mount options)
* Fri Jan 27 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Tue Jan 24 2006 dkukawka@suse.de
+* Mon Jan 23 2006 dkukawka@suse.de
- fixed patch for the mount script
* Mon Jan 23 2006 dkukawka@suse.de
- fixed bug #141228 with patch from Kay Sievers to add scsi.type,
@@ -1717,7 +1744,7 @@
- hal-fix-is_laptop_and_APM.diff (fixed APM and set depending
on ACPI/APM battery and/or ACPI LID system.formfactor to
laptop, see bug #128072)
-* Fri Oct 21 2005 dkukawka@suse.de
+* Thu Oct 20 2005 dkukawka@suse.de
* added patches:
- updated PNP ID list (hal-add-update_pnp_ids.diff)
- removed PNP ID list changes in hal-add-wacom_tabletPC.diff
@@ -1783,7 +1810,7 @@
- Provide hotplugctl as well to really fix (#112953)
* Sun Aug 28 2005 ro@suse.de
- Obsolete hotplugctl [#112953] (Again!)
-* Sat Aug 27 2005 dkukawka@suse.de
+* Fri Aug 26 2005 dkukawka@suse.de
* updated to current release 0.5.4, Released August 26, 2005
for more information about changes, read News file
- removed upstream gone patches:
@@ -1818,7 +1845,7 @@
* hal-fix-ACPI_seqfault.diff
* hal-add-advanced_medium_detect.diff (patch from ervin@kde.org
and fixed/reworked by dkukawka@suse.de)
-* Sun Aug 21 2005 dkukawka@suse.de
+* Sat Aug 20 2005 dkukawka@suse.de
- added patch:
- hal-fix-hybrid_CDs.diff (fix for bug #105643)
* Sat Aug 20 2005 dkukawka@suse.de
++++++ hal-0.5.12.tar.bz2 ++++++
++++ 1826 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/ChangeLog new/hal-0.5.12/ChangeLog
--- old/hal-0.5.12/ChangeLog 2008-10-24 16:09:47.000000000 +0200
+++ new/hal-0.5.12/ChangeLog 2008-10-31 16:58:55.000000000 +0100
@@ -1,3 +1,326 @@
+commit 689d0503c451610d57645a4f8d316249c84a5746
+Author: Danny Kukawka
+Date: Fri Oct 31 15:58:49 2008 +0100
+
+ fix handling of Device Mapper devices for LUKS
+
+ HAL has currently a massive problem with Device Mapper devices,
+ especially on coldplug, and parallel device handling .
+
+ Since dm-devices are virtual devices and have no parent we can
+ never say (when HAL process the hotplug queue) which the related
+ parent storage device (e.g. /dev/sdb1) is and when it will be
+ available.
+
+ Changed HAL to identify dm-devices on hotplug/coldplug and to
+ mark them as such in the HotplugEvent with is_dm_device=TRUE.
+ When the hotplug queue get processed, delay all dm-device as long
+ as there are still non-dm block devices in the queue to be sure
+ that all block devices/volumes are available when the Device
+ Mapper block devices get handled.
+
+ hald/linux/coldplug.c | 10 +++++++++-
+ hald/linux/hotplug.c | 6 ++++++
+ hald/linux/hotplug.h | 3 +++
+ hald/linux/osspec.c | 5 +++++
+ 4 files changed, 23 insertions(+), 1 deletions(-)
+
+commit b04aef9f3666a54a3f1b3b002a7f5c417219ee9f
+Author: Danny Kukawka
+Date: Thu Oct 30 18:56:23 2008 +0100
+
+ fixed typo, adjust description of volume.fstype.alternative.preferred
+
+ Fixed typo (s/prefered/preferred) and adjusted description of
+ volume.fstype.alternative.preferred to me more clear.
+
+ doc/spec/hal-spec-properties.xml | 11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 6f451b8a2c2053b4d5d8b58609c215024a55ea0d
+Author: Danny Kukawka
+Date: Thu Oct 30 15:43:59 2008 +0100
+
+ check module parameter of acpi video to set brightness_in_hardware
+
+ Check the acpi video module parameter brightness_switch_enabled via
+ sysfs to find out of the kernel handles already brightness changes if
+ a brightness key get pressed.
+
+ This works only for the generic 'video' module and only on HAL
+ startup.
+ If someone change the module settings on runtime without reload the
+ module the value of brightness_in_hardware can be false. We can live
+ with this situation, since you should know what you do if you change
+ module parameter on runtime.
+
+ hald/linux/device.c | 18 ++++++++++++++++++
+ 1 files changed, 18 insertions(+), 0 deletions(-)
+
+commit fd4305a59fd0f3b9e5a7a260707e11ffebc4926d
+Author: Danny Kukawka
+Date: Thu Oct 30 13:46:34 2008 +0100
+
+ fixed md related code in hotplug_event_begin_add_blockdev()
+
+ Fixed md related code to find/set the parent devie in
+ hotplug_event_begin_add_blockdev().
+
+ hald/linux/blockdev.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0e3a8372e81129433ed05e3690495f3e7175fff6
+Author: Danny Kukawka
+Date: Thu Oct 30 13:45:04 2008 +0100
+
+ add cciss as possible storage.bus to spec
+
+ Added cciss as possible storage.bus to spec.
+
+ doc/spec/hal-spec-properties.xml | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit fbaab44886211e38b1e839eb53d52bf4e8ed12a7
+Author: Danny Kukawka
+Date: Thu Oct 30 13:41:33 2008 +0100
+
+ add support for HP Smart Array CCISS block devices
+
+ Added support for HP Smart Array CCISS block devices, which are
+ in recent kernel versions virtual block/storage devices and no
+ longer pci based (also if the Smart Array controller is a PCI
+ device).
+
+ hald/linux/blockdev.c | 118
+ +++++++++++++++++++++++++++++--------------------
+ 1 files changed, 70 insertions(+), 48 deletions(-)
+
+commit 0eba52b670c9ed169d45d53c06d90456ff0dc75f
+Author: Danny Kukawka
+Date: Wed Oct 29 18:42:20 2008 +0100
+
+ add volume.fstype.alternative.prefered to spec
+
+ Defined new key volume.fstype.alternative.prefered (string) in the
+ spec. The new property allows e.g. a distributor to define the
+ prefered alternative mount handler/filesystem. The key can get used
+ by mount tools to find out which filesystem should be used if more
+ than one alternative was defined.
+
+ doc/spec/hal-spec-properties.xml | 12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+commit a78b3c6b8fca7e3947cfb2c723cb4369135f4fca
+Author: Danny Kukawka
+Date: Wed Oct 29 13:57:15 2008 +0100
+
+ remove generic sysfs backlight from scripts
+
+ Removed generic sysfs backlight from scripts. This is now handled
+ by the hald-addon-generic-backlight.
+
+ tools/linux/hal-system-lcd-get-brightness-linux | 6 ------
+ tools/linux/hal-system-lcd-set-brightness-linux | 6 ------
+ 2 files changed, 0 insertions(+), 12 deletions(-)
+
+commit ae92796e39b5663b55cb262f3cfc83caa68b1510
+Author: Danny Kukawka
+Date: Tue Oct 28 22:57:00 2008 +0100
+
+ Revert "add support for bdi bases block devices"
+
+ This reverts commit 52390cd9e5f1ce48eb9b486044369f0e10a7865b.
+
+ hald/linux/blockdev.c | 30 ------------------------------
+ 1 files changed, 0 insertions(+), 30 deletions(-)
+
+commit e82777cccd0bdde2bffbcf63698c49f9e2d9f5a3
+Author: Danny Kukawka
+Date: Tue Oct 28 22:56:01 2008 +0100
+
+ revert BDI changes from SPEC
+
+ Reverted BDI changes from SPEC. Reverted commits:
+ - 51b8fcd53c31997d6b6bced7f6d735da12205f87
+ - 32f8cf992112a04578b89967e13635658c2ba59d
+
+ doc/spec/hal-spec-properties.xml | 77
+ --------------------------------------
+ 1 files changed, 0 insertions(+), 77 deletions(-)
+
+commit 058f79a288b4d10db8c34b74d3cdda82659e8761
+Author: Danny Kukawka
+Date: Tue Oct 28 22:54:47 2008 +0100
+
+ Revert "add support for the BDI subsystem"
+
+ This reverts commit acae87869d452b989b167acabd09554bab28cc5d.
+
+ Revert BDI related commits for now.
+
+ hald/linux/device.c | 60
+ +--------------------------------------------------
+ 1 files changed, 1 insertions(+), 59 deletions(-)
+
+commit 02ba46f2d0c5a6b1496764264d1f70038b99d7e5
+Author: Danny Kukawka
+Date: Tue Oct 28 10:37:36 2008 +0100
+
+ added comment to not change order of usb and usbclass handler
+
+ Added comment to not change order of usb and usbclass device
+ handler to prevent problems since both handle the usb subsystem.
+
+ TODO: Check if it's possible to rework usb and usbclass functions
+ to merge them together.
+
+ hald/linux/device.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 434b23a05ff61ca8c3002c6649831c14d5b96736
+Merge: 0c3ec43... 9ef488e...
+Author: Danny Kukawka
+Date: Mon Oct 27 18:36:30 2008 +0100
+
+ Merge branch 'master' of ssh://dkukawka@git.freedesktop.org/git/hal
+
+commit 9ef488ecd56ad36e89529fd6c4c50fb856acff49
+Author: Richard Hughes
+Date: Mon Oct 27 17:35:30 2008 +0000
+
+ revert a tiny bit of the device ording change as it breaks printer
+ detection
+
+ Plugging in a printer no longer automatically configures a queue
+ because hal
+ is failing to fill in 'printer.*' attributes.
+
+ Patch from Tim Waugh fixes things
+
+ hald/linux/device.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0c3ec436bfc5e6e64f0afc2baa82e80c16258aad
+Author: Danny Kukawka
+Date: Mon Oct 27 18:34:43 2008 +0100
+
+ added support for alternative fstype to Mount()
+
+ Added support for the new volume.fstype.alternative related
+ keys to hal-storage-mount.c for proper Mount() support.
+
+ tools/hal-storage-mount.c | 84
+ ++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 68 insertions(+), 16 deletions(-)
+
+commit c6eb44926efaa0e406ccab33964745e1f8e3e24d
+Author: Danny Kukawka
+Date: Mon Oct 27 18:25:12 2008 +0100
+
+ added new properties to mount alternative fstypes as e.g. ntfs-3g
+
+ Added new properties to mount alternative fstypes as e.g. ntfs-3g
+ to the spec:
+ - volume.fstype.alternative (string list)
+ --> e.g. ntfs-3g, ntfs-fuse
+ - volume.mount.[alternative].valid_options
+ --> e.g. volume.mount.ntfs-3g.valid_options={'ro','nodev',...}
+ - volume.unmount.[alternative].valid_options
+ --> e.g. volume.unmount.ntfs-3g.valid_options={'lazy',...}
+
+ These new keys need some changes in the existing mount tools (as
+ e.g. under KDE, GNOME) to use the new features. To take advantage
+ of the new keys, the related mount handler (or filesystem) as e.g.
+ ntfs-3g need to deliver a own FDI-file which set the needed keys.
+
+ To use the new feature with the Mount() method of the
+ org.freedesktop.Hal.Device.Volume interface the caller need to
+ pass the alternative fstype to the fstype parameter of the method.
+ Otherwise the original fstype (detected by HAL) is used to mount.
+ If a alternative fstype is passed to the method, only the in
+ volume.mount.[alternative].valid_options listed options are allowed.
+
+ doc/spec/hal-spec-properties.xml | 44
+ ++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 44 insertions(+), 0 deletions(-)
+
+commit fc00f5d6cfa53293329abfedbbcf2ff6876b94af
+Author: Danny Kukawka
+Date: Mon Oct 27 15:31:57 2008 +0100
+
+ added volume.(un)mount.valid_options to spec
+
+ Added volume.(un)mount.valid_options to spec, the properties
+ are available since ages, but not documented in the spec.
+
+ doc/spec/hal-spec-properties.xml | 22 ++++++++++++++++++++++
+ 1 files changed, 22 insertions(+), 0 deletions(-)
+
+commit bc81484d64f3fd7b16c6b82219803432b7410c54
+Author: Danny Kukawka
+Date: Mon Oct 27 13:32:38 2008 +0100
+
+ small cleanup for configure.in
+
+ Ssmall cleanup for configure.in: call AC_SUBST(LINUX_INPUT_H)
+ only once.
+
+ configure.in | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 736082b1945dd835d43c7d767d857d4e8bd68389
+Author: Holger Freyther
+Date: Mon Oct 27 13:04:02 2008 +0100
+
+ allow to cross compile hal with host and target having different
+ input.h
+
+ Allow to cross compile hal with host and target having different
+ input.h.
+
+ When the Makefile is picking /usr/include/linux/input.h and libc
+ kernel
+ headers are newer than the one for target I will get a nice compile
+ error
+ that the new keynames are not known.
+
+ The attached patch allows to inform hal where my input.h resides
+ and allows
+ to cross compile it.
+
+ configure.in | 5 +++++
+ tools/Makefile.am | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 4fc860155b36d7767222ed92e640c07fd4a92019
+Author: Danny Kukawka
+Date: Mon Oct 27 11:17:49 2008 +0100
+
+ added ACL/device access rules for fingerprint reader
+
+ Added ACL/device access rules for fingerprint reader.
+
+ fdi/policy/10osvendor/20-acl-management.fdi | 12 ++++++++++++
+ policy/org.freedesktop.hal.device-access.policy | 9 +++++++++
+ 2 files changed, 21 insertions(+), 0 deletions(-)
+
+commit af71a0cb2536741c8847ffdac395bd9f0b5eef83
+Author: Danny Kukawka
+Date: Mon Oct 27 11:15:11 2008 +0100
+
+ add biometric and biometric.fingerprint_reader namespace
+
+ Added new biometric and biometric.fingerprint_reader namespaces
+ to the spec.
+
+ Note: a library listed in biometric.fingerprint_reader.access_method
+ can create a own new subnamspace called e.g. (in case of libfprint)
+ biometric.fingerprint_reader.libfprint.*
+
+ doc/spec/hal-spec-properties.xml | 50
+ ++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 50 insertions(+), 0 deletions(-)
+
commit 98c2686104fc1c96fc529ce3d41bdb6335da9e13
Author: Guillem Jover
Date: Fri Oct 24 10:45:22 2008 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/configure.in new/hal-0.5.12/configure.in
--- old/hal-0.5.12/configure.in 2008-10-24 16:06:29.000000000 +0200
+++ new/hal-0.5.12/configure.in 2008-10-30 15:43:21.000000000 +0100
@@ -1021,7 +1021,11 @@
[Use an given Linux input.h rather than that installed on the system ()]))
if test "x$with_linux_input_header" != "x"; then
AC_DEFINE_UNQUOTED(HAL_LINUX_INPUT_HEADER_H, "$with_linux_input_header", [If set, the header to use instead of ])
+ LINUX_INPUT_H=$with_linux_input_header
+else
+ LINUX_INPUT_H=/usr/include/linux/input.h
fi
+AC_SUBST(LINUX_INPUT_H)
dnl
dnl SUBSETTING END
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/doc/spec/hal-spec-properties.xml new/hal-0.5.12/doc/spec/hal-spec-properties.xml
--- old/hal-0.5.12/doc/spec/hal-spec-properties.xml 2008-10-24 16:06:29.000000000 +0200
+++ new/hal-0.5.12/doc/spec/hal-spec-properties.xml 2008-10-30 18:54:36.000000000 +0100
@@ -796,77 +796,6 @@
technologies is assumed for this section to be useful.
</para>
- <sect2 id="device-properties-bdi">
- <title>
- bdi namespace
- </title>
- <para>
- Devices backing a memory (mmap) region, called Backing Device
- Information (BDI), are represented by device objects where
- <literal>info.subsystem</literal> equals <literal>bdi</literal>.
- The following properties are available for such device objects.
- </para>
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Key (type)</entry>
- <entry>Values</entry>
- <entry>Mandatory</entry>
- <entry>Description</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <literal>bdi.id</literal> (int)
- </entry>
- <entry></entry>
- <entry>Yes</entry>
- <entry>Device identification</entry>
- </row>
- <row>
- <entry>
- <literal>bdi.read_ahead_kb</literal> (int)
- </entry>
- <entry></entry>
- <entry>No</entry>
- <entry>
- Size of the read-ahead window in kilobytes
- For more information check the Linux kernel documentation
- </entry>
- </row>
- <row>
- <entry>
- <literal>bdi.min_ratio</literal> (int)
- </entry>
- <entry></entry>
- <entry>No</entry>
- <entry>
- The 'min_ratio' parameter contains information about the
- minimum percentage of the write-back cache to a particular
- device.
- For more information check the Linux kernel documentation
- </entry>
- </row>
- <row>
- <entry>
- <literal>bdi.max_ratio</literal> (int)
- </entry>
- <entry></entry>
- <entry>No</entry>
- <entry>
- The 'max_ratio' parameter contains information about the
- maximum percentage of the write-back cache a particular
- device can use.
- For more information check the Linux kernel documentation
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </sect2>
-
<sect2 id="device-properties-bluetooth_acl">
<title>bluetooth_acl namespace</title>
<para>
@@ -4296,6 +4225,56 @@
</informaltable>
</sect2>
+ <sect2 id="device-properties-biometric">
+ <title>
+ biometric namespace
+ </title>
+ <para>
+ Device objects with the capability <literal>biometric</literal> represent
+ a biometric device (e.g. fingerprint reader) . No namespace specific
+ properties.
+ </para>
+ </sect2>
+
+ <sect2 id="device-properties-biometric-fingerprint_reader">
+ <title>
+ biometric.fingerprint_reader namespace
+ </title>
+ <para>
+ Device objects with the capabilities <literal>biometric.fingerprint_reader</literal>
+ and <literal>biometric</literal> represent a biometric fingerprint reader.
+ </para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Key (type)</entry>
+ <entry>Values</entry>
+ <entry>Mandatory</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <literal>biometric.fingerprint_reader.access_method</literal> (strlist)
+ </entry>
+ <entry>example: libfprint</entry>
+ <entry>No</entry>
+ <entry>
+ Indicates installed device driver libraries that can handle this device.
+ These drivers can export information in
+ <literal>biometric.fingerprint_reader.[access_method]</literal> sub-namespaces.
+ Can also be used by libraries or programs providing extra device information
+ to indicate the presence of this information in the appropriate sub-namespace.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect2>
+
+
<sect2 id="device-properties-button">
<title>
button namespace
@@ -6186,9 +6165,9 @@
</row>
<row>
<entry></entry>
- <entry>bdi</entry>
+ <entry>cciss</entry>
<entry></entry>
- <entry>BDI (Backing Device Information) interface</entry>
+ <entry>HP Smart Array CCISS interface</entry>
</row>
<row>
<entry></entry>
@@ -7365,6 +7344,87 @@
</row>
<row>
<entry>
+ <literal>volume.mount.valid_options</literal> (string list)
+ </entry>
+ <entry>examples: ro, sync, noexec</entry>
+ <entry>
+ Yes, if the <literal>org.freedesktop.Hal.Device.Volume</literal> interface is
+ defined.
+ </entry>
+ <entry>List of the allowed (valid) mount options for the defined fstype.</entry>
+ </row>
+ <row>
+ <entry>
+ <literal>volume.unmount.valid_options</literal> (string list)
+ </entry>
+ <entry>examples: lazy</entry>
+ <entry>
+ No (only available if the <literal>org.freedesktop.Hal.Device.Volume</literal>
+ interface is defined)
+ </entry>
+ <entry>List of the allowed (valid) unmount options for the defined fstype.</entry>
+ </row>
+ <row>
+ <entry>
+ <literal>volume.fstype.alternative</literal> (string list)
+ </entry>
+ <entry>examples: ntfs-3g, ntfs-fuse</entry>
+ <entry>No (only if there is a alternative mount handler)</entry>
+ <entry>The allowed (and installed) alternative mount handler/filesystem(s).</entry>
+ </row>
+ <row>
+ <entry>
+ <literal>volume.fstype.alternative.preferred</literal> (string)
+ </entry>
+ <entry>examples: ntfs-3g</entry>
+ <entry>No</entry>
+ <entry>
+ The preferred alternative mount handler/filesystem. Allows e.g. a distributor
+ do define a preferred of the alternative handlers.
+ If not set, the default filesystem (defined by <literal>volume.fstype</literal>)
+ should be used (or let the <literal>fstype</literal> parameter of Mount() empty),
+ otherwise it must be the name of one of the alternative handlers, as in
+ <literal>volume.fstype.alternative</literal>.
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <literal>volume.mount.[alternative].valid_options</literal> (string list)
+ </entry>
+ <entry>examples: locale=, uid=</entry>
+ <entry>
+ Yes, if <literal>volume.fstype.alternative</literal> is set and if the
+ <literal>org.freedesktop.Hal.Device.Volume</literal> interface is defined.
+ </entry>
+ <entry>
+ List of the allowed (valid) mount options for the defined alternative filesystem
+ handler. Replace <literal>[alternative]</literal> in the property string with the
+ name of the alternative filesystem handler. For e.g. ntfs-3g the property would be:
+ <literal>volume.mount.ntfs-3g.valid_options</literal>.
+
+ NOTE: To mount the volume with the alternative handler/filesystem you have
+ to pass the correct (alternative) fstype parameter to the Mount() method
+ of the <literal>org.freedesktop.Hal.Device.Volume</literal> interface
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <literal>volume.unmount.[alternative].valid_options</literal> (string list)
+ </entry>
+ <entry>examples: lazy</entry>
+ <entry>
+ No, only available if <literal>volume.fstype.alternative</literal> is set and
+ if the <literal>org.freedesktop.Hal.Device.Volume</literal> interface is defined.
+ </entry>
+ <entry>
+ List of the allowed (valid) unmount options for the defined alternative filesystem
+ handler. Replace <literal>[alternative]</literal> in the property string with the
+ name of the alternative filesystem handler. For e.g. ntfs-3g the property would be:
+ <literal>volume.unmount.ntfs-3g.valid_options</literal>
+ </entry>
+ </row>
+ <row>
+ <entry>
<literal>volume.fsversion</literal> (string)
</entry>
<entry>example: FAT32</entry>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi new/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi
--- old/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi 2008-10-24 16:06:29.000000000 +0200
+++ new/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi 2008-10-30 15:43:21.000000000 +0100
@@ -74,6 +74,13 @@
<merge key="access_control.type" type="string">scanner</merge>
</match>
</match>
+ <match key="info.capabilities" contains="usbraw">
+ <match key="info.capabilities" sibling_contains="biometic.fingerprint_reader">
+ <append key="info.capabilities" type="strlist">access_control</append>
+ <merge key="access_control.file" type="copy_property">usbraw.device</merge>
+ <merge key="access_control.type" type="string">fingerprint-reader</merge>
+ </match>
+ </match>
<!-- support for Linux USB stack where linux.device_file is set (e.g. device node is on the main usb device) -->
<match key="info.subsystem" string="usb">
@@ -98,6 +105,11 @@
<merge key="access_control.type" type="string">obex</merge>
<merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
</match>
+ <match key="info.capabilities" contains="biometric.fingerprint_reader">
+ <append key="info.capabilities" type="strlist">access_control</append>
+ <merge key="access_control.type" type="string">fingerprint-reader</merge>
+ <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
+ </match>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/blockdev.c new/hal-0.5.12/hald/linux/blockdev.c
--- old/hal-0.5.12/hald/linux/blockdev.c 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/hald/linux/blockdev.c 2008-10-30 15:43:21.000000000 +0100
@@ -864,11 +864,13 @@
int floppy_num;
gboolean is_device_mapper;
gboolean is_md_device;
+ gboolean is_cciss_device;
int md_number;
is_device_mapper = FALSE;
is_fakevolume = FALSE;
is_md_device = FALSE;
+ is_cciss_device = FALSE;
HAL_INFO (("block_add: sysfs_path=%s dev=%s is_part=%d, parent=0x%08x",
sysfs_path, device_file, is_partition, parent));
@@ -889,7 +891,7 @@
/* set parent to root computer device object */
parent = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer");
if (parent == NULL)
- d = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer");
+ parent = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer");
} else {
sysfs_path_real = g_strdup (sysfs_path);
}
@@ -905,93 +907,82 @@
d = hal_device_new ();
- /* OK, no parent... it might a device-mapper device => check slaves/ subdir in sysfs */
+ /* OK, no parent... */
if (parent == NULL && !is_partition && !is_fakevolume && !hotplug_event->reposted) {
- DIR * dir;
- struct dirent *dp;
char path[HAL_PATH_MAX];
-
g_snprintf (path, HAL_PATH_MAX, "%s/slaves", sysfs_path);
- HAL_INFO (("Looking in %s for Device Mapper", path));
- if ((dir = opendir (path)) == NULL) {
- HAL_WARNING (("Unable to open %s: %s", path, strerror(errno)));
+ if (device_file && (strstr(device_file, "/dev/cciss/") != NULL)) {
+ /* ... it's a cciss (HP Smart Array CCISS) device */
+ if (g_file_test (path, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
+ HAL_DEBUG(("block_add: found cciss a base device"));
+
+ is_cciss_device = TRUE;
+ parent = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer");
+ if (parent == NULL)
+ parent = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer");
+ }
} else {
- while (((dp = readdir (dir)) != NULL) && (parent == NULL)) {
- char *link;
- char *target;
-
- link = g_strdup_printf ("%s/%s", path, dp->d_name);
- target = resolve_symlink (link);
- HAL_INFO ((" %s -> %s", link, target));
-
- if (target != NULL) {
- HalDevice *slave_volume;
-
- slave_volume = hal_device_store_match_key_value_string (hald_get_gdl (),
- "linux.sysfs_path",
- target);
- if (slave_volume != NULL) {
- const char *slave_volume_stordev_udi;
- const char *slave_volume_fstype;
-
- slave_volume_stordev_udi = hal_device_property_get_string (slave_volume, "block.storage_device");
- slave_volume_fstype = hal_device_property_get_string (slave_volume, "volume.fstype");
-
- /* Yup, we only support crypto_LUKS right now.
- *
- * In the future we can support other device-mapper mappings
- * such as LVM etc.
- */
- if (slave_volume_stordev_udi != NULL &&
- slave_volume_fstype != NULL &&
- (strcmp (slave_volume_fstype, "crypto_LUKS") == 0)) {
- HAL_INFO ((" slave_volume_stordev_udi='%s'!", slave_volume_stordev_udi));
- parent = hal_device_store_find (hald_get_gdl (), slave_volume_stordev_udi);
- if (parent != NULL) {
- HAL_INFO ((" parent='%s'!", hal_device_get_udi (parent)));
- hal_device_property_set_string (d, "volume.crypto_luks.clear.backing_volume", hal_device_get_udi (slave_volume));
- is_device_mapper = TRUE;
+ /* ... it might a device-mapper device => check slaves/ subdir in sysfs */
+ DIR * dir;
+ struct dirent *dp;
+
+ HAL_INFO (("Looking in %s for Device Mapper", path));
+
+ if ((dir = opendir (path)) == NULL) {
+ HAL_WARNING (("Unable to open %s: %s", path, strerror(errno)));
+ } else {
+ while (((dp = readdir (dir)) != NULL) && (parent == NULL)) {
+ char *link;
+ char *target;
+
+ link = g_strdup_printf ("%s/%s", path, dp->d_name);
+ target = resolve_symlink (link);
+ HAL_INFO ((" %s -> %s", link, target));
+
+ if (target != NULL) {
+ HalDevice *slave_volume;
+
+ slave_volume = hal_device_store_match_key_value_string (hald_get_gdl (),
+ "linux.sysfs_path",
+ target);
+ if (slave_volume != NULL) {
+ const char *slave_volume_stordev_udi;
+ const char *slave_volume_fstype;
+
+ slave_volume_stordev_udi = hal_device_property_get_string (slave_volume, "block.storage_device");
+ slave_volume_fstype = hal_device_property_get_string (slave_volume, "volume.fstype");
+
+ /* Yup, we only support crypto_LUKS right now.
+ *
+ * In the future we can support other device-mapper mappings
+ * such as LVM etc.
+ */
+ if (slave_volume_stordev_udi != NULL &&
+ slave_volume_fstype != NULL &&
+ (strcmp (slave_volume_fstype, "crypto_LUKS") == 0)) {
+ HAL_INFO ((" slave_volume_stordev_udi='%s'!", slave_volume_stordev_udi));
+ parent = hal_device_store_find (hald_get_gdl (), slave_volume_stordev_udi);
+ if (parent != NULL) {
+ HAL_INFO ((" parent='%s'!", hal_device_get_udi (parent)));
+ hal_device_property_set_string (d, "volume.crypto_luks.clear.backing_volume",
+ hal_device_get_udi (slave_volume));
+ is_device_mapper = TRUE;
+ }
}
+ } else {
+ HAL_INFO(("Couldn't find slave volume in devices"));
}
- } else {
- HAL_INFO(("Couldn't find slave volume in devices"));
}
+ g_free (target);
}
- g_free (target);
+ closedir(dir);
+ HAL_INFO (("Done looking in %s", path));
}
- closedir(dir);
- HAL_INFO (("Done looking in %s", path));
}
}
- /* handle virtual block devices */
- if (parent == NULL && !is_fakevolume && !hotplug_event->reposted && (strstr(sysfs_path, "virtual") != NULL) ) {
- char *link;
- char *target;
-
- HAL_INFO (("Check if this is a BDI based device ..."));
- link = g_strdup_printf ("%s/bdi", sysfs_path);
- if (g_file_test (link, G_FILE_TEST_IS_SYMLINK)) {
- target = resolve_symlink (link);
- if (target != NULL) {
- HAL_INFO (("Looks like a BDI based block device. Link->target: '%s' -> '%s'", link, target));
- /* try to find the parent device to this link */
- parent = hal_device_store_match_key_value_string (hald_get_gdl(), "linux.sysfs_path", target);
- }
- g_free (target);
- } else {
- char *parent_path = NULL;
-
- HAL_INFO (("This wasn't a BDI base device. Check now if it is a slave device ..."));
-
- parent_path = hal_util_get_parent_path (sysfs_path);
- if (parent_path)
- parent = hal_device_store_match_key_value_string (hald_get_gdl(), "linux.sysfs_path", parent_path);
- }
- }
-
if (parent == NULL) {
HAL_INFO (("Ignoring hotplug event - no parent"));
goto error;
@@ -1162,12 +1153,17 @@
is_hotpluggable = hal_device_property_get_bool (
d, "storage.hotpluggable");
- }
+ } else if (is_cciss_device) {
+ HAL_DEBUG (("block_add: parent=/org/freedesktop/Hal/devices/computer, is_cciss_device=true"));
+ hal_device_property_set_string (d, "storage.bus", "cciss");
+ }
break;
}
/* Check info.subsystem */
if ((bus = hal_device_property_get_string (d_it, "info.subsystem")) != NULL) {
+ HAL_DEBUG(("block_add: info.subsystem='%s'", bus));
+
if (strcmp (bus, "scsi") == 0) {
scsidev = d_it;
physdev = d_it;
@@ -1219,10 +1215,6 @@
physdev = d_it;
physdev_udi = udi_it;
hal_device_property_set_string (d, "storage.bus", "pci");
- } else if (strcmp (bus, "bdi") == 0) {
- physdev = d_it;
- physdev_udi = udi_it;
- hal_device_property_set_string (d, "storage.bus", "bdi");
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/coldplug.c new/hal-0.5.12/hald/linux/coldplug.c
--- old/hal-0.5.12/hald/linux/coldplug.c 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/hald/linux/coldplug.c 2008-10-31 15:38:18.000000000 +0100
@@ -96,7 +96,11 @@
if (info->device_file) {
g_snprintf (hotplug_event->sysfs.device_file, sizeof(hotplug_event->sysfs.device_file),
"%s/%s", dev_root, info->device_file);
- HAL_INFO(("with device file %s", hotplug_event->sysfs.device_file));
+ HAL_INFO(("with device file %s", hotplug_event->sysfs.device_file));
+ if (strstr(hotplug_event->sysfs.device_file, "/" DMPREFIX) != NULL) {
+ HAL_INFO (("Found a dm-device (%s) , mark it", hotplug_event->sysfs.device_file));
+ hotplug_event->sysfs.is_dm_device = TRUE;
+ }
}
if ((str = hal_util_strdup_valid_utf8(info->vendor)) != NULL) {
g_strlcpy (hotplug_event->sysfs.vendor, str, sizeof(hotplug_event->sysfs.vendor));
@@ -301,6 +305,10 @@
HAL_INFO (("new event (dev node from kernel name) '%s' '%s'", sysfs_path, path));
g_strlcpy(hotplug_event->sysfs.device_file, path, sizeof(hotplug_event->sysfs.device_file));
+ if (strstr(hotplug_event->sysfs.device_file, "/" DMPREFIX) != NULL) {
+ HAL_INFO (("Found a dm-device (%s) , mark it", hotplug_event->sysfs.device_file));
+ hotplug_event->sysfs.is_dm_device = TRUE;
+ }
}
no_node:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/device.c new/hal-0.5.12/hald/linux/device.c
--- old/hal-0.5.12/hald/linux/device.c 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/hald/linux/device.c 2008-10-30 15:43:49.000000000 +0100
@@ -98,6 +98,7 @@
{
HalDevice *d;
int max_brightness;
+ const char *id;
d = hal_device_new ();
hal_device_add_capability (d, "laptop_panel");
@@ -107,6 +108,23 @@
hal_device_property_set_string (d, "info.product", "Generic Backlight Device");
hal_device_property_set_string (d, "laptop_panel.access_method", "general");
+ id = hal_util_get_last_element (sysfs_path);
+ if (strstr(id, "acpi_video") != NULL) {
+ /* looks like the generic acpi video module */
+ const char *param;
+
+ /* Try to check the module parameter to decide if brightness_in_hardware should get set to true.
+ NOTE: this leads to wrong values if someone change the module parameter via
+ sysfs while HAL is running, but we can live with this situation! */
+ param = hal_util_get_string_from_file ("/sys/module/video/parameters/", "brightness_switch_enabled");
+
+ if (param && !strcmp(param, "Y")) {
+ hal_device_property_set_bool (d, "laptop_panel.brightness_in_hardware", TRUE);
+ } else {
+ hal_device_property_set_bool (d, "laptop_panel.brightness_in_hardware", FALSE);
+ }
+ }
+
hal_util_get_int_from_file (sysfs_path, "max_brightness", &max_brightness, 10);
hal_device_property_set_int (d, "laptop_panel.num_levels", max_brightness + 1);
return d;
@@ -127,57 +145,6 @@
/*--------------------------------------------------------------------------------------------------------------*/
static HalDevice *
-bdi_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev,
- const gchar *parent_path)
-{
- HalDevice *d;
- const gchar *id;
-
- d = NULL;
-
- if (parent_dev == NULL) {
- parent_dev = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer");
- if (parent_dev == NULL) {
- parent_dev = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer");
- if (parent_dev == NULL) {
- HAL_ERROR (("Device '%s' has no parent and couldn't find computer root object."));
- goto error;
- }
- }
- }
-
- d = hal_device_new ();
- hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
- hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "info.category", "bdi");
- hal_device_add_capability (d, "bdi");
- hal_device_property_set_string (d, "info.product", "Backing Device Information Device");
-
- id = hal_util_get_last_element (sysfs_path);
- hal_device_property_set_string (d, "bdi.id", id);
-
- hal_util_set_int_from_file (d, "bdi.read_ahead_kb", sysfs_path, "read_ahead_kb", 10);
- hal_util_set_int_from_file (d, "bdi.min_ratio", sysfs_path, "min_ratio", 10);
- hal_util_set_int_from_file (d, "bdi.max_ratio", sysfs_path, "max_ratio", 10);
-
-error:
- return d;
-}
-
-static gboolean
-bdi_compute_udi (HalDevice *d)
-{
- gchar udi[256];
-
- hald_compute_udi (udi, sizeof (udi), "%s_bdi_%s", hal_device_property_get_string (d, "info.parent"),
- hal_device_property_get_string (d, "bdi.id"));
- hal_device_set_udi (d, udi);
- return TRUE;
-}
-
-/*--------------------------------------------------------------------------------------------------------------*/
-
-static HalDevice *
bluetooth_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev,
const gchar *parent_path)
{
@@ -1443,6 +1410,7 @@
gint flags;
gint addr_len;
+ d = NULL;
d = hal_device_new ();
if (parent_dev == NULL) {
@@ -4082,13 +4050,6 @@
.remove = dev_remove
};
-static DevHandler dev_handler_bdi = {
- .subsystem = "bdi",
- .add = bdi_add,
- .compute_udi = bdi_compute_udi,
- .remove = dev_remove
-};
-
static DevHandler dev_handler_bluetooth =
{
.subsystem = "bluetooth",
@@ -4433,7 +4394,6 @@
static DevHandler *dev_handlers[] = {
&dev_handler_backlight,
- &dev_handler_bdi,
&dev_handler_bluetooth,
&dev_handler_ccw,
&dev_handler_ccwgroup,
@@ -4466,8 +4426,10 @@
&dev_handler_sound,
&dev_handler_tape,
&dev_handler_tape390,
- &dev_handler_usb,
+ /* Don't change order of usbclass and usb */
&dev_handler_usbclass,
+ &dev_handler_usb,
+ /* -------------------------------------- */
&dev_handler_usbraw,
&dev_handler_video4linux,
&dev_handler_vio,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/hotplug.c new/hal-0.5.12/hald/linux/hotplug.c
--- old/hal-0.5.12/hald/linux/hotplug.c 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/hald/linux/hotplug.c 2008-10-31 15:56:11.000000000 +0100
@@ -398,6 +398,12 @@
if (compare_event (hotplug_event, loop_event)) {
HAL_DEBUG (("event %s dependant on %s", hotplug_event->sysfs.sysfs_path, loop_event->sysfs.sysfs_path));
return TRUE;
+ } else if (hotplug_event->sysfs.is_dm_device) {
+ if ((loop_event->type == HOTPLUG_EVENT_SYSFS_BLOCK) && !loop_event->sysfs.is_dm_device) {
+ HAL_DEBUG (("event %s is dm-device, have at least one (%s) non-dm block device in queue -> held event.",
+ hotplug_event->sysfs.sysfs_path, loop_event->sysfs.sysfs_path ));
+ return TRUE;
+ }
}
}
return FALSE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/hotplug.h new/hal-0.5.12/hald/linux/hotplug.h
--- old/hal-0.5.12/hald/linux/hotplug.h 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/hald/linux/hotplug.h 2008-10-31 15:07:48.000000000 +0100
@@ -66,6 +66,9 @@
unsigned long long seqnum; /* kernel uevent sequence number */
int net_ifindex; /* Kernel ifindex for network devices */
+ /* if the device is a Device mapper device, used to prevent multiple string compares */
+ gboolean is_dm_device;
+
/* stuff udev may tell us about the device and we don't want to query */
char vendor[HAL_NAME_MAX];
char model[HAL_NAME_MAX];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/hald/linux/osspec.c new/hal-0.5.12/hald/linux/osspec.c
--- old/hal-0.5.12/hald/linux/osspec.c 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/hald/linux/osspec.c 2008-10-31 15:54:49.000000000 +0100
@@ -236,6 +236,11 @@
HAL_INFO (("Temporary workaround: ignoring temporary cryptsetup file"));
goto invalid;
}
+ if (hotplug_event->sysfs.device_file && (strstr (hotplug_event->sysfs.device_file, "/dm-") != NULL)) {
+ HAL_DEBUG (("Found a dm-device (%s), mark it", hotplug_event->sysfs.device_file));
+ hotplug_event->sysfs.is_dm_device = TRUE;
+ }
+
HAL_INFO (("SEQNUM=%lld, ACTION=%s, SUBSYSTEM=%s, DEVPATH=%s, DEVNAME=%s, IFINDEX=%d",
hotplug_event->sysfs.seqnum, action, hotplug_event->sysfs.subsystem, hotplug_event->sysfs.sysfs_path,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/policy/org.freedesktop.hal.device-access.policy new/hal-0.5.12/policy/org.freedesktop.hal.device-access.policy
--- old/hal-0.5.12/policy/org.freedesktop.hal.device-access.policy 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/policy/org.freedesktop.hal.device-access.policy 2008-10-30 15:43:21.000000000 +0100
@@ -19,6 +19,15 @@
<policyconfig>
+ <action id="org.freedesktop.hal.device-access.fingerprint-reader">
+ <description>Directly access to fingerprint reader devices</description>
+ <message>System policy prevents access to fingerprint readers</message>
+ <defaults>
+ no
+ yes
+ </defaults>
+ </action>
+
<action id="org.freedesktop.hal.device-access.audio-player">
<description>Directly access audio players</description>
<message>System policy prevents access to audio players</message>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/hal-storage-mount.c new/hal-0.5.12/tools/hal-storage-mount.c
--- old/hal-0.5.12/tools/hal-storage-mount.c 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/tools/hal-storage-mount.c 2008-10-30 15:43:21.000000000 +0100
@@ -469,6 +469,7 @@
char *action;
gboolean is_remount;
gboolean explicit_mount_point_given;
+ gboolean found_alternative_fstype = FALSE;
const char *end;
#ifdef __FreeBSD__
struct passwd *pw;
@@ -640,10 +641,76 @@
i++;
}
+ }
+
+ /* construct arguments to mount */
+ na = 0;
+
+ args[na++] = MOUNT;
+
+ if (strlen (mount_fstype) > 0) {
+ mount_do_fstype = (char *) map_fstype (mount_fstype);
+ if (volume && strcmp(mount_do_fstype, mount_fstype) == 0) {
+ /* there was nothing mapped and we have a volume */
+ const char *_fstype;
+
+ _fstype = libhal_volume_get_fstype (volume);
+ /* check if the given fstype differs from the volume.fstype */
+ if (_fstype && (strcmp(_fstype, mount_fstype) != 0)) {
+ /* the fstype differs from the give fstype mount options, check if it's allowed as alternative */
+ char **alternative;
+
+ dbus_error_init (&error);
+ alternative = libhal_device_get_property_strlist (hal_ctx, udi, "volume.fstype.alternative", &error);
+ if (dbus_error_is_set (&error)) {
+ unknown_error ("Cannot get volume.fstype.alternative");
+ dbus_error_free (&error);
+ } else if (alternative != NULL) {
+ for (i = 0; alternative[i] != NULL; i++) {
+#ifdef DEBUG
+ printf ("check volume.fstype.alternative[%d]='%s' for given fstype '%s'\n", i, alternative[i], mount_fstype);
+#endif
+ if (strcmp(alternative[i], mount_fstype) == 0) {
+ printf ("found_alternative_fstype = TRUE\n");
+ found_alternative_fstype = TRUE;
+ break;
+ }
+ }
+ libhal_free_string_array(alternative);
+ }
+ if (!found_alternative_fstype) {
+ /* We have a given fstype option, which isn't allowed as
+ as alternative fstype.
+ TODO: add error message and handling or exit/refuse mount
+ */
+ }
+
+ }
+ }
+
+ } else if (volume == NULL) {
+ /* non-pollable drive; force auto */
+ mount_do_fstype = "auto";
+ } else if (libhal_volume_get_fstype (volume) != NULL && strlen (libhal_volume_get_fstype (volume)) > 0) {
+ mount_do_fstype = (char *) map_fstype (libhal_volume_get_fstype (volume));
+ } else {
+ mount_do_fstype = "auto";
}
+ /* check the mount options */
dbus_error_init (&error);
- allowed_options = libhal_device_get_property_strlist (hal_ctx, udi, "volume.mount.valid_options", &error);
+
+ if (found_alternative_fstype) {
+ char key[128];
+
+ sprintf(key, "volume.mount.%s.valid_options", mount_do_fstype);
+#ifdef DEBUG
+ printf ("found alternative fstype='mount_do_fstype' checking now '%s'", key);
+#endif
+ allowed_options = libhal_device_get_property_strlist (hal_ctx, udi, key, &error);
+ } else {
+ allowed_options = libhal_device_get_property_strlist (hal_ctx, udi, "volume.mount.valid_options", &error);
+ }
if (dbus_error_is_set (&error)) {
unknown_error ("Cannot get volume.mount.valid_options");
dbus_error_free (&error);
@@ -727,21 +794,6 @@
}
}
-
- /* construct arguments to mount */
- na = 0;
-
- args[na++] = MOUNT;
- if (strlen (mount_fstype) > 0) {
- mount_do_fstype = (char *) map_fstype (mount_fstype);
- } else if (volume == NULL) {
- /* non-pollable drive; force auto */
- mount_do_fstype = "auto";
- } else if (libhal_volume_get_fstype (volume) != NULL && strlen (libhal_volume_get_fstype (volume)) > 0) {
- mount_do_fstype = (char *) map_fstype (libhal_volume_get_fstype (volume));
- } else {
- mount_do_fstype = "auto";
- }
args[na++] = MOUNT_TYPE_OPT;
args[na++] = mount_do_fstype;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/linux/hal-system-lcd-get-brightness-linux new/hal-0.5.12/tools/linux/hal-system-lcd-get-brightness-linux
--- old/hal-0.5.12/tools/linux/hal-system-lcd-get-brightness-linux 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/tools/linux/hal-system-lcd-get-brightness-linux 2008-10-30 15:43:21.000000000 +0100
@@ -7,12 +7,6 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-# we have /sys/class/backlight
-if [ -r "$HAL_PROP_LINUX_SYSFS_PATH/actual_brightness" ]; then
- value="`cat $HAL_PROP_LINUX_SYSFS_PATH/actual_brightness`"
- exit ${value}
-fi
-
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then
value="`hal-system-power-pmu getlcd`"
if [ $? -ne 0 ]; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/linux/hal-system-lcd-set-brightness-linux new/hal-0.5.12/tools/linux/hal-system-lcd-set-brightness-linux
--- old/hal-0.5.12/tools/linux/hal-system-lcd-set-brightness-linux 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/tools/linux/hal-system-lcd-set-brightness-linux 2008-10-30 15:43:21.000000000 +0100
@@ -7,12 +7,6 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-# we have /sys/class/backlight
-if [ -w "$HAL_PROP_LINUX_SYSFS_PATH/brightness" ]; then
- echo "$value" > $HAL_PROP_LINUX_SYSFS_PATH/brightness
- exit 0
-fi
-
if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then
hal-system-power-pmu setlcd $value
if [ $? -ne 0 ]; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-0.5.12/tools/Makefile.am new/hal-0.5.12/tools/Makefile.am
--- old/hal-0.5.12/tools/Makefile.am 2008-10-24 16:06:30.000000000 +0200
+++ new/hal-0.5.12/tools/Makefile.am 2008-10-30 15:43:21.000000000 +0100
@@ -79,7 +79,7 @@
if BUILD_KEYMAPS
if HAVE_GPERF
-hal-setup-keymap-keys.txt: /usr/include/linux/input.h
+hal-setup-keymap-keys.txt: @LINUX_INPUT_H@
awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@
hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt
++++++ hal-info-20081024.tar.bz2 -> hal-info-20081027.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081024/ChangeLog new/hal-info-20081027/ChangeLog
--- old/hal-info-20081024/ChangeLog 2008-10-24 16:15:25.000000000 +0200
+++ new/hal-info-20081027/ChangeLog 2008-10-28 23:25:11.000000000 +0100
@@ -1,3 +1,71 @@
+commit 1d0ca1d8461a1bcfa4a4fa08d52871d5d149acf0
+Author: Danny Kukawka
+Date: Tue Oct 28 11:01:41 2008 +0100
+
+ add HTC Diamond as USB music player
+
+ Added HTC Diamond as USB music player.
+
+ .../10freedesktop/10-usb-music-players.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ab0bb7cf3eea5cf167776efae4e3741e0c2a4d90
+Author: Sandy Armstrong
+Date: Tue Oct 28 09:19:51 2008 +0100
+
+ add HTC G1 music player (Android phone)
+
+ Add HTC G1 music player (Android phone), as reported by Sandy
+ Armstrong on the upstream ML.
+
+ .../10freedesktop/10-usb-music-players.fdi | 17
+ +++++++++++++++++
+ 1 files changed, 17 insertions(+), 0 deletions(-)
+
+commit 07ba23188231e98a631014d8fa9c1fbc75b4d6ca
+Author: Kenny Wickstrom
+Date: Mon Oct 27 13:09:36 2008 +0100
+
+ add suspend quirk for a Sony PCG-V505ECP
+
+ Added suspend quirk for a Sony PCG-V505ECP.
+
+ .../10freedesktop/20-video-quirk-pm-sony.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 26a80d2659e1f8e6828eb9a5f5fd7789afa69e9e
+Author: Danny Kukawka
+Date: Mon Oct 27 12:31:52 2008 +0100
+
+ add suspend quirk for a Lenovo X60s
+
+ Added adopted patch from Bryon Gill to support suspend
+ on a Lenovo X60s.
+
+ .../10freedesktop/20-video-quirk-pm-lenovo.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 194d29f3688755265b6907173e3201edd4fcbbf5
+Author: Mario Limonciello
+Date: Sat Oct 25 11:37:16 2008 +0200
+
+ fix wrong product ID in previous Novatel modem addition
+
+ Fix wrong product ID in previous Novatel modem addition, as reported
+ by Mario Limonciello on the upstream ML.
+
+ fdi/information/10freedesktop/10-modem.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0794198cb48fe59a473bd32f05d7b9d7197902a2
+Author: Dan Williams
+Date: Fri Oct 24 17:48:55 2008 -0400
+
+ [modem] add another Novatel variant
+
+ fdi/information/10freedesktop/10-modem.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
commit bc781bd454aff0bf51378c425c086552f3be4504
Author: Michael Meeks
Date: Fri Oct 24 14:50:12 2008 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081024/configure new/hal-info-20081027/configure
--- old/hal-info-20081024/configure 2008-10-24 16:14:44.000000000 +0200
+++ new/hal-info-20081027/configure 2008-10-28 23:24:33.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for hal-info 20081024.
+# Generated by GNU Autoconf 2.61 for hal-info 20081027.
#
# Report bugs to .
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='hal-info'
PACKAGE_TARNAME='hal-info'
-PACKAGE_VERSION='20081024'
-PACKAGE_STRING='hal-info 20081024'
+PACKAGE_VERSION='20081027'
+PACKAGE_STRING='hal-info 20081027'
PACKAGE_BUGREPORT='hal@lists.freedesktop.org'
ac_subst_vars='SHELL
@@ -1187,7 +1187,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures hal-info 20081024 to adapt to many kinds of systems.
+\`configure' configures hal-info 20081027 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1253,7 +1253,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hal-info 20081024:";;
+ short | recursive ) echo "Configuration of hal-info 20081027:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hal-info configure 20081024
+hal-info configure 20081027
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by hal-info $as_me 20081024, which was
+It was created by hal-info $as_me 20081027, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2050,7 +2050,7 @@
# Define the identity of the package.
PACKAGE=hal-info
- VERSION=20081024
+ VERSION=20081027
cat >>confdefs.h <<_ACEOF
@@ -4048,7 +4048,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by hal-info $as_me 20081024, which was
+This file was extended by hal-info $as_me 20081027, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4101,7 +4101,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-hal-info config.status 20081024
+hal-info config.status 20081027
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081024/fdi/information/10freedesktop/10-modem.fdi new/hal-info-20081027/fdi/information/10freedesktop/10-modem.fdi
--- old/hal-info-20081024/fdi/information/10freedesktop/10-modem.fdi 2008-10-24 14:45:12.000000000 +0200
+++ new/hal-info-20081027/fdi/information/10freedesktop/10-modem.fdi 2008-10-28 23:24:11.000000000 +0100
@@ -216,9 +216,9 @@
<!-- 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO,
5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO,
2x 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO,
- 5720 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E725 CDMA/EV-DO,
+ 2x 5720 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E725 CDMA/EV-DO,
-->
- <match key="@info.parent:usb.product_id" int_outof="0x8114;0x8117;0x8128;0x8129;0x8133">
+ <match key="@info.parent:usb.product_id" int_outof="0x8114;0x8117;0x8128;0x8129;0x8133;0x8134">
<match key="@info.parent:usb.interface.number" int="0">
<append key="modem.command_sets" type="strlist">IS-707-A</append>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081024/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20081027/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20081024/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-10-24 14:49:52.000000000 +0200
+++ new/hal-info-20081027/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-10-28 23:24:11.000000000 +0100
@@ -899,6 +899,23 @@
</match>
</match>
+ <!-- High Tech Computer Corp. -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0xbb4">
+ <!-- Android Phone, HTC Diamond -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0xc01;0xc13">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-midi</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ </match>
+ </match>
+
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi new/hal-info-20081027/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
--- old/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi 2008-10-24 14:45:12.000000000 +0200
+++ new/hal-info-20081027/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi 2008-10-28 23:24:11.000000000 +0100
@@ -10,7 +10,7 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix="63664DU">
+ <match key="system.hardware.product" prefix_outof="63664DU;1705CTO">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="6457">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi new/hal-info-20081027/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
--- old/hal-info-20081024/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi 2008-10-24 14:45:12.000000000 +0200
+++ new/hal-info-20081027/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi 2008-10-28 23:24:11.000000000 +0100
@@ -30,7 +30,7 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="PCG-Z1RMP;VGN-TX770P;VGN-FW11;VGN-TX670P">
+ <match key="system.hardware.product" contains_outof="PCG-Z1RMP;VGN-TX770P;VGN-FW11;VGN-TX670P;PCG-V505ECP">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org