hal: Branch 'master'
David Zeuthen
david at kemper.freedesktop.org
Thu Jul 27 18:50:24 PDT 2006
examples/volumed/Makefile.am | 3
examples/volumed/volumed.py | 103 ---------------------
libhal-policy/.gitignore | 7 -
packaging/fedora/hal.spec | 148 ------------------------------
packaging/suse/hal.spec | 208 -------------------------------------------
5 files changed, 469 deletions(-)
New commits:
diff-tree b0b549fdab66bc551de80a205f90e4ac0a30d877 (from 47328a31b8c0050ba63c6c44c320e986d83fdadf)
Author: David Zeuthen <davidz at redhat.com>
Date: Thu Jul 27 21:50:23 2006 -0400
Remove unused stuff.
Remove libhal-policy, examples/volumed (it's defunt) and packaging
(both Fedora and SUSE spec files look vastly different nowadays).
diff --git a/examples/volumed/Makefile.am b/examples/volumed/Makefile.am
deleted file mode 100644
index 9e12bce..0000000
--- a/examples/volumed/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-EXTRA_DIST = volumed.py
-
diff --git a/examples/volumed/volumed.py b/examples/volumed/volumed.py
deleted file mode 100755
index 5d7cf5e..0000000
--- a/examples/volumed/volumed.py
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/python
-
-import dbus
-import gtk
-import time
-
-# This is just a very very crude example of what a volume daemon could
-# look like... It actually doesn't mount anything; it only prints out
-# messages when it should mount/unmount stuff.
-#
-# A volume daemon should also support optical and floppy disks, it should
-# handle multi-session cdroms and much more. Maybe someone will write
-# this one day... Maybe the disc change stuff should even be in HAL?
-#
-# This requires udev with D-BUS enabled and HAL to work correctly
-#
-
-def get_mount_location(udi, device_name):
- """Given a the UDI for a device and the name of the device file,
- determine a name for the mount point"""
- return '/mnt/somewhere/unique%f'%(time.time())
-
-def attempt_mount(udi):
- """See if a block device has enough information so we can mount it"""
- dobj = hal_service.get_object(udi, 'org.freedesktop.Hal.Device')
- if (not mount_dict.has_key(udi)) and dobj.PropertyExists('block.device'):
- device = dobj.GetProperty('block.device')
- mount_location = get_mount_location(udi, device)
- print "mounting device=%s at %s udi=%s"%(device, mount_location, udi)
- mount_dict[udi] = mount_location
-
-def unmount(udi):
- """Unmount a device"""
- mount_location = mount_dict[udi]
- print "unmounting %s"%mount_location
- del mount_dict[udi]
-
-def device_changed(dbus_if, member, svc, obj_path, message):
- """Called when properties on a HAL device changes"""
- #print member
- udi = obj_path
- if udi in vol_list:
- attempt_mount(udi)
-
-def gdl_changed(dbus_if, member, svc, obj_path, message):
- """Called when a HAL device is added, removed or it got a
- new capability"""
- #print member
- if member=='NewCapability':
- [udi, cap] = message.get_args_list()
- if cap=='volume':
- if not udi in vol_list:
- vol_list.append(udi)
- bus.add_signal_receiver(device_changed,
- 'org.freedesktop.Hal.Device',
- 'org.freedesktop.Hal',
- udi)
- attempt_mount(udi)
-
- #print " %s %s"%(cap,udi)
-
- elif member=='DeviceRemoved':
- [udi] = message.get_args_list()
- if udi in vol_list:
- vol_list.remove(udi)
- bus.remove_signal_receiver(device_changed,
- 'org.freedesktop.Hal.Device',
- 'org.freedesktop.Hal',
- udi)
- unmount(udi)
-
- elif member=='DeviceAdded':
- [udi] = message.get_args_list()
- dobj = hal_service.get_object(udi, 'org.freedesktop.Hal.Device')
- #if dobj.PropertyExists('Capabilities'):
- # print ' caps=%s'%(dobj.GetProperty('Capabilities'))
- if dobj.QueryCapability('volume'):
- vol_list.append(udi)
- bus.add_signal_receiver(device_changed,
- 'org.freedesktop.Hal.Device',
- 'org.freedesktop.Hal',
- udi)
- attempt_mount(udi)
-
-def main():
- """Entry point"""
- global bus, hal_service, vol_list, mount_dict
-
- vol_list = []
- mount_dict = {}
-
- bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
- hal_service = bus.get_service('org.freedesktop.Hal')
-
- bus.add_signal_receiver(gdl_changed,
- 'org.freedesktop.Hal.Manager',
- 'org.freedesktop.Hal',
- '/org/freedesktop/Hal/Manager')
-
- gtk.mainloop()
-
-if __name__=='__main__':
- main()
diff --git a/libhal-policy/.gitignore b/libhal-policy/.gitignore
deleted file mode 100644
index 0e612c3..0000000
--- a/libhal-policy/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-*.o
diff --git a/packaging/fedora/hal.spec b/packaging/fedora/hal.spec
deleted file mode 100644
index 6e01c1e..0000000
--- a/packaging/fedora/hal.spec
+++ /dev/null
@@ -1,148 +0,0 @@
-%define expat_version 1.95.5
-%define glib2_version 2.2.0
-%define dbus_version 0.21
-
-Summary: Hardware Abstraction Layer
-Name: hal
-Version: 0.2.95
-Release: 1
-URL: http://www.freedesktop.org/software/hal/
-Source0: %{name}-%{version}.tar.gz
-License: AFL/GPL
-Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-root
-PreReq: chkconfig /usr/sbin/useradd
-Packager: David Zeuthen <david at fubar.dk>
-BuildRequires: expat-devel >= %{expat_version}
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: python python-devel
-Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
-Requires: glib2 >= %{glib2_version}
-
-%description
-
-HAL is daemon for collection and maintaining information from several
-sources about the hardware on the system. It provdes a live device
-list through D-BUS.
-
-
-%package gnome
-Summary: GNOME based device manager for HAL
-Group: Development/Libraries
-Requires: %name = %{version}-%{release}
-Requires: dbus-python >= %{dbus_version}
-Requires: pygtk2 >= 2.0.0
-Requires: gnome-python2 >= 2.0.0
-
-%description gnome
-GNOME program for displaying the devices detected by HAL
-
-
-%package devel
-Summary: Libraries and headers for HAL
-Group: Development/Libraries
-Requires: %name = %{version}-%{release}
-
-%description devel
-
-Headers and static libraries for HAL.
-
-
-%prep
-%setup -q
-
-%build
-
-%configure
-make
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%clean
-rm -rf %{buildroot}
-
-%pre
-# Add the "haldaemon" user
-/usr/sbin/useradd -c 'HAL daemon' \
- -s /sbin/nologin -r -d '/' haldaemon 2> /dev/null || :
-
-%post
-/sbin/ldconfig
-/sbin/chkconfig --add haldaemon
-
-%preun
-if [ $1 = 0 ]; then
- service haldaemon stop > /dev/null 2>&1
- /sbin/chkconfig --del haldaemon
-fi
-
-%postun
-/sbin/ldconfig
-if [ "$1" -ge "1" ]; then
- service haldaemon condrestart > /dev/null 2>&1
-fi
-
-%files
-%defattr(-,root,root)
-
-%doc COPYING ChangeLog NEWS
-
-%dir %{_sysconfdir}/dbus-1/system.d
-%config %{_sysconfdir}/dbus-1/system.d/hal.conf
-%config %{_sysconfdir}/rc.d/init.d/*
-%{_sysconfdir}/dev.d/default/hal.dev
-
-%{_sbindir}/hald
-
-%{_bindir}/lshal
-%{_bindir}/hal-get-property
-%{_bindir}/hal-set-property
-
-%{_libdir}/*hal*.so.*
-
-%{_libexecdir}/hal.hotplug
-%{_libexecdir}/hal.dev
-%{_sysconfdir}/hal/hald.conf
-/etc/hotplug.d/default/hal.hotplug
-
-%dir %{_datadir}/hal
-%dir %{_datadir}/hal/fdi
-%{_datadir}/hal/fdi/*
-
-
-
-%files devel
-%defattr(-,root,root)
-
-%{_libdir}/lib*.a
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*
-%{_includedir}/*
-
-
-
-%files gnome
-%defattr(-,root,root)
-
-%dir %{_datadir}/hal/device-manager
-%{_datadir}/hal/device-manager/*
-%{_bindir}/hal-device-manager
-
-
-
-
-%changelog
-* Sat May 15 2004 David Zeuthen <david at fubar.dk> 0.2.91-1
-- updated to new version
-
-* Sat May 15 2004 Owen Fraser-Green <owen at discobabe.net> 0.2.90-1
-- updated to new version
-
-* Tue Dec 30 2003 David Zeuthen <david at fubar.dk> 0.2.1-1
-- initial build
-
diff --git a/packaging/suse/hal.spec b/packaging/suse/hal.spec
deleted file mode 100644
index 7a0f5e3..0000000
--- a/packaging/suse/hal.spec
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# spec file for package hal (Version 0.5.4)
-#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
-#
-
-# norootforbuild
-# neededforbuild dbus-1 dbus-1-devel dbus-1-glib docbook-dsssl-stylesheets docbook-utils docbook_4 doxygen expat gtk2-devel-packages html-dtd intltool iso_ent libcap libpng libselinux libselinux-devel openjade opensp pciutils perl-XML-Parser popt popt-devel python python-devel sgml-skel xmlto
-
-BuildRequires: aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libcom_err libgcc libnscd libselinux libstdc++ libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed strace sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel atk atk-devel autoconf automake binutils cairo cairo-devel dbus-1 dbus-1-devel dbus-1-glib docbook-dsssl-stylesheets docbook-utils docbook_4 doxygen expat fontconfig fontconfig-devel freetype2 freetype2-devel gcc gdbm gettext glib2 glib2-devel glitz glitz-devel gnome-filesystem gtk2 gtk2-devel html-dtd intltool iso_ent libcap libpixman libpixman-devel libpng libpng-devel libselinux-devel libtool libxml2 openjade opensp pango pango-devel pciutils perl perl-XML-Parser pkgconfig popt-devel python python-devel rpm sgml-skel update-desktop-files xmlto xorg-x11-devel xorg-x11-libs
-
-Name: hal
-URL: http://freedesktop.org/Software/hal
-%define dbus_version 0.35.2
-%define dbus_release 1
-License: Other License(s), see package, Other uncritical OpenSource License
-Group: System/Daemons
-Version: 0.5.4
-Release: 1
-Autoreqprov: on
-Summary: Daemon for Collecting Hardware Information
-Source0: %{name}-%{version}.tar.bz2
-Source1: rc.hal
-Prereq: /usr/sbin/groupadd /usr/sbin/useradd /etc/init.d/boot.localfs
-Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%package -n hal-devel
-Summary: Developer package for HAL
-Requires: %{name} = %{version}-%{release}, dbus-1-devel >= %{dbus_version}-%{dbus_release}
-Autoreqprov: on
-Group: Development/Libraries/Other
-%package -n hal-gnome
-Summary: GNOME based device manager for HAL
-Requires: %{name} = %{version}-%{release}, dbus-1-python >= %{dbus_version}-%{dbus_release}, python-gtk, python-gnome
-Autoreqprov: on
-Group: System/GUI/GNOME
-
-%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, 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.
-
-
-
-Authors:
---------
- Danny Kukawka <danny.kukawka at web.de>
- Kay Sievers <kay.sievers at vrfy.org>
- Joe Shaw <joeshaw at novell.com>
- David Zeuthen <david at fubar.dk>
-
-
-%description -n hal-devel
-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, USB) and the device
-classes (such as input, net and block) physical devices have, and it
-allows merging of information from so called 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
-
-
-
-Authors:
---------
- Danny Kukawka <danny.kukawka at web.de>
- Kay Sievers <kay.sievers at vrfy.org>
- Joe Shaw <joeshaw at novell.com>
- David Zeuthen <david at fubar.dk>
-
-
-%description -n hal-gnome
-GNOME program for displaying the devices detected by HAL
-
-
-
-Authors:
---------
- Danny Kukawka <danny.kukawka at web.de>
- Kay Sievers <kay.sievers at vrfy.org>
- Joe Shaw <joeshaw at novell.com>
- David Zeuthen <david at fubar.dk>
-
-%prep
-%setup -n %{name}-%{version} -q
-#rm -rf py-compile 4> /dev/null || :
-#ln -s /usr/share/automake-1.9/py-compile py-compile 2> /dev/null || :
-
-%build
-export CFLAGS="${RPM_OPT_FLAGS}"
-export CXXFLAGS="${RPM_OPT_FLAGS}"
-./autogen.sh
-#autoreconf -fi
-./configure \
- --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --localstatedir=%{_localstatedir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_sbindir} \
- --mandir=%{_mandir} \
- --with-init-scripts=suse \
- --with-hwdata=/usr/share \
- --enable-hotplug-map \
- --with-pid-file=/var/run/hal/haldaemon.pid \
- --with-dbus-sys=/etc/dbus-1/system.d \
- --with-hal-user=haldaemon \
- --with-hal-group=haldaemon \
- --with-doc-dir=%{_datadir}/doc/packages/hal \
- --enable-selinux \
- --enable-pcmcia-support \
- --enable-sysfs-carrier \
- --disable-acpi-proc \
- --enable-docbook-docs \
- --enable-doxygen-docs
-make
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/etc/hal
-mkdir -p $RPM_BUILD_ROOT/etc/dbus-1/system.d
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/usr/share/hal/device-manager
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/haldaemon
-ln -sf %{_sysconfdir}/init.d/haldaemon $RPM_BUILD_ROOT/%{_sbindir}/rchal
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-install -d $RPM_BUILD_ROOT/%{_localstatedir}/run/hal
-
-%clean
-rm -rf %{buildroot}
-
-%pre
-/usr/sbin/groupadd -r haldaemon 2> /dev/null || :
-/usr/sbin/useradd -r -o -s /bin/false -c "User for haldaemon" -d /var/run/hal -g haldaemon haldaemon 2> /dev/null || :
-
-%preun
-%{stop_on_removal haldaemon}
-
-%post
-%{insserv_force_if_yast haldaemon}
-%{run_ldconfig}
-
-%postun
-%{restart_on_update haldaemon}
-%{insserv_cleanup}
-%{run_ldconfig}
-
-%files
-%defattr(-, root, root)
-%dir %{_sysconfdir}/dbus-1/system.d
-%dir %{_sysconfdir}/hal
-%dir %{_sysconfdir}/init.d/haldaemon
-%dir %{_datadir}/doc/packages/hal/conf
-%dir %{_datadir}/doc/packages/hal/spec
-%dir %{_datadir}/hal
-%dir %{_datadir}/hal/fdi
-%config %{_sysconfdir}/dbus-1/system.d/hal.conf
-%{_bindir}/lshal
-%{_bindir}/hal-*-property
-%{_bindir}/hal-device
-%{_bindir}/hal-find-by-capability
-%{_datadir}/hal/fdi/*
-%{_datadir}/locale/*/LC_MESSAGES/hal.mo
-%{_datadir}/doc/packages/hal/conf/*
-%{_datadir}/doc/packages/hal/spec/*
-%{_libdir}/*hal*.so.*
-%{_sbindir}/hal*
-%{_sbindir}/rchal
-%attr(-,haldaemon,haldaemon) %{_localstatedir}/run/hal
-
-%files -n hal-devel
-%defattr(-, root, root)
-%dir %{_datadir}/doc/packages/hal
-%dir %{_datadir}/doc/packages/hal/api
-%{_includedir}/*
-%{_libdir}/lib*.a
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*
-%{_datadir}/doc/packages/hal/api/*
-
-%files -n hal-gnome
-%defattr(-, root, root)
-%dir %{_datadir}/hal/device-manager
-%{_datadir}/hal/device-manager/*
-%{_bindir}/hal-device-manager
-
-%changelog -n hal
-#add hal.changelog to generate entries
More information about the hal-commit
mailing list