SliTaz Repositories

     1.1 --- a/mkiso.sh	Sat Apr 30 21:50:02 2011 +0000
     1.2 +++ b/mkiso.sh	Tue May 03 08:06:31 2011 +0000
     1.3 @@ -34,7 +34,7 @@
     1.4  MODULES_DIR="$WORKING/modules"
     1.5  HG_DIR="$WORKING/hg"
     1.6  HG_URL="http://hg.slitaz.org"
     1.7 -HG_PATH="home/slitaz/repos"
     1.8 +HG_PATH="repos"
     1.9  COPY_HG="no"
    1.10  UPDATE_HG="no"
    1.11  BACKUP_SOURCES="no"
    1.12 @@ -157,13 +157,16 @@
    1.13  	fi
    1.14  
    1.15  	#if [ ! -f $ISODIR/boot/bzImage ]; then
    1.16 +	if [ -f $INITRAMFS/boot/vmlinuz* ]; then
    1.17  		cp -a $INITRAMFS/boot/vmlinuz* $ISODIR/boot/bzImage
    1.18  		rm -f $INITRAMFS/boot/vmlinuz*
    1.19 -		if [ -f $INITRAMFS/boot/gpxe ]; then
    1.20 -			cp -a $INITRAMFS/boot/gpxe $ISODIR/boot/gpxe
    1.21 -			rm -f $INITRAMFS/boot/gpxe
    1.22 -		fi
    1.23 -	#fi
    1.24 +	fi
    1.25 +	
    1.26 +	if [ -f $INITRAMFS/boot/gpxe ]; then
    1.27 +		cp -a $INITRAMFS/boot/gpxe $ISODIR/boot/gpxe
    1.28 +		rm -f $INITRAMFS/boot/gpxe
    1.29 +	fi
    1.30 +	
    1.31  	if [ -d $BASEDIR/initramfs ]; then
    1.32  		for i in $KEY_FILES; do
    1.33  			if [ -f $BASEDIR/initramfs/$i ]; then
    1.34 @@ -324,7 +327,7 @@
    1.35  			fi
    1.36  		done
    1.37  		tazwok gen-cooklist $ISODIR/packages-installed.list > $ISODIR/cookorder.list
    1.38 -		[ -f $INCOMING_REPOSITORY/wok-wanted.txt ] || tazwok gen-wok-db
    1.39 +		[ -f $INCOMING_REPOSITORY/wok-wanted.txt ] || tazwok gen-wok-db --WOK=$WOK
    1.40  		
    1.41  		CACHE_REPOSITORY="$CACHE_DIR/$(cat /etc/slitaz-release)/packages"
    1.42  
    1.43 @@ -478,28 +481,30 @@
    1.44  	fi
    1.45  	
    1.46  	if [ "$MY_HG_LIST" != "" ]; then
    1.47 -		for my_hg in $MY_HG_LIST; do
    1.48 -			HG_URL="$MY_HG_URL"
    1.49 -			copy_hg $my_hg
    1.50 -			WOK=${HG_DIR}/my-wok/home/slitaz/repos/my-wok
    1.51 -			if [ -d $WOK/.hg ]; then
    1.52 -				cd $WOK
    1.53 -				hg update cooking
    1.54 -				cd $PROFILE
    1.55 -			fi
    1.56 -			squashfs_hg $my_hg
    1.57 -		done
    1.58 +		if [ "$COPY_HG" = "yes" ]; then
    1.59 +			for my_hg in $MY_HG_LIST; do
    1.60 +				HG_URL="$MY_HG_URL"
    1.61 +				copy_hg $my_hg
    1.62 +				WOK=${HG_DIR}/my-wok/repos/my-wok
    1.63 +				if [ -d $WOK/.hg ]; then
    1.64 +					cd $WOK
    1.65 +					hg update cooking
    1.66 +					cd $PROFILE
    1.67 +				fi
    1.68 +				squashfs_hg $my_hg
    1.69 +			done
    1.70 +		fi
    1.71  	fi
    1.72  
    1.73  	[ -d $SRCISO_DIR ] && rm -r $SRCISO_DIR
    1.74  	[ -d $PKGISO_DIR ] && rm -r $PKGISO_DIR
    1.75  	
    1.76 -	if [ -d ${HG_DIR}/my-wok/home/slitaz/repos/my-wok/.hg ]; then
    1.77 -		WOK=${HG_DIR}/my-wok/home/slitaz/repos/my-wok
    1.78 +	if [ -d ${HG_DIR}/my-wok/repos/my-wok/.hg ]; then
    1.79 +		WOK=${HG_DIR}/my-wok/repos/my-wok
    1.80  		backup_pkg
    1.81  		backup_src
    1.82 -	elif [ -d ${HG_DIR}/wok/home/slitaz/repos/wok/.hg ]; then
    1.83 -		WOK=${HG_DIR}/wok/home/slitaz/repos/wok
    1.84 +	elif [ -d ${HG_DIR}/wok/repos/wok/.hg ]; then
    1.85 +		WOK=${HG_DIR}/wok/repos/wok
    1.86  		backup_pkg
    1.87  		backup_src
    1.88  	fi
    1.89 @@ -566,10 +571,10 @@
    1.90  	sed -i "s|$PROFILE/||g" $IMGMD5NAME
    1.91  }
    1.92  
    1.93 -if [ "$MODULES" != "" ]; then
    1.94 +if [ "$BASE_MODULES" != "" ]; then
    1.95  	union
    1.96  else
    1.97 -	error "MODULES was empty. exiting."
    1.98 +	error "BASE_MODULES was empty. exiting."
    1.99  	exit 1
   1.100  fi
   1.101