# HG changeset patch # User Christopher Rogers # Date 1339164265 0 # Node ID 5ed0cfc943a639deb41925fb576d78238d74fb16 # Parent d4404b25ff07385b456d0d6273d3c27e9a0a582a cook: Add AUFS_MODE variable. Add some changes to setup option thats used in slitaz-tank version of cookutils. diff -r d4404b25ff07 -r 5ed0cfc943a6 cook --- a/cook Thu Jun 07 19:39:56 2012 +0000 +++ b/cook Fri Jun 08 14:04:25 2012 +0000 @@ -246,7 +246,7 @@ cvs -d:$url co $mod && mv $mod $pkgsrc create_tarball ;; svn*|subversion*) - if $(echo "$WGET_URL" | fgrep -q "svn|"); then + if $(echo "$file" | fgrep -q "svn|"); then url=${file#svn|} else url=${file#subversion|} @@ -289,6 +289,7 @@ *.run) /bin/sh $SRC/$TARBALL $RUN_OPTS ;; *) cp $SRC/$TARBALL $(pwd) ;; esac + chown -R 0.0 $(pwd) } # Display cooked package summary. @@ -940,14 +941,15 @@ gettext "Using config file: /etc/slitaz/cross.conf"; echo . /etc/slitaz/cross.conf ;; esac - for pkg in $SETUP_PKGS; do + for pkg in $INSTALL_PKGS; do if [ "$forced" ]; then tazpkg -gi $pkg --forced else - [ -d "$INSTALLED/$pkg" ] || tazpkg get-install $pkg + [ -f "$INSTALLED/$pkg/receipt" ] || tazpkg get-install $pkg fi done - + # chroot list + ls -1 "$INSTALLED" > $CACHE/chroot-pkgs # Handle --options case "$2" in --wok) @@ -1286,7 +1288,9 @@ gettext -e "Blocked package:"; echo -e " $pkg\n" && exit 0 fi - try_aufs_chroot "$@" + if [ "$AUFS_MODE" ]; then + try_aufs_chroot "$@" + fi # Log and source receipt. echo "Cook started for: $pkg" | log