wok diff e2fsprogs/receipt @ rev 12854

e2fsprogs: Up to 1.42.3 - Add to ARM with uuid/blkid libs untils util-linux croos-compile
author Christophe Lincoln <pankso@slitaz.org>
date Wed May 23 16:14:57 2012 +0200 (2012-05-23)
parents 2662eed28d15
children 64e7fff3f73c
line diff
     1.1 --- a/e2fsprogs/receipt	Sun Apr 29 13:18:44 2012 +0200
     1.2 +++ b/e2fsprogs/receipt	Wed May 23 16:14:57 2012 +0200
     1.3 @@ -1,20 +1,28 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="e2fsprogs"
     1.7 -VERSION="1.41.14"
     1.8 +VERSION="1.42.3"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="Filesystem utilities for use with ext2 and ext3 (without fsck*)."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.13  WEB_SITE="http://e2fsprogs.sourceforge.net/"
    1.14  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.15 +HOST_ARCH="i486 arm"
    1.16 +
    1.17  DEPENDS="libcomerr util-linux-blkid util-linux-uuid"
    1.18  
    1.19 +# Handle arch installation
    1.20 +case "$SLITAZ_ARCH" in
    1.21 +	arm) DEPENDS="libcomerr" ;;
    1.22 +esac
    1.23 +
    1.24  # Rules to configure and make the package.
    1.25  compile_rules()
    1.26  {
    1.27  	cd $src
    1.28 -	./configure \
    1.29 +	mkdir ../build && cd ../build
    1.30 +	$src/configure \
    1.31  		--prefix=/usr \
    1.32  		--with-root-prefix="" \
    1.33  		--enable-elf-shlibs \
    1.34 @@ -27,18 +35,23 @@
    1.35  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.36  genpkg_rules()
    1.37  {
    1.38 -	mkdir -p $fs/usr/lib $fs/usr/share/locale
    1.39 -	cp -a $_pkg/sbin $fs
    1.40 -	cp -a $_pkg/lib $fs
    1.41 -	cp -a $_pkg/etc $fs
    1.42 -	cp -a $_pkg/usr/bin $fs/usr
    1.43 -	cp -a $_pkg/usr/sbin $fs/usr
    1.44 -	cp -a $_pkg/usr/lib/*.so $fs/usr/lib
    1.45 +	mkdir -p $fs/usr/lib
    1.46 +	cp -a $install/sbin $fs
    1.47 +	cp -a $install/lib $fs
    1.48 +	cp -a $install/etc $fs
    1.49 +	cp -a $install/usr/bin $fs/usr
    1.50 +	cp -a $install/usr/sbin $fs/usr
    1.51 +	cp -a $install/usr/lib/*.so $fs/usr/lib
    1.52  	cat $stuff/*.files-list | while read file; do
    1.53 -		rm -f $fs$file
    1.54 +		rm -f ${fs}$file
    1.55  	done
    1.56 -	# Remove fsck provided by Busybox and blkid by util-linux.
    1.57 +	# Remove fsck provided by Busybox.
    1.58  	rm $fs/sbin/fsck* $fs/sbin/blkid
    1.59 +	# Package util-linux dont cross actually, keep uuid/blkid libs.
    1.60 +	case "$ARCH" in
    1.61 +		arm) return 0 ;;
    1.62 +	esac
    1.63 +	# Remove blkid provided by util-linux.
    1.64  	rm $fs/lib/libblkid* $fs/usr/lib/libblkid*
    1.65  	# Remove uuid files provided by util-linux.
    1.66  	rm $fs/usr/sbin/uuidd $fs/usr/bin/uuidgen
    1.67 @@ -48,12 +61,12 @@
    1.68  # Overlap busybox
    1.69  pre_install()
    1.70  {
    1.71 -	rm -f $1/sbin/findfs
    1.72 -	rm -f $1/sbin/tune2fs
    1.73 +	rm -f $root/sbin/findfs
    1.74 +	rm -f $root/sbin/tune2fs
    1.75  }
    1.76  
    1.77  post_remove()
    1.78  {
    1.79 -	ln -s /bin/busybox $1/sbin/findfs
    1.80 -	ln -s /bin/busybox $1/sbin/tune2fs
    1.81 +	ln -s /bin/busybox $root/sbin/findfs
    1.82 +	ln -s /bin/busybox $root/sbin/tune2fs
    1.83  }