wok-4.x rev 3105

e2fsprogs: Remove blkid (use most recent one from util-linux-ng)
author Christophe Lincoln <pankso@slitaz.org>
date Sun May 17 23:50:50 2009 +0200 (2009-05-17)
parents 10942c618dc5
children 0586a2e564d5
files e2fsprogs-dev/receipt e2fsprogs/receipt
line diff
     1.1 --- a/e2fsprogs-dev/receipt	Sun May 17 23:49:40 2009 +0200
     1.2 +++ b/e2fsprogs-dev/receipt	Sun May 17 23:50:50 2009 +0200
     1.3 @@ -13,10 +13,13 @@
     1.4  genpkg_rules()
     1.5  {
     1.6  	mkdir -p $fs/usr/lib/
     1.7 -	cp -a $_pkg/usr/lib/*.a $fs/usr/lib
     1.8 +	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
     1.9  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    1.10  	cp -a $_pkg/usr/include $fs/usr
    1.11  	cat $src/*.files-list | while read file; do
    1.12  		[ -f $fs$file ] && rm -f $fs$file
    1.13  	done
    1.14 +	rm -rf $fs/usr/include/blkid
    1.15 +	rm -rf $fs/usr/lib/libblkid*
    1.16 +	rm -rf $fs/usr/lib/pkgconfig/blkid.pc
    1.17  }
     2.1 --- a/e2fsprogs/receipt	Sun May 17 23:49:40 2009 +0200
     2.2 +++ b/e2fsprogs/receipt	Sun May 17 23:50:50 2009 +0200
     2.3 @@ -8,7 +8,7 @@
     2.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     2.5  WEB_SITE="http://e2fsprogs.sourceforge.net/"
     2.6  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     2.7 -DEPENDS="libcomerr libuuid"
     2.8 +DEPENDS="libcomerr libuuid util-linux-ng-blkid"
     2.9  
    2.10  # Rules to configure and make the package.
    2.11  compile_rules()
    2.12 @@ -18,7 +18,6 @@
    2.13  		--prefix=/usr \
    2.14  		--with-root-prefix="" \
    2.15  		--enable-elf-shlibs \
    2.16 -		--disable-evms \
    2.17  		--sysconfdir=/etc \
    2.18  		--infodir=/usr/share/info \
    2.19  		--mandir=/usr/share/man \
    2.20 @@ -42,13 +41,9 @@
    2.21  	cat $src/*.files-list | while read file; do
    2.22  		rm -f $fs$file
    2.23  	done
    2.24 -	
    2.25 -	# Remove fsck provided by Busybox.
    2.26 -	rm -rf $fs/sbin/fsck*
    2.27 -	
    2.28 -	# Locale fr.
    2.29 -	cp -a $_pkg/usr/share/locale/fr $fs/usr/share/locale
    2.30 -	
    2.31 +	# Remove fsck provided by Busybox and blkid by util-linux-ng.
    2.32 +	rm $fs/sbin/fsck* $fs/sbin/blkid
    2.33 +	rm $fs/lib/libblkid* $fs/usr/lib/libblkid*
    2.34  	# Package all mysql pkgs
    2.35  	for i in $(cd $WOK; ls -d e2fsprogs-* libcomerr* libuuid*)
    2.36  	do