wok-6.x rev 12485

Up: udev (182) We have to fix our custom rules
author Christophe Lincoln <pankso@slitaz.org>
date Mon Apr 23 18:14:12 2012 +0200 (2012-04-23)
parents 127a849d861d
children e6e6aef1786c
files udev-dev/receipt udev/receipt
line diff
     1.1 --- a/udev-dev/receipt	Mon Apr 23 18:12:59 2012 +0200
     1.2 +++ b/udev-dev/receipt	Mon Apr 23 18:14:12 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="udev-dev"
     1.7 -VERSION="170"
     1.8 +VERSION="182"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Udev devel file (libudev)."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -13,8 +13,8 @@
    1.13  genpkg_rules()
    1.14  {
    1.15  	mkdir -p $fs/lib $fs/usr/lib/pkgconfig $fs/usr/include
    1.16 -	cp -a $_pkg/lib/libudev*a $fs/lib
    1.17 -	cp -a $_pkg/lib/pkgconfig/libudev.pc $fs/usr/lib/pkgconfig
    1.18 -	cp -a $_pkg/usr/share/pkgconfig/* $fs/usr/lib/pkgconfig
    1.19 -	cp -a $_pkg/usr/include/libudev.h $fs/usr/include
    1.20 +	cp -a $install/lib/libudev*a $fs/lib
    1.21 +	cp -a $install/lib/pkgconfig/libudev.pc $fs/usr/lib/pkgconfig
    1.22 +	cp -a $install/usr/share/pkgconfig/* $fs/usr/lib/pkgconfig
    1.23 +	cp -a $install/usr/include/libudev.h $fs/usr/include
    1.24  }
     2.1 --- a/udev/receipt	Mon Apr 23 18:12:59 2012 +0200
     2.2 +++ b/udev/receipt	Mon Apr 23 18:14:12 2012 +0200
     2.3 @@ -1,67 +1,70 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="udev"
     2.7 -VERSION="170"
     2.8 +VERSION="182"
     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  MAINTAINER="pankso@slitaz.org"
    2.13 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.14 -WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
    2.15 -WGET_URL="http://www.us.kernel.org/pub/linux/utils/kernel/hotplug/$TARBALL"
    2.16 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.17 +WEB_SITE="http://www.freedesktop.org/software/systemd/man/udev.html"
    2.18 +WGET_URL="http://www.kernel.org/pub/linux/utils/kernel/hotplug/$TARBALL"
    2.19  
    2.20 -DEPENDS="util-linux-blkid"
    2.21 +DEPENDS="util-linux-blkid pciids usbids acl kmod"
    2.22  BUILD_DEPENDS="util-linux-blkid-dev gperf pkg-config pciutils acl-dev \
    2.23 -libgio-dev gobject-introspection-dev usbutils-dev libusb-dev glib-dev libgudev"
    2.24 +libgio-dev usbutils-dev libusb-dev glib-dev pciids usbids kmod-dev \
    2.25 +libgudev-dev pcre-dev"
    2.26  
    2.27  # Rules to configure and make the package.
    2.28  compile_rules()
    2.29  {
    2.30  	cd $src
    2.31 -	grep -qs 'define u8' extras/*_id/*.c ||
    2.32 -	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
    2.33 -		extras/scsi_id/scsi_serial.c extras/ata_id/ata_id.c
    2.34 -	./configure $CONFIGURE_ARGS \
    2.35 -		--prefix=/usr \
    2.36 +	./configure \
    2.37  		--exec-prefix="" \
    2.38 +		--with-rootprefix="" \
    2.39 +		--bindir=/sbin \
    2.40  		--sysconfdir=/etc \
    2.41 -		--libexecdir=/lib/udev \
    2.42 -		--with-rootlibdir=/lib \
    2.43 -		--with-pci-ids-path=/usr/share/misc/pci.ids.gz &&
    2.44 +		--libexecdir=/lib \
    2.45 +		--disable-manpages \
    2.46 +		--disable-introspection \
    2.47 +		--disable-keymap \
    2.48 +		--enable-floppy \
    2.49 +		--enable-rule_generator \
    2.50 +		--with-pci-ids-path=/usr/share/misc/pci.ids.gz \
    2.51 +		--with-usb-ids-path=/usr/share/misc/usb.ids.gz \
    2.52 +		--with-systemdsystemunitdir=no \
    2.53 +		$CONFIGURE_ARGS &&
    2.54  	make && make install
    2.55  }
    2.56  
    2.57  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.58  genpkg_rules()
    2.59  {
    2.60 -	mkdir -p $fs/lib/firmware $fs/usr $fs/run/udev
    2.61 +	mkdir -p $fs/lib/firmware $fs/run/udev
    2.62  
    2.63 -	cp -a $_pkg/sbin $fs
    2.64 -	cp -a $_pkg/etc $fs
    2.65 -	cp -a $_pkg/lib/libudev*so* $fs/lib
    2.66 -	cp -a $_pkg/lib/udev $fs/lib
    2.67 -	cp -a $_pkg/usr/lib $fs/usr
    2.68 +	cp -a $install/sbin $fs
    2.69 +	cp -a $install/etc $fs
    2.70 +	cp -a $install/lib/libudev*so* $fs/lib
    2.71 +	cp -a $install/lib/udev $fs/lib
    2.72 +	
    2.73 +	# Have udevd in PATH
    2.74 +	mv $fs/lib/udev/udevd $fs/sbin
    2.75  
    2.76 -	# OLD: Copy rules files to udev conf dir
    2.77 +	# Copy rules files to udev conf dir
    2.78  	mv -f $fs/lib/udev/rules.d $fs/etc/udev
    2.79  	cp $stuff/udev.conf $fs/etc/udev
    2.80  	cp $stuff/*.rules $fs/etc/udev/rules.d
    2.81  	
    2.82 +	# Create some devices and directories that Udev cannot handle 
    2.83 +	# due to them being required very early in the boot process
    2.84 +	mkdir -p $fs/lib/udev/devices/pts
    2.85 +	mknod -m 0666 $fs/lib/udev/devices/null c 1 3
    2.86 +	
    2.87  	# Fix permissions
    2.88  	chmod +x $fs/lib/udev/*
    2.89  	chown -R root.root $fs
    2.90  }
    2.91  
    2.92 -pre_install()
    2.93 -{
    2.94 -	# Remove old rules and libs
    2.95 -	rm -rf $1/lib/udev/rules.d
    2.96 -	rm -rf $1/lib/udev/vol_id
    2.97 -	rm -f $1/lib/libvolume_id*
    2.98 -	rm -f $1/lib/libudev.so.1.0
    2.99 -	rm -f $1/lib/libudev.so.2.0
   2.100 -}
   2.101 -
   2.102  list_udev_group()
   2.103  {
   2.104      object=$2