SliTaz Repositories

     1.1 --- a/slitaz-dev-tools/stuff/tazdev	Sun Jun 21 03:26:15 2009 +0200
     1.2 +++ b/slitaz-dev-tools/stuff/tazdev	Sun Jun 21 03:56:11 2009 +0200
     1.3 @@ -61,13 +61,18 @@
     1.4  {
     1.5  	if [ "$2" = "stable" ]; then
     1.6  		VERSION=stable
     1.7 -		ROOTFS=$STABLE/chroot
     1.8 +		SLITAZ=$STABLE
     1.9  	elif [ -n "$2" ]; then
    1.10 -		ROOTFS=$2
    1.11 +		# Undigest - custom ?
    1.12 +		VERSION=$2
    1.13 +		SLITAZ=/home/slitaz/$2
    1.14  	else
    1.15  		VERSION=cooking
    1.16 -		ROOTFS=$COOKING/chroot
    1.17 +		SLITAZ=$COOKING
    1.18  	fi
    1.19 +	ROOTFS=$SLITAZ/chroot
    1.20 +	HG_WOK=$SLITAZ/wok
    1.21 +	BUILD_WOK=$SLITAZ/chroot/home/slitaz/wok
    1.22  }
    1.23  
    1.24  check_mirror()
    1.25 @@ -84,10 +89,10 @@
    1.26  	else
    1.27  		REMOTE_DIR=$MIRROR_DIR/cooking/
    1.28  		LOCAL_DIR=$COOKING/packages/
    1.29 -	fi	
    1.30 +	fi
    1.31  }
    1.32  
    1.33 -# Mount virtual Kernel file systems and chroot but check that nobody 
    1.34 +# Mount virtual Kernel file systems and chroot but check that nobody
    1.35  # else has done mounts
    1.36  mount_chroot()
    1.37  {
    1.38 @@ -101,7 +106,7 @@
    1.39  	fi
    1.40  }
    1.41  
    1.42 -# Unmount virtual Kernel file systems on exit and ensure we are the last 
    1.43 +# Unmount virtual Kernel file systems on exit and ensure we are the last
    1.44  # user before unmounting !
    1.45  umount_chroot()
    1.46  {
    1.47 @@ -177,13 +182,7 @@
    1.48  		# file and so we can also modify receipt directly without affecting
    1.49  		# the Hg wok.
    1.50  		check_root
    1.51 -		if [ "$2" = "stable" ]; then
    1.52 -			HG_WOK=$STABLE/wok
    1.53 -			BUILD_WOK=$STABLE/chroot/home/slitaz
    1.54 -		else
    1.55 -			HG_WOK=$COOKING/wok
    1.56 -			BUILD_WOK=$COOKING/chroot/home/slitaz
    1.57 -		fi
    1.58 +		get_version
    1.59  		echo ""
    1.60  		echo "Hg wok    : $HG_WOK"
    1.61  		echo "Build wok : $BUILD_WOK"
    1.62 @@ -199,7 +198,7 @@
    1.63  		cd $WEBSITE && hg pull && hg update
    1.64  		echo "" ;;
    1.65  	chroot)
    1.66 -		# Chroot into a build env. Default to cooking configured in 
    1.67 +		# Chroot into a build env. Default to cooking configured in
    1.68  		# tazdev.conf
    1.69  		check_root
    1.70  		get_version

     2.1 --- a/tazpkg-web/stuff/tazpkg-web	Sun Jun 21 03:26:15 2009 +0200
     2.2 +++ b/tazpkg-web/stuff/tazpkg-web	Sun Jun 21 03:56:11 2009 +0200
     2.3 @@ -236,8 +236,7 @@
     2.4  }
     2.5  
     2.6  # Prefer the Hg wok in the chroot. On host running Tazbb the wok's
     2.7 -# are updated and copied automaticaly and it conflict with Tazdev
     2.8 -# designed to maintain a local chroot environment without a build bot.
     2.9 +# are updated and copied automaticaly and so more up-to-date.
    2.10  
    2.11  case "$1" in
    2.12  	stats)