SliTaz Repositories

     1.1 --- a/sat-rpi	Sun Mar 30 20:21:03 2014 +0100
     1.2 +++ b/sat-rpi	Sun Apr 13 05:24:04 2014 +0200
     1.3 @@ -15,6 +15,7 @@
     1.4  distro="$work/distro"
     1.5  rpi="$work/rpi"
     1.6  data="$rpi/data"
     1.7 +cache="$rpi/cache"
     1.8  boot="$distro/boot"
     1.9  rootfs="$distro/rootfs"
    1.10  rpi_git="$rpi/git"
    1.11 @@ -160,8 +161,8 @@
    1.12  		
    1.13  		# Store sdcard partition(s) list
    1.14  		fdisk -l /dev/${dev} | grep "^/dev/$dev" | awk '{print $1}' \
    1.15 -			> ${data}/sdcard.part
    1.16 -		partnb=$(cat ${data}/sdcard.part | wc -l)
    1.17 +			> ${cache}/sdcard.part
    1.18 +		partnb=$(cat ${cache}/sdcard.part | wc -l)
    1.19  		if [ "$partnb" != 3 ]; then
    1.20  			error "SliTaz RPi needs 3 partitions on the sdcard" 
    1.21  			newline && exit 1
    1.22 @@ -191,7 +192,7 @@
    1.23  		echo -n "Unmounting: RPi sdcard"
    1.24  		umount_sd; status
    1.25  		
    1.26 -		rm -f ${data}/sdcard.part
    1.27 +		rm -f ${cache}/sdcard.part
    1.28  		separator
    1.29  		echo "Insert the SD card into your Raspberry Pi and boot!"
    1.30  		newline ;;
    1.31 @@ -284,10 +285,10 @@
    1.32  		fi
    1.33  		
    1.34  		# Kernel at last
    1.35 -		. $data/linux-*/receipt
    1.36 +		. $cache/linux-*/receipt
    1.37  		kvers="$VERSION"
    1.38  		kpkg="$rootfs/var/lib/tazpkg/installed/linux"
    1.39 -		fs="$data/linux-$kvers/fs"
    1.40 +		fs="$cache/linux-$kvers/fs"
    1.41  		ksize=$(du -sh $fs | awk '{print $1}')
    1.42  		if [ -d "$fs" ]; then
    1.43  			echo -n "Copying: kernel $kvers ($ksize)"
    1.44 @@ -295,7 +296,7 @@
    1.45  			cp -rf ${fs}/lib/* ${rootfs}/lib
    1.46  			cp -f  ${fs}/boot/* ${boot}
    1.47  			mkdir -p ${kpkg}
    1.48 -			cd ${data}/linux-${kvers}
    1.49 +			cd ${cache}/linux-${kvers}
    1.50  			cp -f files.list md5sum receipt ${kpkg}
    1.51  			status
    1.52  		else
    1.53 @@ -310,7 +311,7 @@
    1.54  	cook-linux)
    1.55  		# Native SliTaz Toolchain and cross toolchain must be installed
    1.56  		check_root
    1.57 -		install="$data/linux-install"
    1.58 +		install="$cache/linux-install"
    1.59  		if [ ! -d "/cross/$arch" ]; then
    1.60  			error "Missing cross toolchain in: /cross/$arch" && exit 1
    1.61  		fi
    1.62 @@ -328,7 +329,7 @@
    1.63  			make mrproper &&
    1.64  			make ARCH=arm bcmrpi_defconfig
    1.65  			echo "Patching SliTaz RPi Linux .config"
    1.66 -			patch -p0 -i ${rpi}/linux-rpi.patch || exit 1
    1.67 +			patch -p0 -i ${data}/linux-rpi.patch || exit 1
    1.68  			make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- zImage &&
    1.69  			make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- modules &&
    1.70  			make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- \
    1.71 @@ -353,18 +354,18 @@
    1.72  		depmod -b . ${kvers%+}-slitaz-rpi+
    1.73  		
    1.74  		# Kernel
    1.75 -		fs="$data/linux-$kvers/fs"
    1.76 +		fs="$cache/linux-$kvers/fs"
    1.77  		echo "Kernel version: $kvers"
    1.78  		if [ -d "$install" ]; then
    1.79 -			rm -rf ${data}/linux-${kvers}
    1.80 -			mkdir -p ${data}/linux-${kvers}
    1.81 +			rm -rf ${cache}/linux-${kvers}
    1.82 +			mkdir -p ${cache}/linux-${kvers}
    1.83  			cp -a ${install} ${fs}
    1.84  			rm -f ${fs}/lib/modules/*/build \
    1.85  				${fs}/lib/modules/*/source
    1.86  		fi
    1.87  		
    1.88  		# Pack .tazpkg
    1.89 -		cd ${data}
    1.90 +		cd ${cache}
    1.91  		echo "Creating package: receipt"
    1.92  		cat > linux-$kvers/receipt << EOT
    1.93  # SliTaz package receipt
    1.94 @@ -386,34 +387,34 @@
    1.95  	get-linux)
    1.96  		# Precook RPi kernel
    1.97  		check_root
    1.98 -		mkdir -p ${data}
    1.99 +		mkdir -p ${cache}
   1.100  		
   1.101  		# Last version
   1.102 -		rm -f ${data}/linux-version.txt
   1.103 +		rm -f ${cache}/linux-version.txt
   1.104  		if busybox wget -q -s ${rpi_mirror}/last-linux.txt; then
   1.105  			echo -n "Fetching latest Kernel string..."
   1.106  			wget -q ${rpi_mirror}/last-linux.txt \
   1.107 -				-O ${data}/linux-version.txt || exit 1
   1.108 +				-O ${cache}/linux-version.txt || exit 1
   1.109  			status
   1.110  		else
   1.111  			echo "Mirror is unreachable" && exit 1
   1.112  		fi
   1.113 -		kvers=$(cat $data/linux-version.txt)
   1.114 -		[ "$up" ] && rm -rf ${data}/linux-${kvers}*
   1.115 +		kvers=$(cat $cache/linux-version.txt)
   1.116 +		[ "$up" ] && rm -rf ${cache}/linux-${kvers}*
   1.117  		echo "Kernel version: $kvers"
   1.118  		
   1.119  		# Download
   1.120 -		if [ ! -f "$data/linux-$kvers.tazpkg" ]; then
   1.121 +		if [ ! -f "$cache/linux-$kvers.tazpkg" ]; then
   1.122  			echo -n "Fetching latest Linux package..."
   1.123  			wget -q ${rpi_mirror}/linux-${kvers}.tazpkg \
   1.124 -				-O ${data}/linux-${kvers}.tazpkg; status
   1.125 +				-O ${cache}/linux-${kvers}.tazpkg; status
   1.126  		fi
   1.127  		
   1.128  		# Extract
   1.129 -		if [ ! -d "$data/linux-$kvers" ]; then
   1.130 -			cd ${data} && tazpkg extract linux-${kvers}.tazpkg
   1.131 +		if [ ! -d "$cache/linux-$kvers" ]; then
   1.132 +			cd ${cache} && tazpkg extract linux-${kvers}.tazpkg
   1.133  		fi 
   1.134 -		rm -f ${data}/linux-version.txt ;;
   1.135 +		rm -f ${cache}/linux-version.txt ;;
   1.136  		
   1.137  	get-prebuilt)
   1.138  		# --> in cross ??
   1.139 @@ -461,7 +462,7 @@
   1.140  	
   1.141  	clean)
   1.142  		echo "Cleaning: $rpi"
   1.143 -		rm -rf ${data} ${rpi_git} ;;
   1.144 +		rm -rf ${cache} ${rpi_git} ;;
   1.145  		
   1.146  	*|*help) usage ;;
   1.147  esac