slitaz-arm diff sat-rpi @ rev 54

Rename default rpi flavor to rpi-base
author Christophe Lincoln <pankso@slitaz.org>
date Thu Mar 13 23:17:34 2014 +0100 (2014-03-13)
parents bc8365a12dc7
children 2677c4a43ce8
line diff
     1.1 --- a/sat-rpi	Tue Mar 11 22:12:16 2014 +0100
     1.2 +++ b/sat-rpi	Thu Mar 13 23:17:34 2014 +0100
     1.3 @@ -52,7 +52,6 @@
     1.4    get-linux     Get the SliTaz RPi linux package
     1.5    get-fw        Download or update minimal RPi firmware
     1.6    clone-fw      Clone the RPi firmware repository
     1.7 -  get-tools     Download or update RPi Tools (mkimage)
     1.8    get-prebuilt  Get a prebuilt SliTaz ARM toolchain
     1.9    clean         Clean the current work directory
    1.10  
    1.11 @@ -98,20 +97,6 @@
    1.12  	git clone --depth 1 ${rpi_git_url}firmware.git
    1.13  }
    1.14  
    1.15 -# Get RPi tools
    1.16 -get_tools() {
    1.17 -	mkdir -p $tools
    1.18 -	for t in $toolslist
    1.19 -	do
    1.20 -		[ "$up" ] && rm -f ${tools}/${t}
    1.21 -		if [ ! -f "$tools/$t" ]; then
    1.22 -			echo -n "Fetching: $t"
    1.23 -			wget -q --no-check-certificate ${tools_url}${t} \
    1.24 -				-O ${tools}/${t}; status
    1.25 -		fi
    1.26 -	done
    1.27 -}
    1.28 -
    1.29  # --> will move to tazberry
    1.30  set_oclock() {
    1.31  	case "$oclock" in
    1.32 @@ -208,14 +193,6 @@
    1.33  		umount ${rpiroot} || exit 1
    1.34  		status
    1.35  		
    1.36 -		# Boot flag
    1.37 -		#echo -n "Setting boot flag on: /dev/${dev}1"
    1.38 -		#fdisk /dev/${dev} >/dev/null << EOF
    1.39 -#a
    1.40 -#1
    1.41 -#w
    1.42 -#EOF
    1.43 -		#status
    1.44  		rm -f ${data}/sdcard.part
    1.45  		separator && newline ;;
    1.46  		
    1.47 @@ -227,7 +204,7 @@
    1.48  	gen)
    1.49  		# Separate boot files since the Raspberry Pi boots off a FAT32 /boot 
    1.50  		# partition on the sdcard.
    1.51 -		: ${flavor=rpi}
    1.52 +		: ${flavor=rpi-base}
    1.53  		: ${oclock=none}
    1.54  		
    1.55  		# Use the rootfs generated by sat
    1.56 @@ -460,10 +437,26 @@
    1.57  			. $distro/rootfs/etc/slitaz/flavor.conf || exit 1
    1.58  			flavor="$FLAVOR"
    1.59  		fi
    1.60 -		dirname="slitaz-$flavor-$(date +%Y%m%d)"
    1.61 +		dname="slitaz-$flavor-$(date +%Y%m%d)"
    1.62  		dsize=$(du -sh $distro | awk '{print $1}' | cut -d "." -f 1)
    1.63 -		mkdir ${dirname}
    1.64 -		# To be continued...
    1.65 +		rm -rf ${dname} && mkdir ${dname}
    1.66 +		cp -a boot rootfs ${dname}
    1.67 +		cat > ${dname}/README << EOT
    1.68 +SliTaz Raspberry Pi - $flavor-$(date +%Y%m%d) -
    1.69 +--------------------------------------------------------------------------------
    1.70 +
    1.71 +Manual Installation. Assuming the sdcard is /dev/sdc and have got 3 
    1.72 +partitions (boot,swap,root). Mount the sdcard, copy files, unmount:
    1.73 +
    1.74 + # mkdir -p /media/rpi/boot /media/rpi/root
    1.75 + # mount /dev/sdc1 /media/rpi/boot
    1.76 + # mount /dev/sdc3 /media/rpi/root
    1.77 + # cp -a boot/* /media/rpi/boot
    1.78 + # cp -a rootfs/* /media/rpi/root
    1.79 + # umount /media/rpi/boot
    1.80 + # umount /media/rpi/root
    1.81 + 
    1.82 +EOT
    1.83  		;;
    1.84  	
    1.85  	clean)