# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1394751628 -3600
# Node ID 2677c4a43ce8ded3179dc33bec9d9fc037d4335b
# Parent  f02931a2c41f578a41caf0bff98d70de04866c7b
Finish sat-rpi release, some clean up and add suport for cgi-adm

diff -r f02931a2c41f -r 2677c4a43ce8 sat
--- a/sat	Thu Mar 13 23:17:34 2014 +0100
+++ b/sat	Fri Mar 14 00:00:28 2014 +0100
@@ -136,7 +136,7 @@
 			status
 		done
 
-		# Install spk if requested. Spk multiarch support must be tested
+		# Install spk Hg if requested. Spk multiarch support must be tested
 		if [ "$spk" ]; then
 			hg=http://hg.slitaz.org
 			echo -n "Installing: spk ($hg)"
@@ -172,6 +172,13 @@
 			. var/lib/tazpkg/installed/linux/receipt
 			depmod -b . ${VERSION}-slitaz
 		fi
+		
+		# CGI Admin
+		if [ -d "$work/cgi-adm" ]; then
+			echo -n "Installing SliTaz ARM CGI Admin interface..."
+			cp -a ${rpi}/cgi-adm/* ${rootfs}/var/www/adm
+			status
+		fi
 
 		# Custom rootfs: make sure all files belong to root
 		if [ -d "$work/rootfs" ]; then
diff -r f02931a2c41f -r 2677c4a43ce8 sat-rpi
--- a/sat-rpi	Thu Mar 13 23:17:34 2014 +0100
+++ b/sat-rpi	Fri Mar 14 00:00:28 2014 +0100
@@ -71,9 +71,7 @@
 }
 
 header() {
-	newline
-	boldify "$@"
-	separator
+	newline && boldify "$@" && separator
 }
 
 # Get minimal RPi firmware
@@ -211,6 +209,7 @@
 		if [ ! -x "/usr/bin/sat" ]; then
 			error "Sat is not installed" && exit 1
 		fi
+		check_root
 		
 		# We may want to simply regenerate the RPi distro
 		if [ ! "$nosat" ]; then
@@ -230,9 +229,14 @@
 		
 		# TazBerry
 		echo -n "Installing TazBerry..."
-			cp -f ${rpi}/tazberry ${rootfs}/usr/bin
+		cp -f ${rpi}/tazberry ${rootfs}/usr/bin
 		status
 		
+		# CGI Admin
+		#echo -n "Installing TazBerry CGI..."
+		#cp -a ${rpi}/cgi-adm/* ${rootfs}/var/www/adm
+		#status
+		
 		# Overclocking
 		echo -n "Setting: Overclocking..."
 		set_oclock; status
@@ -345,12 +349,6 @@
 				${fs}/lib/modules/*/source
 		fi
 		
-		#get_tools
-		#echo "Compressing: zImage to kernel.img"
-		#cd ${tools}
-		#python imagetool-uncompressed.py ${fs}/boot/zImage
-		#mv -f kernel.img ${fs}/boot && rm ${fs}/boot/zImage
-		
 		# Pack .tazpkg
 		cd ${data}
 		echo "Creating package: receipt"
@@ -373,6 +371,7 @@
 		
 	get-linux)
 		# Precook RPi kernel
+		check_root
 		mkdir -p ${data}
 		
 		# Last version
@@ -442,22 +441,34 @@
 		rm -rf ${dname} && mkdir ${dname}
 		cp -a boot rootfs ${dname}
 		cat > ${dname}/README << EOT
-SliTaz Raspberry Pi - $flavor-$(date +%Y%m%d) -
+SliTaz Raspberry Pi - $flavor-$(date +%Y%m%d) - http://arm.slitaz.org/rpi
 --------------------------------------------------------------------------------
 
+boot/   : Must be copied to a FAT32 partition
+rootfs/ : Must be copied to a ext4 or btrfs partition
+
 Manual Installation. Assuming the sdcard is /dev/sdc and have got 3 
 partitions (boot,swap,root). Mount the sdcard, copy files, unmount:
 
  # mkdir -p /media/rpi/boot /media/rpi/root
+ 
  # mount /dev/sdc1 /media/rpi/boot
  # mount /dev/sdc3 /media/rpi/root
+ 
  # cp -a boot/* /media/rpi/boot
  # cp -a rootfs/* /media/rpi/root
+ 
  # umount /media/rpi/boot
  # umount /media/rpi/root
- 
+
+--------------------------------------------------------------------------------
+
 EOT
-		;;
+		echo "Creating: ${dname}.tar.xz"
+		tar -cJf ${dname}.tar.xz ${dname}
+		echo "Creating: ${dname}.md5"
+		md5sum ${dname}.tar.xz > ${dname}.md5
+		rm -rf ${dname} ;;
 	
 	clean)
 		echo "Cleaning: $rpi"