cookutils rev 468 slitaz-tank
cook: Add AUFS_MODE variable. Add some changes to setup option thats used in slitaz-tank version of cookutils.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Fri Jun 08 14:04:25 2012 +0000 (2012-06-08) |
parents | d4404b25ff07 |
children | 9d14c3958c44 |
files | cook |
line diff
1.1 --- a/cook Thu Jun 07 19:39:56 2012 +0000 1.2 +++ b/cook Fri Jun 08 14:04:25 2012 +0000 1.3 @@ -246,7 +246,7 @@ 1.4 cvs -d:$url co $mod && mv $mod $pkgsrc 1.5 create_tarball ;; 1.6 svn*|subversion*) 1.7 - if $(echo "$WGET_URL" | fgrep -q "svn|"); then 1.8 + if $(echo "$file" | fgrep -q "svn|"); then 1.9 url=${file#svn|} 1.10 else 1.11 url=${file#subversion|} 1.12 @@ -289,6 +289,7 @@ 1.13 *.run) /bin/sh $SRC/$TARBALL $RUN_OPTS ;; 1.14 *) cp $SRC/$TARBALL $(pwd) ;; 1.15 esac 1.16 + chown -R 0.0 $(pwd) 1.17 } 1.18 1.19 # Display cooked package summary. 1.20 @@ -940,14 +941,15 @@ 1.21 gettext "Using config file: /etc/slitaz/cross.conf"; echo 1.22 . /etc/slitaz/cross.conf ;; 1.23 esac 1.24 - for pkg in $SETUP_PKGS; do 1.25 + for pkg in $INSTALL_PKGS; do 1.26 if [ "$forced" ]; then 1.27 tazpkg -gi $pkg --forced 1.28 else 1.29 - [ -d "$INSTALLED/$pkg" ] || tazpkg get-install $pkg 1.30 + [ -f "$INSTALLED/$pkg/receipt" ] || tazpkg get-install $pkg 1.31 fi 1.32 done 1.33 - 1.34 + # chroot list 1.35 + ls -1 "$INSTALLED" > $CACHE/chroot-pkgs 1.36 # Handle --options 1.37 case "$2" in 1.38 --wok) 1.39 @@ -1286,7 +1288,9 @@ 1.40 gettext -e "Blocked package:"; echo -e " $pkg\n" && exit 0 1.41 fi 1.42 1.43 - try_aufs_chroot "$@" 1.44 + if [ "$AUFS_MODE" ]; then 1.45 + try_aufs_chroot "$@" 1.46 + fi 1.47 1.48 # Log and source receipt. 1.49 echo "Cook started for: <a href='cooker.cgi?pkg=$pkg'>$pkg</a>" | log