Commit c663498a authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

package: remove hal 



Hal is deprecated upstream, our package has not seen any significant
work since it was added in 2007, nothing depends on it and it's blocking
a long-overdue udev update.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 43a2e623

package/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ source "package/genext2fs/Config.in" 
source "package/genromfs/Config.in"

source "package/gpsd/Config.in"

source "package/gvfs/Config.in"

source "package/hal/Config.in"

if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS

source "package/hdparm/Config.in"

endif

package/gvfs/gvfs.mk

+1 −7
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ GVFS_CONF_OPT = \ 
	--disable-gphoto2		\

	--disable-keyring		\

	--disable-bash-completion	\

	--disable-hal



ifeq ($(BR2_PACKAGE_AVAHI),y)

GVFS_DEPENDENCIES += avahi
@@ -28,13 +29,6 @@ else 
GVFS_CONF_OPT += --disable-avahi

endif



ifeq ($(BR2_PACKAGE_HAL),y)

GVFS_DEPENDENCIES += hal

GVFS_CONF_OPT += --enable-hal

else

GVFS_CONF_OPT += --disable-hal

endif



ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)

GVFS_DEPENDENCIES += libarchive

GVFS_CONF_OPT += --enable-archive

package/hal/Config.in

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
config BR2_PACKAGE_HAL

	bool "hal"

	depends on BR2_USE_WCHAR # glib2

	select BR2_PACKAGE_EXPAT

	select BR2_PACKAGE_LIBGLIB2

	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE

	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE

	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE

	select BR2_PACKAGE_DBUS

	select BR2_DBUS_EXPAT

	select BR2_PACKAGE_DBUS_GLIB

	select BR2_PACKAGE_HWDATA

	select BR2_PACKAGE_UDEV

	select BR2_PACKAGE_UDEV_VOLUME_ID

	help

	  The Hardware Abstraction Layer (HAL) suite.



comment "hal requires a toolchain with WCHAR support"

	depends on !BR2_USE_WCHAR

package/hal/S98haldaemon

deleted100755 → 0
+0 −56
Original line number Diff line number Diff line 
#!/bin/sh

#

# haldaemon:   HAL daemon

#

# chkconfig: 345 98 02

# description:  This is a daemon for collecting and maintaing information \

#               about hardware from several sources. \

#               See http://www.freedesktop.org/Software/hal

#

# processname: hald

# pidfile: /var/run/haldaemon.pid

#



# Sanity checks.

[ -x /usr/sbin/hald ] || exit 0



RETVAL=0



start() {

    echo -n "Starting HAL daemon: "

    hald

    RETVAL=$?

    echo "done"

    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/haldaemon

}



stop() {

    echo -n "Stopping HAL daemon: "



    killall hald

    RETVAL=$?

    echo "done"

    if [ $RETVAL -eq 0 ]; then

        rm -f /var/lock/subsys/haldaemon

        rm -f /var/run/haldaemon.pid

    fi

}



# See how we were called.

case "$1" in

    start)

        start

        ;;

    stop)

        stop

        ;;

    restart)

        stop

	sleep 3

        start

        ;;

    *)

        echo $"Usage: $0 {start|stop|restart}"

        ;;

esac

exit $RETVAL

package/hal/hal-include-fix.patch

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
[PATCH] hal: add missing includes



- hald/linux/classdev.c needs sys/socket.h for struct sockaddr

- hald/linux/addons/addon-storage.c needs limits.h for INT_MAX



Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 hald/linux/addons/addon-storage.c |    1 +

 hald/linux/classdev.c             |    1 +

 2 files changed, 2 insertions(+)



Index: hal-0.5.8/hald/linux/addons/addon-storage.c

===================================================================

--- hal-0.5.8.orig/hald/linux/addons/addon-storage.c

+++ hal-0.5.8/hald/linux/addons/addon-storage.c

@@ -29,6 +29,7 @@

 

 #include <errno.h>

 #include <fcntl.h>

+#include <limits.h>

 #include <linux/cdrom.h>

 #include <linux/fs.h>

 #include <mntent.h>

Index: hal-0.5.8/hald/linux/classdev.c

===================================================================

--- hal-0.5.8.orig/hald/linux/classdev.c

+++ hal-0.5.8/hald/linux/classdev.c

@@ -31,6 +31,7 @@

 

 #include <ctype.h>

 #include <limits.h>

+#include <sys/socket.h>

 #include <linux/types.h>

 #include <net/if_arp.h> /* for ARPHRD_... */

 #include <stdlib.h>