# HG changeset patch # User Aleksej Bobylev # Date 1496864169 -10800 # Node ID d30a093674f6a00b00fecdad9bdbcb1d39022dca # Parent a608dbb232df2a38cff643c62763c0c7acc2c800 cook, lighttpd/index.cgi: forgot about EXTRAVERSION. diff -r a608dbb232df -r d30a093674f6 cook --- a/cook Wed Jun 07 21:39:55 2017 +0300 +++ b/cook Wed Jun 07 22:36:09 2017 +0300 @@ -1050,7 +1050,7 @@ fi action 'QA: checking for empty package...' - files=$(cat $WOK/$pkg/taz/$PACKAGE-$VERSION/files.list | wc -l) + files=$(cat $WOK/$pkg/taz/$PACKAGE-$VERSION$EXTRAVERSION/files.list | wc -l) if [ "$files" -eq 0 -a "$CATEGORY" != 'meta' ]; then broken rm -f $command @@ -1072,7 +1072,7 @@ fi done rm -r "$tempd" - mv -f $pkgdir/taz/$PACKAGE-$VERSION.tazpkg $PKGS + mv -f $pkgdir/taz/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg $PKGS sed -i /^${pkg}$/d $broken #action 'Removing source tree...' #rm -f $WOK/$pkg/source; status diff -r a608dbb232df -r d30a093674f6 lighttpd/index.cgi --- a/lighttpd/index.cgi Wed Jun 07 21:39:55 2017 +0300 +++ b/lighttpd/index.cgi Wed Jun 07 22:36:09 2017 +0300 @@ -1002,11 +1002,20 @@ # find main package wanted=$(. $wok/$pkg/receipt; echo $WANTED) main=${wanted:-$pkg} + # identify split packages split="$main $(. $wok/$main/receipt; echo $SPLIT)" [ -d "$wok/$main-dev" ] && split="$split $main-dev" split="$(echo $split | tr ' ' '\n' | sort -u)" + # finally we need the version + if [ -f "$WOK/linux/receipt" ]; then + kvers=$(. $WOK/linux/receipt; echo $VERSION) + kbasevers=$(echo $kvers | cut -d. -f1,2) + elif [ -f "$INSTALLED/linux-api-headers/receipt" ]; then + kvers=$(. $INSTALLED/linux-api-headers/receipt; echo $VERSION) + kbasevers=$(echo $kvers | cut -d. -f1,2) + fi ver=$(. $wok/$main/receipt; echo $VERSION$EXTRAVERSION) for p in $split; do