SliTaz Repositories

     1.1 --- a/tazlito	Mon Feb 22 11:24:41 2016 +0200
     1.2 +++ b/tazlito	Wed Feb 24 02:54:36 2016 +0200
     1.3 @@ -1375,7 +1375,7 @@
     1.4  
     1.5  pi_lists() {
     1.6  	local pi
     1.7 -	[ -s "$root$LOCALSTATE/packages.info" ] || tazpkg recharge >/dev/null 2>&1
     1.8 +	[ -s "$root$LOCALSTATE/packages.info" ] || tazpkg recharge --root="$root" >/dev/null 2>&1
     1.9  	local priority="$root$LOCALSTATE/priority"
    1.10  	local undigest="$root$LOCALSTATE/undigest"
    1.11  
    1.12 @@ -1574,9 +1574,9 @@
    1.13  
    1.14  install_list_to_rootfs() {
    1.15  	local list="$1" rootfs="$2" pkg i ii
    1.16 +	local undigest="$rootfs/var/lib/tazpkg/undigest"
    1.17  
    1.18  	# initial tazpkg setup in empty rootfs
    1.19 -	export root="$rootfs"
    1.20  	tazpkg --root=$rootfs >/dev/null 2>&1
    1.21  	# link rootfs packages cache to the regular packages cache
    1.22  	rm -r "$rootfs/var/cache/tazpkg"
    1.23 @@ -1587,6 +1587,7 @@
    1.24  	# Just in case if flavor not contains "tazlito" package
    1.25  	mkdir -p "$rootfs/etc/tazlito"
    1.26  
    1.27 +	newline
    1.28  	for pkg in $(cat $list); do
    1.29  		action 'Installing package: %s' "$pkg"
    1.30  		yes y | tazpkg -gi $pkg --root=$rootfs --quiet >> $log || exit 1
    1.31 @@ -1597,7 +1598,7 @@
    1.32  	restore_mirrors
    1.33  	# Remove 'fresh' and 'repacked' undigest repos leaving all other
    1.34  	for i in fresh repacked; do
    1.35 -		ii="$rootfs/var/lib/tazpkg/undigest/$i"
    1.36 +		ii="$undigest/$i"
    1.37  		[ -d "$ii" ] && rm -rf "$ii"
    1.38  		ii="$rootfs/var/lib/tazpkg/priority"
    1.39  		if [ -f "$ii" ]; then
    1.40 @@ -1605,24 +1606,19 @@
    1.41  			[ -s "$ii" ] || rm "$ii"
    1.42  		fi
    1.43  	done
    1.44 -	[ -d "$rootfs/var/lib/tazpkg/undigest" ] && \
    1.45 -	for i in $(find "$rootfs/var/lib/tazpkg/undigest" -type f); do
    1.46 +	[ -d "$undigest" ] && \
    1.47 +	for i in $(find "$undigest" -type f); do
    1.48  		# Remove all undigest PKGDB files but 'mirror'
    1.49  		[ "$(basename "$i")" != 'mirror' ] && rm "$i"
    1.50  	done
    1.51 -	[ -d "$rootfs/var/lib/tazpkg/undigest" ] && \
    1.52 -		rmdir --ignore-fail-on-non-empty "$rootfs/var/lib/tazpkg/undigest"
    1.53 +	[ -d "$undigest" ] && \
    1.54 +		rmdir --ignore-fail-on-non-empty "$undigest"
    1.55  
    1.56  	# Un-link packages cache
    1.57  	rm "$rootfs/var/cache/tazpkg"
    1.58  
    1.59  	# Clean /var/lib/tazpkg
    1.60 -	rm  $rootfs/var/lib/tazpkg/ID* \
    1.61 -		$rootfs/var/lib/tazpkg/descriptions.txt \
    1.62 -		$rootfs/var/lib/tazpkg/extra.list \
    1.63 -		$rootfs/var/lib/tazpkg/files* \
    1.64 -		$rootfs/var/lib/tazpkg/packages.* \
    1.65 -		2>/dev/null
    1.66 +	(cd $rootfs/var/lib/tazpkg; rm ID* descriptions.txt extra.list files* packages.* 2>/dev/null)
    1.67  }
    1.68  
    1.69  
    1.70 @@ -2321,8 +2317,7 @@
    1.71  		# Rootfs stuff.
    1.72  		echo 'Preparing the rootfs directory...'
    1.73  		mkdir -p "$ROOTFS"
    1.74 -		mkdir -p "$TMP_DIR"
    1.75 -
    1.76 +		export root="$ROOTFS"
    1.77  		strip_versions "$LIST_NAME"
    1.78  
    1.79  		if [ "$REPACK" == 'y' ]; then
    1.80 @@ -2460,12 +2455,10 @@
    1.81  				sed 's/.*/&.tazpkg/' < $flavor.pkglist > $DISTRO/list-packages0$n
    1.82  				status
    1.83  
    1.84 +				mkdir ${ROOTFS}0$n
    1.85 +				export root="${ROOTFS}0$n"
    1.86  				strip_versions "$DISTRO/list-packages0$n"
    1.87  
    1.88 -				mkdir ${ROOTFS}0$n
    1.89 -				# Install packages
    1.90 -				cd $PACKAGES_REPOSITORY
    1.91 -
    1.92  				install_list_to_rootfs "$DISTRO/list-packages0$n" "${ROOTFS}0$n"
    1.93  
    1.94  				rm -rf ${ROOTFS}0$n/boot