Hello community,
here is the log from the commit of package hal
checked in at Fri Aug 10 17:09:39 CEST 2007.
--------
--- hal/hal.changes 2007-07-27 17:28:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2007-08-07 18:21:21.000000000 +0200
@@ -1,0 +2,67 @@
+Tue Aug 7 18:13:42 CEST 2007 - dkukawka@suse.de
+
+- updated hal/hal-info to current git ()
+- removed upstream gone patches:
+ - hal-cleanup_acpi-addon_DBusError_handling_v2.diff
+ - hal-fix-asprintf-compilerwarning.diff
+ - hal-fix-DellBrightness-addon.diff
+ - hal-fix-fd.o11290-get_ACPI_version.diff
+- added new patches:
+ - hal_remove_sysfs_and_proc_helpers_v2.diff: use now path to
+ sysfs and proc hardcoded
+- fixed hal-info package to activate WLAN killswitch fdi-files
+
+-------------------------------------------------------------------
+Mon Aug 6 14:25:50 CEST 2007 - dkukawka@suse.de
+
+- removed patches:
+ - hal-cleanup-deprecated_libhal-storage.diff :
+ removed temporary patch for deprecated functions.
+ NOTE: all deprecated functions shouldn't be used any longer
+ they get removed as soon as possible! They are already
+ marked as deprecated since 09/2006!
+
+-------------------------------------------------------------------
+Sat Aug 4 11:15:54 CEST 2007 - aj@suse.de
+
+- Require ConsoleKit-devel.
+
+-------------------------------------------------------------------
+Sat Aug 4 08:13:50 CEST 2007 - coolo@suse.de
+
+- fix devel requires
+
+-------------------------------------------------------------------
+Fri Aug 3 13:09:55 CEST 2007 - dkukawka@suse.de
+
+NOTE: package is currently untested (hal start and run, lshal work,
+ rest untested), that's why it's in beta:
+
+- updated HAL to current git trunk
+- updated hal-info to current git trunk
+- removed no longer needed patches:
+ - hal-pedantic-headers.diff
+ - hal-fix-SetPowerSave.diff
+ - hal-update-libparted_check.diff
+ - hal-fix-acpiIBM_brightness_up.diff
+ - hal-fix-mount_options_vfat.diff
+ - hal-fix-info.category_for_laptop_panel_v3.diff
+- Updated/ported patches:
+ - hal-add-standby-support.diff
+ - hal-cleanup_acpi-addon_DBusError_handling_v2.diff
+ - hal-fix-acpi_on_battery_discharging.diff
+- added new patches:
+ - hal-fix-asprintf-compilerwarning.diff
+ - hal-fix-DellBrightness-addon.diff
+ (stop addon if needed kernel module isn't loaded)
+ - hal-fix-fd.o11290-get_ACPI_version.diff
+ - hal-cleanup-deprecated_libhal-storage.diff
+ (remove long time deprecated libhal-storage policy code)
+- removed find_lang macro from spec file (there are no translations
+ anymore)
+- s/--with-doc-dir/--docdir/ and added --with-html-dir to get
+ all doc stuff to %{_datadir}/doc/packages/hal/
+- removed polkit and added consolekit to 'Required-Start:' of the
+ rc script, cleaned up the script
+
+-------------------------------------------------------------------
--- hal/hal-doc.changes 2007-07-27 17:28:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/hal-doc.changes 2007-08-07 18:21:22.000000000 +0200
@@ -1,0 +2,30 @@
+Thu Aug 2 13:03:56 CEST 2007 - dkukawka@suse.de
+
+NOTE: package is currently untested, that's why it's in beta
+
+- updated HAL to current git trunk
+- updated hal-info to current git trunk
+- removed no longer needed patches:
+ - hal-pedantic-headers.diff
+ - hal-fix-SetPowerSave.diff
+ - hal-update-libparted_check.diff
+ - hal-fix-acpiIBM_brightness_up.diff
+ - hal-fix-mount_options_vfat.diff
+ - hal-fix-info.category_for_laptop_panel_v3.diff
+- Updated/ported patches:
+ - hal-add-standby-support.diff
+ - hal-cleanup_acpi-addon_DBusError_handling_v2.diff
+ - hal-fix-acpi_on_battery_discharging.diff
+- added new patches:
+ - hal-fix-asprintf-compilerwarning.diff
+ - hal-fix-DellBrightness-addon.diff
+ (stop addon if needed kernel module isn't loaded)
+ - hal-fix-fd.o11290-get_ACPI_version.diff
+ - hal-cleanup-deprecated_libhal-storage.diff
+ (remove long time deprecated libhal-storage policy code)
+- removed find_lang macro from spec file (there are no translations
+ anymore)
+- workaround: configure don't respect --with-doc-dir atm, doc go
+ to %{_datadir}/doc/packages/hal-%{version}
+
+-------------------------------------------------------------------
Old:
----
hal-0.5.8_git200704021230.tar.bz2
hal-cleanup_acpi-addon_DBusError_handling.diff
hal-fix-acpiIBM_brightness_up.diff
hal-fix-info.category_for_laptop_panel_v3.diff
hal-fix-mount_options_vfat.diff
hal-fix-SetPowerSave.diff
hal-info-200704021230.tar.bz2
hal-pedantic-headers.diff
hal-update-libparted_check.diff
New:
----
hal-0.5.9_git20070807.tar.bz2
hal-cleanup-deprecated_libhal-storage.diff
hal-info-20070807.tar.bz2
hal_remove_sysfs_and_proc_helpers_v2.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.nc1634/_old 2007-08-10 17:06:44.000000000 +0200
+++ /var/tmp/diff_new_pack.nc1634/_new 2007-08-10 17:06:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hal-doc (Version 0.5.8_git200704021230)
+# spec file for package hal-doc (Version 0.5.9_git20070807)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,14 +18,15 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
+%define hal_info_version 20070807
URL: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License, HAL is licensed to you under your choice of the Academic Free
Group: System/Daemons
-Version: 0.5.8_git200704021230
-Release: 41
+Version: 0.5.9_git20070807
+Release: 2
Autoreqprov: on
Requires: pm-utils
-BuildRequires: PolicyKit-devel dbus-1-glib-devel glib2-devel intltool libexpat-devel libusb libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
+BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
%ifarch %ix86 x86_64
BuildRequires: libsmbios-libs >= 0.13.4
BuildRequires: libsmbios-devel >= 0.13.4
@@ -51,7 +52,7 @@
#
# Sources:
Source0: hal-%{version}.tar.bz2
-Source1: hal-info-200704021230.tar.bz2
+Source1: hal-info-%{hal_info_version}.tar.bz2
Source2: rc.hal
Source3: 90-hal.rules
Source4: pre-checkin.sh
@@ -67,34 +68,26 @@
# submitted (or planed to do in next time) upstream patches
Patch100: hal-fix-util_compute_time_remaining_warning_highTime.diff
Patch101: hal-add_soundcard_fix_device_file_handling_v2.diff
-Patch102: hal-cleanup_acpi-addon_DBusError_handling.diff
-Patch103: hal-pedantic-headers.diff
-Patch104: hal-fix-SetPowerSave.diff
-Patch105: hal-update-libparted_check.diff
-Patch106: hal-fix-acpi_on_battery_discharging.diff
-Patch107: hal-fix-acpiIBM_brightness_up.diff
-Patch108: hal-allow_uid_gid_on_hfs_v2.diff
-Patch109: hal-fix-mount_options_vfat.diff
-Patch110: hal-fix-info.category_for_laptop_panel_v3.diff
+Patch102: hal-fix-acpi_on_battery_discharging.diff
+Patch103: hal-allow_uid_gid_on_hfs_v2.diff
+Patch104: hal-cleanup-deprecated_libhal-storage.diff
+Patch105: hal_remove_sysfs_and_proc_helpers_v2.diff
# need to backport
#Patch300: hal-temp.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%description
-HAL is a hardware abstraction layer and aims to provide a live list of
-devices present in the system at any point in time. HAL tries to
-understand both physical devices (such as PCI and USB) and the device
-classes (such as input, net, and block) physical devices have and it
-allows merging of information from device info files specific to a
-device.
-
-HAL provides a network API through D-BUS for querying devices and
-notifying when things change. Finally, HAL provides some monitoring (in
-an unintrusive way) of devices. Presently, ethernet link detection and
-volume mounts are monitored.
-
-This, and more, is all described in the HAL specification.
+HAL is a hardware abstraction layer and aims to provide a live list
+ofdevices present in the system at any point in time. HAL tries to
+understand both, physical devices (such as PCI and USB) and the device
+classes (such as input, net, and block) physical devices have. Besides
+it allows merging of information from device info files specific to a
+device. HAL provides a network API through D-BUS for querying devices
+and notifying when things change. Finally, HAL provides some monitoring
+(in an unintrusive way) of devices. Presently, ethernet link detection
+and volume mounts aremonitored. For further information, please refer
+to the HAL specification.
@@ -110,7 +103,7 @@
Summary: Developer package for HAL
Requires: %{name} = %{version}-%{release}, dbus-1-devel >= %{dbus_version}-%{dbus_release}, dbus-1-glib-devel >= %{dbus_version}-%{dbus_release}
%if 0%{?suse_version} > 1020
-Requires: libext2fs-devel, libblkid-devel, libuuid-devel, libcom_err-devel
+Requires: libext2fs-devel, libblkid-devel, libuuid-devel, libcom_err-devel, libusb-devel
%else
Requires: e2fsprogs-devel
%endif
@@ -142,27 +135,10 @@
Joe Shaw
David Zeuthen
-%package -n hal-gnome
-Summary: GNOME based device manager for HAL
-Requires: %{name} >= %{version}, dbus-1-python >= %{dbus_version}-%{dbus_release}, python-gtk, python-gnome
-Autoreqprov: on
-Group: System/GUI/GNOME
-
-%description -n hal-gnome
-GNOME program for displaying the devices detected by HAL
-
-
-
-Authors:
---------
- Danny Kukawka
- Kay Sievers
- Joe Shaw
- David Zeuthen
-
%endif
%prep
%setup -n hal-%{version} -a1
+chmod 644 tools/hal-functions
%patch0 -p1
%patch1 -p0
%patch2 -p1
@@ -171,14 +147,9 @@
%patch100 -p1
%patch101 -p1
%patch102 -p1
-%patch103
-%patch104 -p1
+%patch103 -p1
+#%patch104 -p1
%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
#%patch300 -p1
%build
@@ -193,33 +164,37 @@
--with-dbus-sys=/etc/dbus-1/system.d \
--with-hal-user=haldaemon \
--with-hal-group=haldaemon \
+ --docdir=%{_datadir}/doc/packages/hal \
+ --with-html-dir=%{_datadir}/doc/packages/hal/html \
--with-eject=/bin/eject \
--enable-acpi-acpid \
--disable-acpi-proc \
--enable-acpi-ibm \
--enable-acpi-toshiba \
--enable-parted \
+ --enable-console-kit \
%if %build_doc
- --with-doc-dir=%{_datadir}/doc/packages/hal \
--enable-gtk-doc \
--enable-docbook-docs \
--enable-doxygen-docs \
%endif
--enable-policy-kit
make %{?jobs:-j%jobs}
-pushd hal-info-*
+pushd hal-info-%{hal_info_version}
%configure \
- --disable-recall
+ --disable-recall \
+ --enable-killswitch-ipw-wlan
popd
%install
#install hal
%makeinstall
%if %build_doc
-install -m 644 {README,AUTHORS,ChangeLog,COPYING,NEWS} $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal
+install -m 644 {README,AUTHORS,ChangeLog,COPYING,NEWS} $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/
%endif
#install hal-info
-pushd hal-info-*
+pushd hal-info-%{hal_info_version}
%makeinstall
popd
%if %build_doc
@@ -231,6 +206,7 @@
rm -rf $RPM_BUILD_ROOT/%{_includedir}
rm -rf $RPM_BUILD_ROOT/%{_datadir}/hal
rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/PolicyKit
rm -rf $RPM_BUILD_ROOT/%{_localstatedir}
%else
mkdir -p $RPM_BUILD_ROOT/etc/hal
@@ -247,8 +223,7 @@
install -d $RPM_BUILD_ROOT/%{_localstatedir}/run/hal
install -d $RPM_BUILD_ROOT/%{_localstatedir}/cache/hald
rm -f $RPM_BUILD_ROOT/etc/hotplug.d/default/20-hal.hotplug
-rm -rf $RPM_BUILD_ROOT/usr/share/gtk-doc
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/
%endif
%if 0%{?suse_version} > 1020
@@ -263,8 +238,6 @@
%defattr(-, root, root)
%dir %{_datadir}/doc/packages/hal
%{_datadir}/doc/packages/hal/*
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/*
#
%else
#
@@ -298,7 +271,7 @@
%{insserv_cleanup}
/sbin/ldconfig
-%files -f %{name}.lang
+%files
%defattr(-, root, root)
%dir %{_sysconfdir}/dbus-1/system.d
%dir %{_sysconfdir}/hal
@@ -311,14 +284,9 @@
%config %{_sysconfdir}/dbus-1/system.d/hal.conf
%{_sysconfdir}/hal/*
%{_sysconfdir}/udev/rules.d/90-hal.rules
-%{_sysconfdir}/PolicyKit/privilege.d/*
-%{_bindir}/lshal
-%{_bindir}/hal-*-property
-%{_bindir}/hal-device
-%{_bindir}/hal-find-by-capability
-%{_bindir}/hal*lock*
-%{_bindir}/hal-disable-polling
+%{_bindir}/*
%{_datadir}/hal/fdi/*
+%{_datadir}/PolicyKit/policy/*
%{_libdir}/*hal*.so.*
%{_libexecdir}/hal/*
%{_mandir}/man1/*
@@ -335,15 +303,35 @@
%{_libdir}/lib*.la
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
-
-%files -n hal-gnome
-%defattr(-, root, root)
-%dir %{_datadir}/hal/device-manager
-%{_datadir}/hal/device-manager/*
-%{_bindir}/hal-device-manager
%endif
%changelog
+* Thu Aug 02 2007 - dkukawka@suse.de
+ NOTE: package is currently untested, that's why it's in beta
+- updated HAL to current git trunk
+- updated hal-info to current git trunk
+- removed no longer needed patches:
+ - hal-pedantic-headers.diff
+ - hal-fix-SetPowerSave.diff
+ - hal-update-libparted_check.diff
+ - hal-fix-acpiIBM_brightness_up.diff
+ - hal-fix-mount_options_vfat.diff
+ - hal-fix-info.category_for_laptop_panel_v3.diff
+- Updated/ported patches:
+ - hal-add-standby-support.diff
+ - hal-cleanup_acpi-addon_DBusError_handling_v2.diff
+ - hal-fix-acpi_on_battery_discharging.diff
+- added new patches:
+ - hal-fix-asprintf-compilerwarning.diff
+ - hal-fix-DellBrightness-addon.diff
+ (stop addon if needed kernel module isn't loaded)
+ - hal-fix-fd.o11290-get_ACPI_version.diff
+ - hal-cleanup-deprecated_libhal-storage.diff
+ (remove long time deprecated libhal-storage policy code)
+- removed find_lang macro from spec file (there are no translations
+ anymore)
+- workaround: configure don't respect --with-doc-dir atm, doc go
+ to %%{_datadir}/doc/packages/hal-%%{version}
* Fri Jul 27 2007 - dkukawka@suse.de
- fixed bugs
- b.n.c #274706: fixed typo in hal-fix-mount_options_vfat.diff
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.nc1634/_old 2007-08-10 17:06:44.000000000 +0200
+++ /var/tmp/diff_new_pack.nc1634/_new 2007-08-10 17:06:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hal (Version 0.5.8_git200704021230)
+# spec file for package hal (Version 0.5.9_git20070807)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,14 +18,15 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
+%define hal_info_version 20070807
URL: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License, HAL is licensed to you under your choice of the Academic Free
Group: System/Daemons
-Version: 0.5.8_git200704021230
-Release: 45
+Version: 0.5.9_git20070807
+Release: 2
Autoreqprov: on
Requires: pm-utils
-BuildRequires: PolicyKit-devel dbus-1-glib-devel glib2-devel intltool libexpat-devel libusb libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
+BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
%ifarch %ix86 x86_64
BuildRequires: libsmbios-libs >= 0.13.4
BuildRequires: libsmbios-devel >= 0.13.4
@@ -51,7 +52,7 @@
#
# Sources:
Source0: hal-%{version}.tar.bz2
-Source1: hal-info-200704021230.tar.bz2
+Source1: hal-info-%{hal_info_version}.tar.bz2
Source2: rc.hal
Source3: 90-hal.rules
Source4: pre-checkin.sh
@@ -67,34 +68,26 @@
# submitted (or planed to do in next time) upstream patches
Patch100: hal-fix-util_compute_time_remaining_warning_highTime.diff
Patch101: hal-add_soundcard_fix_device_file_handling_v2.diff
-Patch102: hal-cleanup_acpi-addon_DBusError_handling.diff
-Patch103: hal-pedantic-headers.diff
-Patch104: hal-fix-SetPowerSave.diff
-Patch105: hal-update-libparted_check.diff
-Patch106: hal-fix-acpi_on_battery_discharging.diff
-Patch107: hal-fix-acpiIBM_brightness_up.diff
-Patch108: hal-allow_uid_gid_on_hfs_v2.diff
-Patch109: hal-fix-mount_options_vfat.diff
-Patch110: hal-fix-info.category_for_laptop_panel_v3.diff
+Patch102: hal-fix-acpi_on_battery_discharging.diff
+Patch103: hal-allow_uid_gid_on_hfs_v2.diff
+Patch104: hal-cleanup-deprecated_libhal-storage.diff
+Patch105: hal_remove_sysfs_and_proc_helpers_v2.diff
# need to backport
#Patch300: hal-temp.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%description
-HAL is a hardware abstraction layer and aims to provide a live list of
-devices present in the system at any point in time. HAL tries to
-understand both physical devices (such as PCI and USB) and the device
-classes (such as input, net, and block) physical devices have and it
-allows merging of information from device info files specific to a
-device.
-
-HAL provides a network API through D-BUS for querying devices and
-notifying when things change. Finally, HAL provides some monitoring (in
-an unintrusive way) of devices. Presently, ethernet link detection and
-volume mounts are monitored.
-
-This, and more, is all described in the HAL specification.
+HAL is a hardware abstraction layer and aims to provide a live list
+ofdevices present in the system at any point in time. HAL tries to
+understand both, physical devices (such as PCI and USB) and the device
+classes (such as input, net, and block) physical devices have. Besides
+it allows merging of information from device info files specific to a
+device. HAL provides a network API through D-BUS for querying devices
+and notifying when things change. Finally, HAL provides some monitoring
+(in an unintrusive way) of devices. Presently, ethernet link detection
+and volume mounts aremonitored. For further information, please refer
+to the HAL specification.
@@ -110,7 +103,7 @@
Summary: Developer package for HAL
Requires: %{name} = %{version}-%{release}, dbus-1-devel >= %{dbus_version}-%{dbus_release}, dbus-1-glib-devel >= %{dbus_version}-%{dbus_release}
%if 0%{?suse_version} > 1020
-Requires: libext2fs-devel, libblkid-devel, libuuid-devel, libcom_err-devel
+Requires: libext2fs-devel, libblkid-devel, libuuid-devel, libcom_err-devel, libusb-devel
%else
Requires: e2fsprogs-devel
%endif
@@ -142,27 +135,10 @@
Joe Shaw
David Zeuthen
-%package -n hal-gnome
-Summary: GNOME based device manager for HAL
-Requires: %{name} >= %{version}, dbus-1-python >= %{dbus_version}-%{dbus_release}, python-gtk, python-gnome
-Autoreqprov: on
-Group: System/GUI/GNOME
-
-%description -n hal-gnome
-GNOME program for displaying the devices detected by HAL
-
-
-
-Authors:
---------
- Danny Kukawka
- Kay Sievers
- Joe Shaw
- David Zeuthen
-
%endif
%prep
%setup -n hal-%{version} -a1
+chmod 644 tools/hal-functions
%patch0 -p1
%patch1 -p0
%patch2 -p1
@@ -171,14 +147,9 @@
%patch100 -p1
%patch101 -p1
%patch102 -p1
-%patch103
-%patch104 -p1
+%patch103 -p1
+#%patch104 -p1
%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
#%patch300 -p1
%build
@@ -193,33 +164,37 @@
--with-dbus-sys=/etc/dbus-1/system.d \
--with-hal-user=haldaemon \
--with-hal-group=haldaemon \
+ --docdir=%{_datadir}/doc/packages/hal \
+ --with-html-dir=%{_datadir}/doc/packages/hal/html \
--with-eject=/bin/eject \
--enable-acpi-acpid \
--disable-acpi-proc \
--enable-acpi-ibm \
--enable-acpi-toshiba \
--enable-parted \
+ --enable-console-kit \
%if %build_doc
- --with-doc-dir=%{_datadir}/doc/packages/hal \
--enable-gtk-doc \
--enable-docbook-docs \
--enable-doxygen-docs \
%endif
--enable-policy-kit
make %{?jobs:-j%jobs}
-pushd hal-info-*
+pushd hal-info-%{hal_info_version}
%configure \
- --disable-recall
+ --disable-recall \
+ --enable-killswitch-ipw-wlan
popd
%install
#install hal
%makeinstall
%if %build_doc
-install -m 644 {README,AUTHORS,ChangeLog,COPYING,NEWS} $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal
+install -m 644 {README,AUTHORS,ChangeLog,COPYING,NEWS} $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/
%endif
#install hal-info
-pushd hal-info-*
+pushd hal-info-%{hal_info_version}
%makeinstall
popd
%if %build_doc
@@ -231,6 +206,7 @@
rm -rf $RPM_BUILD_ROOT/%{_includedir}
rm -rf $RPM_BUILD_ROOT/%{_datadir}/hal
rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/PolicyKit
rm -rf $RPM_BUILD_ROOT/%{_localstatedir}
%else
mkdir -p $RPM_BUILD_ROOT/etc/hal
@@ -247,8 +223,7 @@
install -d $RPM_BUILD_ROOT/%{_localstatedir}/run/hal
install -d $RPM_BUILD_ROOT/%{_localstatedir}/cache/hald
rm -f $RPM_BUILD_ROOT/etc/hotplug.d/default/20-hal.hotplug
-rm -rf $RPM_BUILD_ROOT/usr/share/gtk-doc
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/
%endif
%if 0%{?suse_version} > 1020
@@ -263,8 +238,6 @@
%defattr(-, root, root)
%dir %{_datadir}/doc/packages/hal
%{_datadir}/doc/packages/hal/*
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/*
#
%else
#
@@ -298,7 +271,7 @@
%{insserv_cleanup}
/sbin/ldconfig
-%files -f %{name}.lang
+%files
%defattr(-, root, root)
%dir %{_sysconfdir}/dbus-1/system.d
%dir %{_sysconfdir}/hal
@@ -311,14 +284,9 @@
%config %{_sysconfdir}/dbus-1/system.d/hal.conf
%{_sysconfdir}/hal/*
%{_sysconfdir}/udev/rules.d/90-hal.rules
-%{_sysconfdir}/PolicyKit/privilege.d/*
-%{_bindir}/lshal
-%{_bindir}/hal-*-property
-%{_bindir}/hal-device
-%{_bindir}/hal-find-by-capability
-%{_bindir}/hal*lock*
-%{_bindir}/hal-disable-polling
+%{_bindir}/*
%{_datadir}/hal/fdi/*
+%{_datadir}/PolicyKit/policy/*
%{_libdir}/*hal*.so.*
%{_libexecdir}/hal/*
%{_mandir}/man1/*
@@ -335,15 +303,60 @@
%{_libdir}/lib*.la
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
-
-%files -n hal-gnome
-%defattr(-, root, root)
-%dir %{_datadir}/hal/device-manager
-%{_datadir}/hal/device-manager/*
-%{_bindir}/hal-device-manager
%endif
%changelog
+* Tue Aug 07 2007 - dkukawka@suse.de
+- updated hal/hal-info to current git ()
+- removed upstream gone patches:
+ - hal-cleanup_acpi-addon_DBusError_handling_v2.diff
+ - hal-fix-asprintf-compilerwarning.diff
+ - hal-fix-DellBrightness-addon.diff
+ - hal-fix-fd.o11290-get_ACPI_version.diff
+- added new patches:
+ - hal_remove_sysfs_and_proc_helpers_v2.diff: use now path to
+ sysfs and proc hardcoded
+- fixed hal-info package to activate WLAN killswitch fdi-files
+* Mon Aug 06 2007 - dkukawka@suse.de
+- removed patches:
+ - hal-cleanup-deprecated_libhal-storage.diff :
+ removed temporary patch for deprecated functions.
+ NOTE: all deprecated functions shouldn't be used any longer
+ they get removed as soon as possible! They are already
+ marked as deprecated since 09/2006!
+* Sat Aug 04 2007 - aj@suse.de
+- Require ConsoleKit-devel.
+* Sat Aug 04 2007 - coolo@suse.de
+- fix devel requires
+* Fri Aug 03 2007 - dkukawka@suse.de
+ NOTE: package is currently untested (hal start and run, lshal work,
+ rest untested), that's why it's in beta:
+- updated HAL to current git trunk
+- updated hal-info to current git trunk
+- removed no longer needed patches:
+ - hal-pedantic-headers.diff
+ - hal-fix-SetPowerSave.diff
+ - hal-update-libparted_check.diff
+ - hal-fix-acpiIBM_brightness_up.diff
+ - hal-fix-mount_options_vfat.diff
+ - hal-fix-info.category_for_laptop_panel_v3.diff
+- Updated/ported patches:
+ - hal-add-standby-support.diff
+ - hal-cleanup_acpi-addon_DBusError_handling_v2.diff
+ - hal-fix-acpi_on_battery_discharging.diff
+- added new patches:
+ - hal-fix-asprintf-compilerwarning.diff
+ - hal-fix-DellBrightness-addon.diff
+ (stop addon if needed kernel module isn't loaded)
+ - hal-fix-fd.o11290-get_ACPI_version.diff
+ - hal-cleanup-deprecated_libhal-storage.diff
+ (remove long time deprecated libhal-storage policy code)
+- removed find_lang macro from spec file (there are no translations
+ anymore)
+- s/--with-doc-dir/--docdir/ and added --with-html-dir to get
+ all doc stuff to %%{_datadir}/doc/packages/hal/
+- removed polkit and added consolekit to 'Required-Start:' of the
+ rc script, cleaned up the script
* Fri Jul 27 2007 - dkukawka@suse.de
- fixed bugs
- b.n.c #274706: fixed typo in hal-fix-mount_options_vfat.diff
++++++ hal-0.5.8_git200704021230.tar.bz2 -> hal-0.5.9_git20070807.tar.bz2 ++++++
++++ 123274 lines of diff (skipped)
++++++ hal-add-standby-support.diff ++++++
--- /var/tmp/diff_new_pack.nc1634/_old 2007-08-10 17:06:47.000000000 +0200
+++ /var/tmp/diff_new_pack.nc1634/_new 2007-08-10 17:06:47.000000000 +0200
@@ -104,31 +104,6 @@
/* TODO: add prober for PowerMac's */
if (should_decode_dmi) {
---- privileges/Makefile.am
-+++ privileges/Makefile.am
-@@ -7,6 +7,7 @@
- hal-storage-removable-mount.privilege \
- hal-storage-removable-mount-all-options.privilege \
- hal-power-suspend.privilege \
-+ hal-power-standby.privilege \
- hal-power-hibernate.privilege \
- hal-power-poweroff.privilege \
- hal-power-reboot.privilege
---- privileges/hal-power-standby.privilege
-+++ privileges/hal-power-standby.privilege
-@@ -0,0 +1,12 @@
-+
-+# This privilege specifies who is allowed to suspend the system.
-+
-+[Privilege]
-+RequiredPrivileges=
-+SufficientPrivileges=desktop-console
-+Allow=uid:root
-+Deny=
-+CanObtain=True
-+CanGrant=True
-+ObtainRequireRoot=False
-+
--- tools/Makefile.am
+++ tools/Makefile.am
@@ -88,6 +88,7 @@
@@ -235,3 +210,21 @@
+done
+
+exit $RET
+--- policy/hal-power.policy
++++ policy/hal-power.policy
+@@ -84,6 +84,15 @@ file are instantly applied.
+ </defaults>
+ </policy>
+
++ <policy id="hal-power-standby">
++ <description>Standby (S1) the system</description>
++ <message>System policy prevents standby (S1) the system</message>
++ <defaults>
++ no
++ yes
++ </defaults>
++ </policy>
++
+ <policy id="hal-power-cpufreq">
+ <description>Configure CPU frequency scaling</description>
+ <message>System policy prevents CPU frequency scaling to be configured</message>
++++++ hal-cleanup-deprecated_libhal-storage.diff ++++++
++++ 1207 lines (skipped)
++++++ hal-fix-acpi_on_battery_discharging.diff ++++++
--- /var/tmp/diff_new_pack.nc1634/_old 2007-08-10 17:06:47.000000000 +0200
+++ /var/tmp/diff_new_pack.nc1634/_new 2007-08-10 17:06:47.000000000 +0200
@@ -1,7 +1,13 @@
-diff --git a/hald/linux/acpi.c b/hald/linux/acpi.c
-index 3111170..7477670 100644
---- a/hald/linux/acpi.c
-+++ b/hald/linux/acpi.c
+--- a/hald/device_pm.c
++++ b/hald/device_pm.c
+@@ -32,6 +32,7 @@
+
+ #include
+
++#include "hald.h"
+ #include "logger.h"
+ #include "util_pm.h"
+ #include "device_pm.h"
@@ -208,8 +208,55 @@ battery_refresh_poll (HalDevice *d)
charging = hal_device_property_get_bool (d, "battery.rechargeable.is_charging");
discharging = hal_device_property_get_bool (d, "battery.rechargeable.is_discharging");
++++++ hal-info-200704021230.tar.bz2 -> hal-info-20070807.tar.bz2 ++++++
++++ 14822 lines of diff (skipped)
++++++ hal_remove_sysfs_and_proc_helpers_v2.diff ++++++
diff --git a/hald/linux/acpi.c b/hald/linux/acpi.c
index 924c64b..2aa14a4 100644
--- a/hald/linux/acpi.c
+++ b/hald/linux/acpi.c
@@ -637,7 +637,6 @@ laptop_panel_refresh (HalDevice *d, ACPIDevHandler *handler, gboolean force_full
br_levels = 8;
} else if (acpi_type == ACPI_TYPE_OMNIBOOK_DISPLAY) {
gchar *proc_lcd;
- gchar proc_path[HAL_PATH_MAX];
int current = -1;
int max = -1;
@@ -647,8 +646,7 @@ laptop_panel_refresh (HalDevice *d, ACPIDevHandler *handler, gboolean force_full
* There are different support brightness level, depending on
* the hardware and the kernel module version.
*/
- snprintf (proc_path, sizeof (proc_path), "%s/%s", get_hal_proc_path (), "omnibook");
- proc_lcd = hal_util_grep_file(proc_path, "lcd", "LCD brightness:", FALSE);
+ proc_lcd = hal_util_grep_file("/proc/omnibook", "lcd", "LCD brightness:", FALSE);
proc_lcd = g_strstrip (proc_lcd);
if (sscanf (proc_lcd, "%d (max value: %d)", ¤t, &max) == 2) {
br_levels = max + 1;
@@ -750,7 +748,6 @@ static void
acpi_synthesize (const gchar *path, int acpi_type)
{
const gchar *f;
- gchar _path[HAL_PATH_MAX];
gboolean is_laptop = FALSE;
GDir *dir;
GError *error = NULL;
@@ -771,8 +768,7 @@ acpi_synthesize (const gchar *path, int acpi_type)
if ( acpi_type == ACPI_TYPE_BATTERY ) {
is_laptop = TRUE;
} else if ( acpi_type == ACPI_TYPE_BUTTON ) {
- snprintf (_path, sizeof (_path), "%s/acpi/button/lid", get_hal_proc_path ());
- if ( strcmp (path, _path) == 0 )
+ if ( strcmp (path, "/proc/acpi/button/lid") == 0 )
is_laptop = TRUE;
} else if (_have_sysfs_lid_button) {
is_laptop = TRUE;
@@ -811,7 +807,7 @@ static void
acpi_synthesize_display (char *vendor, char *display, int method)
{
gchar path[HAL_PATH_MAX];
- snprintf (path, sizeof (path), "%s/%s/%s", get_hal_proc_path (), vendor, display);
+ snprintf (path, sizeof (path), "/proc/%s/%s", vendor, display);
/*
* We do not use acpi_synthesize as the target is not a directory full
* of directories, but a flat file list.
@@ -879,7 +875,6 @@ gboolean
acpi_synthesize_hotplug_events (void)
{
HalDevice *computer;
- gchar path[HAL_PATH_MAX];
if (!g_file_test ("/proc/acpi/", G_FILE_TEST_IS_DIR))
return FALSE;
@@ -904,28 +899,18 @@ acpi_synthesize_hotplug_events (void)
}
/* collect batteries */
- snprintf (path, sizeof (path), "%s/acpi/battery", get_hal_proc_path ());
- acpi_synthesize (path, ACPI_TYPE_BATTERY);
-
+ acpi_synthesize ("/proc/acpi/battery", ACPI_TYPE_BATTERY);
/* collect processors */
- snprintf (path, sizeof (path), "%s/acpi/processor", get_hal_proc_path ());
- acpi_synthesize (path, ACPI_TYPE_PROCESSOR);
-
+ acpi_synthesize ("/proc/acpi/processor", ACPI_TYPE_PROCESSOR);
/* collect fans */
- snprintf (path, sizeof (path), "%s/acpi/fan", get_hal_proc_path ());
- acpi_synthesize (path, ACPI_TYPE_FAN);
-
+ acpi_synthesize ("/proc/acpi/fan", ACPI_TYPE_FAN);
/* collect AC adapters */
- snprintf (path, sizeof (path), "%s/acpi/ac_adapter", get_hal_proc_path ());
- acpi_synthesize (path, ACPI_TYPE_AC_ADAPTER);
+ acpi_synthesize ("/proc/acpi/ac_adapter", ACPI_TYPE_AC_ADAPTER);
/* collect buttons */
- snprintf (path, sizeof (path), "%s/acpi/button/lid", get_hal_proc_path ());
- acpi_synthesize (path, ACPI_TYPE_BUTTON);
- snprintf (path, sizeof (path), "%s/acpi/button/power", get_hal_proc_path ());
- acpi_synthesize (path, ACPI_TYPE_BUTTON);
- snprintf (path, sizeof (path), "%s/acpi/button/sleep", get_hal_proc_path ());
- acpi_synthesize (path, ACPI_TYPE_BUTTON);
+ acpi_synthesize ("/proc/acpi/button/lid", ACPI_TYPE_BUTTON);
+ acpi_synthesize ("/proc/acpi/button/power", ACPI_TYPE_BUTTON);
+ acpi_synthesize ("/proc/acpi/button/sleep", ACPI_TYPE_BUTTON);
/*
* Collect video adaptors (from vendor added modules)
diff --git a/hald/linux/apm.c b/hald/linux/apm.c
index 8568c6a..11f56b9 100644
--- a/hald/linux/apm.c
+++ b/hald/linux/apm.c
@@ -278,7 +278,6 @@ apm_synthesize_hotplug_events (void)
{
gboolean ret;
HalDevice *computer;
- gchar path[HAL_PATH_MAX];
HotplugEvent *hotplug_event;
ret = FALSE;
@@ -297,18 +296,16 @@ apm_synthesize_hotplug_events (void)
/* Set appropriate properties on the computer object */
hal_device_property_set_string (computer, "power_management.type", "apm");
- snprintf (path, sizeof (path), "%s/apm", get_hal_proc_path ());
-
hotplug_event = g_new0 (HotplugEvent, 1);
hotplug_event->action = HOTPLUG_ACTION_ADD;
hotplug_event->type = HOTPLUG_EVENT_APM;
- g_strlcpy (hotplug_event->apm.apm_path, path, sizeof (hotplug_event->apm.apm_path));
+ g_strlcpy (hotplug_event->apm.apm_path, "/proc/apm", sizeof (hotplug_event->apm.apm_path));
hotplug_event->apm.apm_type = APM_TYPE_BATTERY;
hotplug_event_enqueue (hotplug_event);
hotplug_event = g_new0 (HotplugEvent, 1);
hotplug_event->type = HOTPLUG_EVENT_APM;
- g_strlcpy (hotplug_event->apm.apm_path, path, sizeof (hotplug_event->apm.apm_path));
+ g_strlcpy (hotplug_event->apm.apm_path, "/proc/apm", sizeof (hotplug_event->apm.apm_path));
hotplug_event->apm.apm_type = APM_TYPE_AC_ADAPTER;
hotplug_event_enqueue (hotplug_event);
diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
index 83c8781..392b490 100644
--- a/hald/linux/blockdev.c
+++ b/hald/linux/blockdev.c
@@ -175,7 +175,7 @@ blockdev_refresh_mount_state (HalDevice *d)
GSList *volume;
/* open /proc/mounts */
- g_snprintf (buf, sizeof (buf), "%s/mounts", get_hal_proc_path ());
+ g_snprintf (buf, sizeof (buf), "%s/mounts", "/proc");
if ((f = setmntent (buf, "r")) == NULL) {
HAL_ERROR (("Could not open /proc/mounts"));
return;
@@ -1240,7 +1240,7 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f
*
* "disk", "cdrom", "tape", "floppy", "UNKNOWN"
*/
- snprintf (buf, sizeof (buf), "%s/ide/%s", get_hal_proc_path (), hal_util_get_last_element (sysfs_path_real));
+ snprintf (buf, sizeof (buf), "/proc/ide/%s", hal_util_get_last_element (sysfs_path_real));
if (stat(buf, &st)) {
/*
* /proc/ide does not exist; try with sysfs
@@ -1778,7 +1778,7 @@ blockdev_process_mdstat (void)
if (sscanf (line, "md%d : ", &num) == 1) {
char *sysfs_path;
- sysfs_path = g_strdup_printf ("%s/block/md%d", get_hal_sysfs_path (), num);
+ sysfs_path = g_strdup_printf ("/sys/block/md%d", num);
read_md_devs = g_slist_prepend (read_md_devs, sysfs_path);
}
diff --git a/hald/linux/coldplug.c b/hald/linux/coldplug.c
index 934d4a4..30949ca 100644
--- a/hald/linux/coldplug.c
+++ b/hald/linux/coldplug.c
@@ -133,7 +133,7 @@ hal_util_init_sysfs_to_udev_map (void)
/* new device */
if (strncmp(line, "P: ", 3) == 0) {
hotplug_event = g_new0 (HotplugEvent, 1);
- g_strlcpy (hotplug_event->sysfs.sysfs_path, get_hal_sysfs_path (), sizeof(hotplug_event->sysfs.sysfs_path));
+ g_strlcpy (hotplug_event->sysfs.sysfs_path, "/sys", sizeof(hotplug_event->sysfs.sysfs_path));
g_strlcat (hotplug_event->sysfs.sysfs_path, &line[3], sizeof(hotplug_event->sysfs.sysfs_path));
continue;
}
@@ -341,8 +341,7 @@ scan_single_bus (const char *bus_name)
DIR *dir2;
struct dirent *dent2;
- g_strlcpy(dirname, get_hal_sysfs_path (), sizeof(dirname));
- g_strlcat(dirname, "/bus/", sizeof(dirname));
+ g_strlcpy(dirname, "/sys/bus/", sizeof(dirname));
g_strlcat(dirname, bus_name, sizeof(dirname));
g_strlcat(dirname, "/devices", sizeof(dirname));
@@ -370,8 +369,7 @@ static void scan_subsystem(const char *subsys)
DIR *dir;
struct dirent *dent;
- g_strlcpy(base, get_hal_sysfs_path (), sizeof(base));
- g_strlcat(base, "/", sizeof(base));
+ g_strlcpy(base, "/sys/", sizeof(base));
g_strlcat(base, subsys, sizeof(base));
dir = opendir(base);
@@ -412,14 +410,10 @@ static void scan_subsystem(const char *subsys)
static void scan_block(void)
{
- char base[HAL_PATH_MAX];
DIR *dir;
struct dirent *dent;
- g_strlcpy(base, get_hal_sysfs_path (), sizeof(base));
- g_strlcat(base, "/block", sizeof(base));
-
- dir = opendir(base);
+ dir = opendir("/sys/block");
if (dir != NULL) {
for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
char dirname[HAL_PATH_MAX];
@@ -435,8 +429,7 @@ static void scan_block(void)
continue;
}
- g_strlcpy(dirname, base, sizeof(dirname));
- g_strlcat(dirname, "/", sizeof(dirname));
+ g_strlcpy(dirname, "/sys/block/", sizeof(dirname));
g_strlcat(dirname, dent->d_name, sizeof(dirname));
if (device_list_insert(dirname, "block", HOTPLUG_EVENT_SYSFS_BLOCK) != 0)
continue;
@@ -466,14 +459,10 @@ static void scan_block(void)
static void scan_class(void)
{
- char base[HAL_PATH_MAX];
DIR *dir;
struct dirent *dent;
- g_strlcpy(base, get_hal_sysfs_path (), sizeof(base));
- g_strlcat(base, "/class", sizeof(base));
-
- dir = opendir(base);
+ dir = opendir("/sys/class");
if (dir != NULL) {
for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
char dirname[HAL_PATH_MAX];
@@ -483,8 +472,7 @@ static void scan_class(void)
if (dent->d_name[0] == '.')
continue;
- g_strlcpy(dirname, base, sizeof(dirname));
- g_strlcat(dirname, "/", sizeof(dirname));
+ g_strlcpy(dirname, "/sys/class/", sizeof(dirname));
g_strlcat(dirname, dent->d_name, sizeof(dirname));
dir2 = opendir(dirname);
if (dir2 != NULL) {
@@ -548,7 +536,6 @@ static int _device_order (const void *d1, const void *d2)
gboolean
coldplug_synthesize_events (void)
{
- char base[HAL_PATH_MAX];
struct stat statbuf;
if (hal_util_init_sysfs_to_udev_map () == FALSE) {
@@ -557,9 +544,7 @@ coldplug_synthesize_events (void)
}
/* if we have /sys/subsystem, forget all the old stuff */
- g_strlcpy(base, get_hal_sysfs_path (), sizeof(base));
- g_strlcat(base, "/subsystem", sizeof(base));
- if (stat(base, &statbuf) == 0) {
+ if (stat("/sys/subsystem", &statbuf) == 0) {
scan_subsystem ("subsystem");
device_list = g_slist_sort (device_list, _device_order);
queue_events ();
@@ -574,9 +559,7 @@ coldplug_synthesize_events (void)
queue_events ();
/* scan /sys/block, if it isn't already a class */
- g_strlcpy(base, get_hal_sysfs_path (), sizeof(base));
- g_strlcat(base, "/class/block", sizeof(base));
- if (stat(base, &statbuf) != 0) {
+ if (stat("/sys/class/block", &statbuf) != 0) {
scan_block ();
device_list = g_slist_sort (device_list, _device_order);
queue_events ();
diff --git a/hald/linux/device.c b/hald/linux/device.c
index f7e3ed5..45cd25b 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -960,13 +960,11 @@ dvb_compute_udi (HalDevice *d)
static void
asound_card_id_set (int cardnum, HalDevice *d, const char *propertyname)
{
- char aprocdir[256];
char linestart[5];
gchar *alsaname;
- snprintf (aprocdir, sizeof (aprocdir), "%s/asound", get_hal_proc_path ());
snprintf (linestart, sizeof (linestart), "%2d [", cardnum);
- alsaname = hal_util_grep_file_next_line (aprocdir, "cards", linestart, FALSE);
+ alsaname = hal_util_grep_file_next_line ("/proc/asound", "cards", linestart, FALSE);
if (alsaname != NULL) {
gchar *end;
end = strstr (alsaname, " at ");
@@ -1064,8 +1062,8 @@ sound_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_
if (!hal_util_set_string_from_file (d, "alsa.pcm_class", sysfs_path, "pcm_class"))
hal_device_property_set_string (d, "alsa.pcm_class", "unknown");
- snprintf (aprocdir, sizeof (aprocdir), "%s/asound/card%d/pcm%d%c",
- get_hal_proc_path (), cardnum, devicenum, type);
+ snprintf (aprocdir, sizeof (aprocdir), "/proc/asound/card%d/pcm%d%c",
+ cardnum, devicenum, type);
device_id = hal_util_grep_file (aprocdir, "info", "name: ", FALSE);
if (device_id != NULL) {
hal_device_property_set_string (d, "alsa.device_id", device_id);
@@ -1156,8 +1154,7 @@ sound_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_
asound_card_id_set (cardnum, d, "oss.card_id");
- snprintf (aprocdir, sizeof (aprocdir), "%s/asound/card%d/pcm0p",
- get_hal_proc_path (), cardnum);
+ snprintf (aprocdir, sizeof (aprocdir), "/proc/asound/card%d/pcm0p", cardnum);
device_id = hal_util_grep_file (aprocdir, "info", "name: ", FALSE);
if (device_id != NULL) {
hal_device_property_set_string (d, "oss.device_id", device_id);
diff --git a/hald/linux/hotplug.c b/hald/linux/hotplug.c
index 71000db..eb73f7e 100644
--- a/hald/linux/hotplug.c
+++ b/hald/linux/hotplug.c
@@ -144,7 +144,7 @@ hotplug_event_begin_sysfs (HotplugEvent *hotplug_event)
char sys_block_path[HAL_PATH_MAX];
gsize sys_block_path_len;
- sys_block_path_len = g_snprintf (sys_block_path, HAL_PATH_MAX, "%s/block", get_hal_sysfs_path ());
+ sys_block_path_len = g_snprintf (sys_block_path, HAL_PATH_MAX, "/sys/block");
if (strncmp (hotplug_event->sysfs.sysfs_path, sys_block_path, sys_block_path_len) == 0) {
HAL_INFO (("%s is a block device (devpath)", hotplug_event->sysfs.sysfs_path));
hotplug_event->type = HOTPLUG_EVENT_SYSFS_BLOCK;
diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index 717930e..3512c6a 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -65,23 +65,8 @@
#include "osspec_linux.h"
-static char *hal_sysfs_path;
-static char *hal_proc_path;
-
static gboolean hald_done_synthesizing_coldplug = FALSE;
-const gchar *
-get_hal_sysfs_path (void)
-{
- return hal_sysfs_path;
-}
-
-const gchar *
-get_hal_proc_path (void)
-{
- return hal_proc_path;
-}
-
static gboolean
hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
{
@@ -160,7 +145,7 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
}
g_snprintf (hotplug_event->sysfs.sysfs_path, sizeof (hotplug_event->sysfs.sysfs_path),
- "%s%s", hal_sysfs_path, &key[8]);
+ "/sys%s", &key[8]);
} else if (strncmp(key, "SUBSYSTEM=", 10) == 0)
g_strlcpy (hotplug_event->sysfs.subsystem, &key[10], sizeof (hotplug_event->sysfs.subsystem));
else if (strncmp(key, "DEVNAME=", 8) == 0)
@@ -335,7 +320,6 @@ osspec_privileged_init (void)
void
osspec_init (void)
{
- gchar path[HAL_PATH_MAX];
int udev_socket;
struct sockaddr_un saddr;
socklen_t addrlen;
@@ -368,22 +352,10 @@ osspec_init (void)
g_io_add_watch (udev_channel, G_IO_IN, hald_udev_data, NULL);
g_io_channel_unref (udev_channel);
- /*
- * set mount points for /proc and /sys, possibly overridden for testing
- */
- hal_sysfs_path = getenv ("SYSFS_PATH");
- if (hal_sysfs_path == NULL)
- hal_sysfs_path = "/sys";
-
- hal_proc_path = getenv ("PROC_PATH");
- if (hal_proc_path == NULL)
- hal_proc_path = "/proc";
-
/* watch /proc/mounts for mount tree changes
* kernel 2.6.15 vfs throws a POLLERR event for every change
*/
- g_snprintf (path, sizeof (path), "%s/mounts", get_hal_proc_path ());
- mounts_channel = g_io_channel_new_file (path, "r", NULL);
+ mounts_channel = g_io_channel_new_file ("/proc/mounts", "r", NULL);
if (mounts_channel == NULL)
DIE (("Unable to read /proc/mounts"));
g_io_add_watch (mounts_channel, G_IO_ERR, mount_tree_changed_event, NULL);
diff --git a/hald/linux/osspec_linux.h b/hald/linux/osspec_linux.h
index 41851c5..60645b9 100644
--- a/hald/linux/osspec_linux.h
+++ b/hald/linux/osspec_linux.h
@@ -29,10 +29,6 @@
#include
#include "../device.h"
-const gchar *get_hal_sysfs_path (void);
-
-const gchar *get_hal_proc_path (void);
-
gboolean hal_util_get_driver_name (const char *sysfs_path, gchar *driver_name);
gboolean hal_util_set_driver (HalDevice *d, const char *property_name, const char *sysfs_path);
diff --git a/hald/linux/pmu.c b/hald/linux/pmu.c
index b7944c1..7da7e26 100644
--- a/hald/linux/pmu.c
+++ b/hald/linux/pmu.c
@@ -106,9 +106,7 @@ battery_refresh (HalDevice *d, PMUDevHandler *handler)
hal_device_property_set_bool (d, "battery.rechargeable.is_charging", flags & PMU_BATT_CHARGING);
/* we're discharging if, and only if, we are not plugged into the wall */
{
- char buf[HAL_PATH_MAX];
- snprintf (buf, sizeof (buf), "%s/pmu/info", get_hal_proc_path ());
- hal_util_set_bool_elem_from_file (d, "battery.rechargeable.is_discharging", buf, "",
+ hal_util_set_bool_elem_from_file (d, "battery.rechargeable.is_discharging", "/proc/pmu/info", "",
"AC Power", 0, "0", FALSE);
}
@@ -304,7 +302,6 @@ pmu_synthesize_hotplug_events (void)
{
gboolean ret;
HalDevice *computer;
- gchar path[HAL_PATH_MAX];
GError *error;
GDir *dir;
gboolean has_battery_bays;
@@ -328,19 +325,17 @@ pmu_synthesize_hotplug_events (void)
hal_device_property_set_string (computer, "power_management.type", "pmu");
/* AC Adapter */
- snprintf (path, sizeof (path), "%s/pmu/info", get_hal_proc_path ());
- pmu_synthesize_item (path, PMU_TYPE_AC_ADAPTER);
+ pmu_synthesize_item ("/proc/pmu/info", PMU_TYPE_AC_ADAPTER);
error = NULL;
- snprintf (path, sizeof (path), "%s/pmu", get_hal_proc_path ());
- dir = g_dir_open (path, 0, &error);
+ dir = g_dir_open ("/proc/pmu/info", 0, &error);
if (dir != NULL) {
const gchar *f;
while ((f = g_dir_read_name (dir)) != NULL) {
gchar buf[HAL_PATH_MAX];
int battery_num;
- snprintf (buf, sizeof (buf), "%s/pmu/%s", get_hal_proc_path (), f);
+ snprintf (buf, sizeof (buf), "/proc/pmu/%s", f);
if (sscanf (f, "battery_%d", &battery_num) == 1) {
has_battery_bays = TRUE;
pmu_synthesize_item (buf, PMU_TYPE_BATTERY);
@@ -348,7 +343,7 @@ pmu_synthesize_hotplug_events (void)
}
} else {
- HAL_ERROR (("Couldn't open %s: %s", path, error->message));
+ HAL_ERROR (("Couldn't open /proc/pmu/info: %s", error->message));
g_error_free (error);
}
@@ -360,12 +355,10 @@ pmu_synthesize_hotplug_events (void)
*/
if (has_battery_bays) {
/* Add lid button */
- snprintf (path, sizeof (path), "%s/pmu/info", get_hal_proc_path ());
- pmu_synthesize_item (path, PMU_TYPE_LID_BUTTON);
+ pmu_synthesize_item ("/proc/pmu/info", PMU_TYPE_LID_BUTTON);
/* Add Laptop Panel */
- snprintf (path, sizeof (path), "%s/pmu/info", get_hal_proc_path ());
- pmu_synthesize_item (path, PMU_TYPE_LAPTOP_PANEL);
+ pmu_synthesize_item ("/proc/pmu/info", PMU_TYPE_LAPTOP_PANEL);
}
/* setup timer for things that we need to poll */
++++++ rc.hal ++++++
--- hal/rc.hal 2007-04-02 14:32:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/hal/rc.hal 2007-08-07 18:21:21.000000000 +0200
@@ -5,7 +5,7 @@
#
### BEGIN INIT INFO
# Provides: haldaemon
-# Required-Start: boot.localnet dbus policykitd
+# Required-Start: boot.localnet dbus consolekit
# Should-Start: acpid resmgr
# Required-Stop:
# Should-Stop:
@@ -31,8 +31,7 @@
HALDAEMON_PARA="--daemon=yes";
HALDAEMON_PIDDIR="/var/run/hal";
HALDAEMON_PID=$HALDAEMON_PIDDIR/haldaemon.pid;
-DBUSDAEMON_PIDDIR="/var/run/dbus";
-DBUSDAEMON_PID=$DBUSDAEMON_PIDDIR/pid;
+DBUSDAEMON_PID=/var/run/dbus/pid;
CPUFREQ_SYSFS_PATH="/sys/devices/system/cpu/cpu0/cpufreq"
LOGGER="/bin/logger -t rchal"
@@ -143,10 +142,6 @@
rm -f $HALDAEMON_PID;
fi
fi
-# if [ ! -e $DBUSDAEMON_PID ]; then
-# echo "DBUS is not running. Please start DBUS (or try 'rchal start-with-dbus').";
-# exit 1;
-# fi
echo -n "Starting HAL daemon";
startproc -p $HALDAEMON_PID $HALDAEMON_BIN $HALDAEMON_PARA
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org