SliTaz Repositories

     1.1 --- a/cook	Sat May 07 02:56:03 2011 +0200
     1.2 +++ b/cook	Sat May 07 03:32:53 2011 +0200
     1.3 @@ -106,7 +106,7 @@
     1.4  	for var in PACKAGE VERSION CATEGORY SHORT_DESC MAINTAINER WEB_SITE
     1.5  	do
     1.6  		unset value
     1.7 -		value=$(grep ^$var= receipt | cut -d \" -f 2)
     1.8 +		value=$(grep ^$var= $receipt | cut -d \" -f 2)
     1.9  		case "$var" in
    1.10  			PACKAGE|VERSION|SHORT_DESC)
    1.11  				if_empty_value ;;
    1.12 @@ -140,7 +140,8 @@
    1.13  set_paths() {
    1.14  	pkgdir=$WOK/$PACKAGE
    1.15  	src=$pkgdir/source/$PACKAGE-$VERSION
    1.16 -	pack=$pkgdir/taz/$PACKAGE-${VERSION}${EXTRAVERSION}
    1.17 +	taz=$pkgdir/taz
    1.18 +	pack=$taz/$PACKAGE-${VERSION}${EXTRAVERSION}
    1.19  	fs=$pack/fs
    1.20  	stuff=$pkgdir/stuff
    1.21  	install=$pkgdir/install
    1.22 @@ -206,8 +207,8 @@
    1.23  	cd $WOK/$pkg
    1.24  	[ -d install ] && prod=$(du -sh install | awk '{print $1}' 2>/dev/null)
    1.25  	fs=$(du -sh taz/* | awk '{print $1}')
    1.26 -	size=$(du -sh $PKGS/$PACKAGE-${VERSION}*.tazpkg | awk '{print $1}')
    1.27 -	files=$(cat taz/$PACKAGE-*/files.list | wc -l)
    1.28 +	size=$(du -sh $PKGS/$pkg-${VERSION}*.tazpkg | awk '{print $1}')
    1.29 +	files=$(cat taz/$pkg-*/files.list | wc -l)
    1.30  	cookdate=$(date "+%Y-%m-%d %H:%M")
    1.31  	gettext "Summary for:"; echo " $PACKAGE $VERSION"
    1.32  	separator
    1.33 @@ -324,6 +325,7 @@
    1.34  	separator
    1.35  	set_paths
    1.36  	[ "$QA" ] && receipt_quality
    1.37 +	cd $pkgdir
    1.38  	rm -rf install taz source
    1.39  
    1.40  	# Disable -pipe if less than 512Mb free RAM.
    1.41 @@ -336,7 +338,7 @@
    1.42  	unset free
    1.43  
    1.44  	# Export flags and path to be used by make
    1.45 -	DESTDIR=$WOK/$PACKAGE/install
    1.46 +	DESTDIR=$pkgdir/install
    1.47  	export DESTDIR MAKEFLAGS CFLAGS CXXFLAGS BUILD_HOST CONFIG_SITE
    1.48  	local LC_ALL=POSIX LANG=POSIX
    1.49  
    1.50 @@ -381,7 +383,7 @@
    1.51  	fi
    1.52  
    1.53  	# Execute receipt rules.
    1.54 -	if grep -q ^compile_rules $pkgdir/receipt; then
    1.55 +	if grep -q ^compile_rules $receipt; then
    1.56  		gettext -e "Executing: compile_rules\n"
    1.57  		[ -d "$src" ] && cd $src 
    1.58  		compile_rules || echo "" && exit 1
    1.59 @@ -414,13 +416,13 @@
    1.60  	set_paths
    1.61  	echo "Pack: $PACKAGE $VERSION"
    1.62  	separator
    1.63 -	if grep -q ^genpkg_rules $pkgdir/receipt; then
    1.64 +	if grep -q ^genpkg_rules $receipt; then
    1.65  		gettext -e "Executing: genpkg_rules\n"
    1.66  		cd $pkgdir
    1.67  		mkdir -p $fs && genpkg_rules || (echo -e \
    1.68  			"\nERROR: genpkg_rules failed\n" >> $LOGS/$pkg.log && exit 1)
    1.69  	fi
    1.70 -	cd $pkgdir/taz
    1.71 +	cd $taz
    1.72  	for file in receipt description.txt
    1.73  	do
    1.74  		[ ! -f "../$file" ] && continue
    1.75 @@ -498,12 +500,13 @@
    1.76  	if fgrep -q ERROR: $LOGS/$pkg.log; then
    1.77  		rm -f $command && exit 1
    1.78  	fi
    1.79 +	gettext "QA: Checking for empty package..."
    1.80  	files=$(grep -q ^/ $pkgdir/taz/$pkg-*/files.list)
    1.81  	if [ ! "$files" ] && [ "$CATEGORY" != "meta" ]; then
    1.82 -		echo -e "ERROR: empty package"
    1.83 +		echo -e "\nERROR: empty package"
    1.84  		rm -f $command && exit 1
    1.85  	else
    1.86 -		mv -f $WOK/$pkg/taz/$pkg-*.tazpkg $PKGS
    1.87 +		status && mv -f $pkgdir/taz/$pkg-*.tazpkg $PKGS
    1.88  		sed -i /^${pkg}$/d $broken
    1.89  	fi
    1.90  }
    1.91 @@ -649,11 +652,12 @@
    1.92  		time=$(date +%s)
    1.93  		pkg="$1"
    1.94  		[ -z "$pkg" ] && usage
    1.95 +		receipt="$WOK/$pkg/receipt"
    1.96  		check_pkg_in_wok && echo ""
    1.97  		echo "cook:$pkg" > $command
    1.98  		unset inst
    1.99  		unset_receipt
   1.100 -		cd $WOK/$pkg && . ./receipt
   1.101 +		. $receipt
   1.102  		
   1.103  		# Handle --options
   1.104  		case "$2" in