cookutils rev 492

cook: Merge set_paths functions from slitaz-tank branch. This adds basesrc, kbasevers, pyvers, pkgsrc, lzma_tarball, and perlvers variables. KBASEVER is in linux and linux-libre and is needed to make sure .tar.lzma sources are named right when they use minor patches.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Jun 14 15:45:00 2012 +0000 (2012-06-14)
parents 4b4fe42326c7
children 37e50cc5ecfb
files cook
line diff
     1.1 --- a/cook	Tue Jun 12 14:40:02 2012 +0000
     1.2 +++ b/cook	Thu Jun 14 15:45:00 2012 +0000
     1.3 @@ -124,24 +124,40 @@
     1.4  # Paths used in receipt and by cook itself.
     1.5  set_paths() {
     1.6  	pkgdir=$WOK/$PACKAGE
     1.7 -	src=$pkgdir/source/$PACKAGE-$VERSION
     1.8 +	basesrc=$pkgdir/source
     1.9 +	tmpsrc=$basesrc/tmp
    1.10 +	src=$basesrc/$PACKAGE-$VERSION
    1.11  	taz=$pkgdir/taz
    1.12  	pack=$taz/$PACKAGE-${VERSION}${EXTRAVERSION}
    1.13  	fs=$pack/fs
    1.14  	stuff=$pkgdir/stuff
    1.15  	install=$pkgdir/install
    1.16 +	pkgsrc="${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}"
    1.17 +	lzma_tarball="$pkgsrc.tar.lzma"
    1.18 +	if [ "$PATCH" ]; then
    1.19 +		[ "${PTARBALL}" ] || PTARBALL="$(basename $PATCH)"
    1.20 +	fi
    1.21  	if [ "$WANTED" ]; then
    1.22 -		wanted=${WANTED%% *}
    1.23 -		src=$WOK/$wanted/source/$wanted-$VERSION
    1.24 -		install=$WOK/$wanted/install
    1.25 -		wanted_stuff=$WOK/$wanted/stuff
    1.26 +		basesrc=$WOK/$WANTED/source
    1.27 +		src=$basesrc/$WANTED-$VERSION
    1.28 +		install=$WOK/$WANTED/install
    1.29 +		wanted_stuff=$WOK/$WANTED/stuff
    1.30  	fi
    1.31  	if [ "$SOURCE" ]; then
    1.32  		source_stuff=$WOK/$SOURCE/stuff
    1.33  	fi
    1.34 -	# Kernel version is set from linux-api-headers since it is part of toolchain.
    1.35 -	if [ -f "$INSTALLED/linux-api-headers/receipt" ]; then
    1.36 -		kvers=$(grep ^VERSION= $INSTALLED/linux-api-headers/receipt | cut -d '"' -f 2)
    1.37 +	# Kernel version is set from linux
    1.38 +	if [ -f "$WOK/linux/receipt" ]; then
    1.39 +		kvers=$(grep ^VERSION= $WOK/linux/receipt | cut -d '"' -f 2)
    1.40 +		kbasevers=${kvers:0:3}
    1.41 +	fi
    1.42 +	# Python version 
    1.43 +	if [ -f "$WOK/python/receipt" ]; then
    1.44 +		pyvers=$(grep ^VERSION= $WOK/python/receipt | cut -d '"' -f 2)
    1.45 +	fi
    1.46 +	# perl version for some packages needed it
    1.47 +	if [ -f "$WOK/perl/receipt" ]; then
    1.48 +		perlvers=$(grep ^VERSION= $WOK/perl/receipt | cut -d '"' -f 2)
    1.49  	fi
    1.50  	# Old way compatibility.
    1.51  	_pkg=$install