wok-next rev 3149

Up: udev (142)
author Christophe Lincoln <pankso@slitaz.org>
date Sun May 24 00:19:23 2009 +0200 (2009-05-24)
parents 3a17ee6ec8c1
children 9a3ae0d7cd87
files udev-dev/receipt udev/receipt
line diff
     1.1 --- a/udev-dev/receipt	Sat May 23 21:31:36 2009 +0200
     1.2 +++ b/udev-dev/receipt	Sun May 24 00:19:23 2009 +0200
     1.3 @@ -1,9 +1,9 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="udev-dev"
     1.7 -VERSION="141"
     1.8 +VERSION="142"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Udev devel file (volume_id)."
    1.11 +SHORT_DESC="Udev devel file (libudev.a)."
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  WANTED="udev"
    1.14  WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
    1.15 @@ -11,10 +11,8 @@
    1.16  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.17  genpkg_rules()
    1.18  {
    1.19 -	mkdir -p $fs/lib $fs/usr/lib
    1.20 -
    1.21 -	# Extra
    1.22 -	cp -a $src/extras/volume_id/lib/.libs/libvolume_id.a $fs/lib
    1.23 +	mkdir -p $fs/usr/lib
    1.24 +	cp -a $_pkg/usr/lib/*.a $fs/usr/lib
    1.25  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    1.26  	cp -a $_pkg/usr/include $fs/usr
    1.27  }
     2.1 --- a/udev/receipt	Sat May 23 21:31:36 2009 +0200
     2.2 +++ b/udev/receipt	Sun May 24 00:19:23 2009 +0200
     2.3 @@ -1,10 +1,12 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="udev"
     2.7 -VERSION="141"
     2.8 +VERSION="142"
     2.9  BUILD_WARNING="Install new udev package and rebuild hal"
    2.10  CATEGORY="base-system"
    2.11  SHORT_DESC="Udev creat automaticly right devices in /dev."
    2.12 +DEPENDS="util-linux-ng-blkid"
    2.13 +BUILD_DEPENDS="$DEPENDS util-linux-ng-blkid-dev"
    2.14  MAINTAINER="pankso@slitaz.org"
    2.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.16  WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
    2.17 @@ -20,37 +22,36 @@
    2.18  		--sysconfdir=/etc \
    2.19  		--enable-static \
    2.20  		$CONFIGURE_ARGS &&
    2.21 -	make EXTRAS="extras/firmware extras/scsi_id extras/volume_id \
    2.22 -		extras/ata_id extras/usb_id extras/cdrom_id" &&
    2.23  	make DESTDIR=$PWD/_pkg install
    2.24  }
    2.25  
    2.26  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.27  genpkg_rules()
    2.28  {
    2.29 -	mkdir -p $fs/lib/firmware $fs/etc/udev
    2.30 -
    2.31 -	cp -a $_pkg/sbin $fs
    2.32 -	cp -a $_pkg/etc $fs
    2.33 -	cp -a $_pkg/lib $fs
    2.34 -	for i in libudev.so libvolume_id.so; do
    2.35 -		[ -f $fs/lib/$i ] || ( cd $fs/lib ; ln -s $i.*.* $i)
    2.36 +	mkdir -p $fs/lib/firmware $fs/etc/udev $fs/usr/lib
    2.37 +	for dir in sbin etc lib
    2.38 +	do
    2.39 +		cp -a $_pkg/$dir $fs
    2.40  	done
    2.41 +	cp -a $_pkg/usr/lib/*.so $fs/usr/lib
    2.42  
    2.43  	# Copy rules files to udev conf dir
    2.44  	mv $fs/lib/udev/rules.d $fs/etc/udev
    2.45  	cp stuff/udev.conf $fs/etc/udev
    2.46  	cp stuff/90-permissions.rules $fs/etc/udev/rules.d
    2.47 -	cp -a $src/rules/packages/40-alsa.rules $fs/etc/udev/rules.d
    2.48 -	
    2.49 +	cp $src/rules/packages/40-alsa.rules $fs/etc/udev/rules.d
    2.50 +	cp $src/rules/packages/40-zaptel.rules $fs/etc/udev/rules.d
    2.51  	# Fix permissions
    2.52 -	chmod +x $fs/lib/udev/write*
    2.53 +	chmod +x $fs/lib/udev/*
    2.54 +	chown -R root.root $fs
    2.55  }
    2.56  
    2.57 -post_install()
    2.58 +pre_install()
    2.59  {
    2.60 -	local root
    2.61 -	root=$1
    2.62 -	# Remove old rules
    2.63 -	rm -rf $1/lib/udev/rules.d 2>/dev/null
    2.64 +	# Remove old rules and libs
    2.65 +	rm -rf $1/lib/udev/rules.d
    2.66 +	rm -rf $1/lib/udev/vol_id
    2.67 +	rm -f $1/lib/libvolume_id*
    2.68 +	rm -f $1/lib/libudev.so.1.0
    2.69 +	rm -f $1/lib/libudev.so.2.0
    2.70  }