# HG changeset patch # User Christopher Rogers # Date 1339688700 0 # Node ID 1b4e8a04182af9931e3337ff8fc283b63e22d679 # Parent 4b4fe42326c75c12b00e83ba3426eb660835a2ad 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. diff -r 4b4fe42326c7 -r 1b4e8a04182a cook --- a/cook Tue Jun 12 14:40:02 2012 +0000 +++ b/cook Thu Jun 14 15:45:00 2012 +0000 @@ -124,24 +124,40 @@ # Paths used in receipt and by cook itself. set_paths() { pkgdir=$WOK/$PACKAGE - src=$pkgdir/source/$PACKAGE-$VERSION + basesrc=$pkgdir/source + tmpsrc=$basesrc/tmp + src=$basesrc/$PACKAGE-$VERSION taz=$pkgdir/taz pack=$taz/$PACKAGE-${VERSION}${EXTRAVERSION} fs=$pack/fs stuff=$pkgdir/stuff install=$pkgdir/install + pkgsrc="${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}" + lzma_tarball="$pkgsrc.tar.lzma" + if [ "$PATCH" ]; then + [ "${PTARBALL}" ] || PTARBALL="$(basename $PATCH)" + fi if [ "$WANTED" ]; then - wanted=${WANTED%% *} - src=$WOK/$wanted/source/$wanted-$VERSION - install=$WOK/$wanted/install - wanted_stuff=$WOK/$wanted/stuff + basesrc=$WOK/$WANTED/source + src=$basesrc/$WANTED-$VERSION + install=$WOK/$WANTED/install + wanted_stuff=$WOK/$WANTED/stuff fi if [ "$SOURCE" ]; then source_stuff=$WOK/$SOURCE/stuff fi - # Kernel version is set from linux-api-headers since it is part of toolchain. - if [ -f "$INSTALLED/linux-api-headers/receipt" ]; then - kvers=$(grep ^VERSION= $INSTALLED/linux-api-headers/receipt | cut -d '"' -f 2) + # Kernel version is set from linux + if [ -f "$WOK/linux/receipt" ]; then + kvers=$(grep ^VERSION= $WOK/linux/receipt | cut -d '"' -f 2) + kbasevers=${kvers:0:3} + fi + # Python version + if [ -f "$WOK/python/receipt" ]; then + pyvers=$(grep ^VERSION= $WOK/python/receipt | cut -d '"' -f 2) + fi + # perl version for some packages needed it + if [ -f "$WOK/perl/receipt" ]; then + perlvers=$(grep ^VERSION= $WOK/perl/receipt | cut -d '"' -f 2) fi # Old way compatibility. _pkg=$install