cookutils rev 915
cook, lighttpd/index.cgi: forgot about EXTRAVERSION.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Wed Jun 07 22:36:09 2017 +0300 (2017-06-07) |
parents | a608dbb232df |
children | 3719a0d2e2c5 |
files | cook lighttpd/index.cgi |
line diff
1.1 --- a/cook Wed Jun 07 21:39:55 2017 +0300 1.2 +++ b/cook Wed Jun 07 22:36:09 2017 +0300 1.3 @@ -1050,7 +1050,7 @@ 1.4 fi 1.5 1.6 action 'QA: checking for empty package...' 1.7 - files=$(cat $WOK/$pkg/taz/$PACKAGE-$VERSION/files.list | wc -l) 1.8 + files=$(cat $WOK/$pkg/taz/$PACKAGE-$VERSION$EXTRAVERSION/files.list | wc -l) 1.9 if [ "$files" -eq 0 -a "$CATEGORY" != 'meta' ]; then 1.10 broken 1.11 rm -f $command 1.12 @@ -1072,7 +1072,7 @@ 1.13 fi 1.14 done 1.15 rm -r "$tempd" 1.16 - mv -f $pkgdir/taz/$PACKAGE-$VERSION.tazpkg $PKGS 1.17 + mv -f $pkgdir/taz/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg $PKGS 1.18 sed -i /^${pkg}$/d $broken 1.19 #action 'Removing source tree...' 1.20 #rm -f $WOK/$pkg/source; status
2.1 --- a/lighttpd/index.cgi Wed Jun 07 21:39:55 2017 +0300 2.2 +++ b/lighttpd/index.cgi Wed Jun 07 22:36:09 2017 +0300 2.3 @@ -1002,11 +1002,20 @@ 2.4 # find main package 2.5 wanted=$(. $wok/$pkg/receipt; echo $WANTED) 2.6 main=${wanted:-$pkg} 2.7 + 2.8 # identify split packages 2.9 split="$main $(. $wok/$main/receipt; echo $SPLIT)" 2.10 [ -d "$wok/$main-dev" ] && split="$split $main-dev" 2.11 split="$(echo $split | tr ' ' '\n' | sort -u)" 2.12 + 2.13 # finally we need the version 2.14 + if [ -f "$WOK/linux/receipt" ]; then 2.15 + kvers=$(. $WOK/linux/receipt; echo $VERSION) 2.16 + kbasevers=$(echo $kvers | cut -d. -f1,2) 2.17 + elif [ -f "$INSTALLED/linux-api-headers/receipt" ]; then 2.18 + kvers=$(. $INSTALLED/linux-api-headers/receipt; echo $VERSION) 2.19 + kbasevers=$(echo $kvers | cut -d. -f1,2) 2.20 + fi 2.21 ver=$(. $wok/$main/receipt; echo $VERSION$EXTRAVERSION) 2.22 2.23 for p in $split; do