SliTaz Repositories

     1.1 --- a/hal/receipt	Fri Mar 30 19:31:50 2018 +0300
     1.2 +++ b/hal/receipt	Fri Apr 06 02:18:37 2018 +0300
     1.3 @@ -13,112 +13,73 @@
     1.4  
     1.5  BUILD_DEPENDS="dbus-dev dbus-glib dbus-glib-dev udev-dev pciutils \
     1.6  util-linux-blkid-dev expat-dev util-linux-uuid-dev glib-dev libv4l-dev"
     1.7 -SPLIT="hal hal-dev hal-extra hal-scripts"
     1.8 +SPLIT="hal-scripts hal-extra hal hal-dev"
     1.9  
    1.10 -EXTRA="
    1.11 -hald-addon-cpufreq
    1.12 -hald-addon-hid-ups
    1.13 -hald-addon-imac-backlight
    1.14 -hald-addon-ipw-killswitch
    1.15 -hald-probe-video4linux
    1.16 -hald-probe-net-bluetooth
    1.17 -hald-probe-ieee1394-unit
    1.18 -hald-probe-pc-floppy
    1.19 -hald-probe-printer"
    1.20  CROSS="error: cannot check for file existence when cross compiling"
    1.21  
    1.22  compile_rules() {
    1.23  	sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
    1.24  		hald/linux/probing/probe-video4linux.c
    1.25  	sed -i 's|glib/gmain|glib|' hald/linux/addons/addon-*.c
    1.26 -	zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids &&
    1.27 -	patch -p1 < $stuff/hal-scripts.u || return 1 &&
    1.28 -	#patch -p1 < $stuff/hal-udev.patch || return 1 &&
    1.29 +	zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids
    1.30 +	patch -p1 < $stuff/hal-scripts.u || return 1
    1.31 +	#patch -p1 < $stuff/hal-udev.patch || return 1
    1.32 +
    1.33  	grep -qs 'define u8' hald/linux/probing/linux_dvd_rw_utils.c ||
    1.34  	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
    1.35  		hald/linux/probing/linux_dvd_rw_utils.c
    1.36  
    1.37 +	libexecdir='/usr/lib/hal'
    1.38  	./configure \
    1.39 -		--libexecdir=/usr/lib/hal \
    1.40 +		--libexecdir=$libexecdir \
    1.41  		--disable-usb-ids \
    1.42  		--disable-policy-kit \
    1.43  		--build=$HOST_SYSTEM \
    1.44  		--host=$HOST_SYSTEM &&
    1.45  	make &&
    1.46  	rm /usr/share/misc/pci.ids &&
    1.47 -	make install
    1.48 +	make install || return 1
    1.49 +
    1.50 +	chmod -R +x $install$libexecdir/scripts/*
    1.51 +
    1.52 +	# init script
    1.53 +	cp -a $stuff/etc $install
    1.54 +	# policy for ntfs-3g
    1.55 +	cp -a $stuff/policy $install/usr/share/hal/fdi/
    1.56 +	# change bash to sh in hal scripts; use full-path
    1.57 +	sed -i \
    1.58 +		-e 's:/bin/bash:/bin/sh:' \
    1.59 +		-e "s:hal-functions:$libexecdir/scripts/hal-functions:" \
    1.60 +		$install/usr/lib/hal/scripts/hal* \
    1.61 +		$install/usr/lib/hal/scripts/linux/hal*
    1.62  }
    1.63  
    1.64  genpkg_rules() {
    1.65  	case $PACKAGE in
    1.66 -	hal)
    1.67 -		DEPENDS="dbus dbus-glib slitaz-base-files udev \
    1.68 +		hal-scripts)
    1.69 +			copy hal/scripts/
    1.70 +			CAT="x-window|scripts"
    1.71 +			DEPENDS="dbus dbus-glib glib hal"
    1.72 +			;;
    1.73 +		hal-extra)
    1.74 +			copy hald-addon-cpufreq hald-addon-hid-ups \
    1.75 +			hald-addon-imac-backlight hald-addon-ipw-killswitch \
    1.76 +			hald-probe-video4linux hald-probe-net-bluetooth \
    1.77 +			hald-probe-ieee1394-unit hald-probe-pc-floppy hald-probe-printer \
    1.78 +			10-cpufreq.fdi 10-dockstation.fdi 10-imac-backlight.fdi \
    1.79 +			15-storage-luks.fdi 30-wol.fdi
    1.80 +			CAT="x-window|extra lib and fdi files"
    1.81 +			DEPENDS="dbus dbus-glib glib hal"
    1.82 +			;;
    1.83 +		hal)
    1.84 +			copy @std @rm
    1.85 +			DEPENDS="dbus dbus-glib slitaz-base-files udev \
    1.86  			util-linux-blkid libusb-compat"
    1.87 -		mkdir -p $fs/usr/lib $fs/usr/share
    1.88 -		cp -a $install/etc $fs
    1.89 -		cp -a $install/var $fs
    1.90 -		cp -a $install/usr/bin $fs/usr
    1.91 -		cp -a $install/usr/sbin $fs/usr
    1.92 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.93 -		cp -a $install/usr/lib/hal $fs/usr/lib
    1.94 -		cp -a $install/usr/share/hal $fs/usr/share
    1.95 -		chmod -R +x $fs/usr/lib/hal/scripts/*
    1.96 -		# Remove a few run time lib and strip.
    1.97 -		for lib in $EXTRA
    1.98 -		do
    1.99 -			rm $fs/usr/lib/hal/$lib
   1.100 -		done
   1.101 -		strip -s $fs/usr/lib/hal/* 2>/dev/null
   1.102 -		# Init script
   1.103 -		cp -a stuff/etc $fs
   1.104 -
   1.105 -		# Policy for ntfs-3g
   1.106 -		cp -a stuff/policy $fs/usr/share/hal/fdi/
   1.107 -		chown -R root.root $fs
   1.108 -
   1.109 -		# exclude unwanted fdi files
   1.110 -		rm $fs/usr/share/hal/fdi/policy/10osvendor/10-cpufreq.fdi
   1.111 -		rm $fs/usr/share/hal/fdi/policy/10osvendor/10-dockstation.fdi
   1.112 -		rm $fs/usr/share/hal/fdi/policy/10osvendor/10-imac-backlight.fdi
   1.113 -		rm $fs/usr/share/hal/fdi/policy/10osvendor/15-storage-luks.fdi
   1.114 -		rm $fs/usr/share/hal/fdi/policy/10osvendor/30-wol.fdi
   1.115 -	
   1.116 -		# change bash to sh in hal scripts
   1.117 -		sed -i 's:/bin/bash:/bin/sh:' $fs/usr/lib/hal/scripts/hal* 
   1.118 -		sed -i 's:/bin/bash:/bin/sh:' $fs/usr/lib/hal/scripts/linux/hal* 
   1.119 -		# use full-path
   1.120 -		sed -i 's:hal-functions:/usr/lib/hal/scripts/hal-functions:' $fs/usr/lib/hal/scripts/hal* 
   1.121 -		sed -i 's:hal-functions:/usr/lib/hal/scripts/hal-functions:' $fs/usr/lib/hal/scripts/linux/hal* 
   1.122 -		;;
   1.123 -	hal-dev)
   1.124 -		DEPENDS="hal dbus-dev"
   1.125 -		mkdir -p $fs/usr/lib
   1.126 -		cp -a $install/usr/include $fs/usr
   1.127 -		cp -a $install/usr/lib/*.*a $fs/usr/lib
   1.128 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   1.129 -		;;
   1.130 -	hal-extra)
   1.131 -		CAT="x-window|Hal extra lib and fdi files."
   1.132 -		DEPENDS="dbus dbus-glib glib hal"
   1.133 -		mkdir -p $fs/usr/lib/hal $fs/usr/share/hal/fdi/policy/10osvendor
   1.134 -		for lib in $EXTRA
   1.135 -		do
   1.136 -			cp $install/usr/lib/hal/$lib $fs/usr/lib/hal
   1.137 -		done
   1.138 -	
   1.139 -		# copy some excluded files from hal
   1.140 -		cp -a $install/usr/share/hal/fdi/policy/10osvendor/10-cpufreq.fdi $fs/usr/share/hal/fdi/policy/10osvendor
   1.141 -		cp -a $install/usr/share/hal/fdi/policy/10osvendor/10-dockstation.fdi $fs/usr/share/hal/fdi/policy/10osvendor
   1.142 -		cp -a $install/usr/share/hal/fdi/policy/10osvendor/10-imac-backlight.fdi $fs/usr/share/hal/fdi/policy/10osvendor
   1.143 -		cp -a $install/usr/share/hal/fdi/policy/10osvendor/15-storage-luks.fdi $fs/usr/share/hal/fdi/policy/10osvendor
   1.144 -		cp -a $install/usr/share/hal/fdi/policy/10osvendor/30-wol.fdi $fs/usr/share/hal/fdi/policy/10osvendor
   1.145 -		;;
   1.146 -	hal-scripts)
   1.147 -		CAT="x-window|Hal scripts files."
   1.148 -		DEPENDS="dbus dbus-glib glib hal"
   1.149 -		mkdir -p $fs/usr/lib/hal
   1.150 -		cp -a $install/usr/lib/hal/scripts $fs/usr/lib/hal
   1.151 -		;;
   1.152 +			;;
   1.153 +		hal-dev)
   1.154 +			copy @dev
   1.155 +			DEPENDS="hal dbus-dev"
   1.156 +			;;
   1.157  	esac
   1.158  }
   1.159  
   1.160 @@ -126,21 +87,17 @@
   1.161  	# Go for echoing on configuration files if any haldaemon user
   1.162  	# was found.
   1.163  	if ! grep -q 'haldaemon' "$1/etc/passwd"; then
   1.164 -		echo -n "Adding user: messagebus..."
   1.165  		echo 'haldaemon:x:26:26:HAL Daemon User:/dev/null:/bin/false' >> "$1/etc/passwd"
   1.166  		echo 'haldaemon:!:14013:0:99999:7:::' >> "$1/etc/shadow"
   1.167  		echo 'haldaemon:x:26:' >> "$1/etc/group"
   1.168  		echo 'haldaemon:!::' >> "$1/etc/gshadow"
   1.169 -		status
   1.170  	fi
   1.171  	if ! grep -q ^HALD_OPTIONS "$1/etc/daemons.conf"; then
   1.172 -		echo -n "Configuring /etc/daemons.conf..."
   1.173  		cat >> "$1/etc/daemons.conf" << "EOT"
   1.174  # HAL daemon options.
   1.175  HALD_OPTIONS="--daemon=yes"
   1.176  
   1.177  EOT
   1.178 -		status
   1.179  	fi
   1.180  }
   1.181