SliTaz Repositories

     1.1 --- a/mkiso.sh	Wed Feb 23 05:03:35 2011 +0000
     1.2 +++ b/mkiso.sh	Fri Feb 25 12:01:24 2011 +0000
     1.3 @@ -36,9 +36,12 @@
     1.4  UPDATE_HG="no"
     1.5  BACKUP_SOURCES="no"
     1.6  BACKUP_PACKAGES="no"
     1.7 +BACKUP_ALL="no"
     1.8  CLEAN_MODULES_DIR="no"
     1.9  CLEAN_INITRAMFS="no"
    1.10 -HG_LIST="flavors flavors-stable libtaz slitaz-base-files slitaz-boot-scripts slitaz-configs slitaz-doc slitaz-forge slitaz-pizza slitaz-tools tank tazchroot tazlito tazpkg tazusb tazwok website wok wok-stable wok-tiny wok-undigest"
    1.11 +PACKAGES_REPOSITORY="$LOCAL_REPOSITORY/packages"
    1.12 +SOURCES_REPOSITORY="$LOCAL_REPOSITORY/src"
    1.13 +HG_LIST="flavors flavors-stable slitaz-base-files slitaz-boot-scripts slitaz-configs slitaz-dev-tools slitaz-doc slitaz-forge slitaz-pizza slitaz-tools tazlito tazpkg tazusb tazwok website wok wok-stable wok-tiny wok-undigest"
    1.14  
    1.15  error () { echo -e "\033[1;31;40m!!! \033[1;37;40m$@\033[1;0m"; }
    1.16  warn ()  { echo -e "\033[1;33;40m*** \033[1;37;40m$@\033[1;0m"; }
    1.17 @@ -269,19 +272,19 @@
    1.18  
    1.19  backup_pkg() {
    1.20  	if [ "${BACKUP_PACKAGES}" = "yes" ]; then
    1.21 -		[ -d $ISODIR/packages ] && rm -r $ISODIR/packages
    1.22 -		mkdir -p $ISODIR/packages
    1.23 +		[ -d $ISODIR/boot/packages ] && rm -r $ISODIR/boot/packages
    1.24 +		mkdir -p $ISODIR/boot/packages
    1.25  		info "Making cooking list based installed packages in union"
    1.26  		tazwok gen-cooklist $ISODIR/packages-installed.list > $ISODIR/cookorder.list
    1.27  		#[ -f $INCOMING_REPOSITORY/wok-wanted.txt ] || tazwok gen-wok-db
    1.28  		
    1.29 -		info "Linking all installed packages to $ISODIR/packages"
    1.30 +		info "Linking all installed packages to $ISODIR/boot/packages"
    1.31  		cat $ISODIR/packages-installed.list | while read PACKAGE; do
    1.32  			VERSION=$(grep ^VERSION= ${HG_DIR}/wok/${PACKAGE}/receipt | cut -d "=" -f2 | sed -e 's/"//g')
    1.33  			CACHE_PACKAGE=$(find $CACHE_DIR/$(cat /etc/slitaz-release)/packages -type f -name "$PACKAGE-$VERSION.tazpkg")	
    1.34  			if [ -f $CACHE_PACKAGE ]; then
    1.35 -				info "Copying $CACHE_PACKAGE to $ISODIR/packages"
    1.36 -				ln -sf $CACHE_PACKAGE $ISODIR/packages
    1.37 +				info "Copying $CACHE_PACKAGE to $ISODIR/boot/packages"
    1.38 +				ln -sf $CACHE_PACKAGE $ISODIR/boot/packages
    1.39  			#elif [ ! -f $CACHE_PACKAGE ]; then
    1.40  			#	info "$CACHE_PACKAGE doesn't exist. Downloading it."
    1.41  			#	cd $CACHE_DIR/$(cat /etc/slitaz-release)/packgages
    1.42 @@ -299,8 +302,8 @@
    1.43  				VERSION=$(grep  ^VERSION= ${HG_DIR}/wok/${WANTED_PKG}/receipt | cut -d "=" -f2 | sed -e 's/"//g')
    1.44  				CACHE_PACKAGE=$(find $CACHE_DIR/$(cat /etc/slitaz-release)/packages -type f -name "$WANTED_PKG-$VERSION.tazpkg")
    1.45  				if [ -f $CACHE_PACKAGE ]; then
    1.46 -					info "Copying $CACHE_PACKAGE to $ISODIR/packages"
    1.47 -					ln -sf $CACHE_PACKAGE $ISODIR/packages
    1.48 +					info "Copying $CACHE_PACKAGE to $ISODIR/boot/packages"
    1.49 +					ln -sf $CACHE_PACKAGE $ISODIR/boot/packages
    1.50  				#elif [ ! -f $CACHE_PACKAGE ]; then
    1.51  				#	info "$CACHE_PACKAGE doesn't exist. Downloading it."
    1.52  				#	cd $CACHE_DIR/$(cat /etc/slitaz-release)/packgages &>/dev/null
    1.53 @@ -313,7 +316,7 @@
    1.54  			done
    1.55  		done
    1.56  		
    1.57 -		[ -d $ISODIR/packages ] && tazwok gen-list $ISODIR/packages
    1.58 +		[ -d $ISODIR/boot/packages ] && tazwok gen-list $ISODIR/boot/packages
    1.59  	fi
    1.60  	
    1.61  }
    1.62 @@ -322,7 +325,7 @@
    1.63  
    1.64  	if [ "${BACKUP_PACKAGES}" = "yes" -a "${BACKUP_SOURCES}" = "yes" ]; then
    1.65  			[ -d $SOURCES_REPOSITORY ] || mkdir -p $SOURCES_REPOSITORY
    1.66 -			[ -d $ISODIR/sources ] || mkdir -p $ISODIR/sources
    1.67 +			[ -d $ISODIR/boot/src ] || mkdir -p $ISODIR/boot/src
    1.68  			
    1.69  			cat $ISODIR/cookorder.list | while read PACKAGE; do
    1.70  				WGET_URL=$(grep  ^WGET_URL= ${HG_DIR}/wok/${PACKAGE}/receipt | cut -d "=" -f2 | sed -e 's/"//g' | head -n 1)
    1.71 @@ -341,7 +344,7 @@
    1.72  					[  -f "$SOURCES_REPOSITORY/$TARBALL" ] && ln -sf $SOURCES_REPOSITORY/$TARBALL $ISODIR/sources/$TARBALL
    1.73  				fi
    1.74  			done
    1.75 -			cd $ISODIR/sources
    1.76 +			cd $ISODIR/boot/src
    1.77  			info "Make md5sum file for sources"
    1.78  			find * -not -type d | grep -v md5sum | xargs md5sum > md5sum
    1.79  			cd $WORKING
    1.80 @@ -349,6 +352,14 @@
    1.81  	
    1.82  }
    1.83  
    1.84 +backup_all()
    1.85 +{
    1.86 +	if [ "${BACKUP_ALL}" = "yes" ]; then
    1.87 +		[ -d $ISODIR/boot/src ] || ln -sf $SOURCES_REPOSITORY $ISODIR/boot/src
    1.88 +		[ -d $ISODIR/boot/packages ] || ln -sf $PACKAGES_REPOSITORY $ISODIR/boot/packages
    1.89 +	fi
    1.90 +}
    1.91 +
    1.92  # _mksquash dirname
    1.93  _mksquash () {
    1.94      if [ ! -d "$1" ]; then
    1.95 @@ -421,6 +432,8 @@
    1.96  		backup_src
    1.97  	fi
    1.98  	
    1.99 +	backup_all
   1.100 +	
   1.101  	info "====> Making bootable image"
   1.102  
   1.103  	# Sanity checks
   1.104 @@ -468,14 +481,15 @@
   1.105  	fi
   1.106  
   1.107  	info "Creating ISO image..."
   1.108 -	genisoimage -R -o $IMGNAME -b boot/isolinux/isolinux.bin \
   1.109 +	genisoimage -R -J -f -o $IMGNAME -b boot/isolinux/isolinux.bin \
   1.110  	-c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 \
   1.111  	-V "SliTaz" -input-charset iso8859-1 -boot-info-table $ISODIR
   1.112  	if [ -x /usr/bin/isohybrid ]; then
   1.113  		info "Creating hybrid ISO..."
   1.114  		isohybrid "${IMGNAME}"
   1.115  	fi
   1.116 -	md5sum "${IMGNAME}" > $IMGMD5NAME
   1.117 +	md5sum "$IMGNAME" > $IMGMD5NAME
   1.118 +	sed -i "s|$PROFILE/||g" $IMGMD5NAME
   1.119  }
   1.120  
   1.121  if [ "$MODULES" != "" ]; then