add xdelta and 4g/2g removable images

3 files changed, 47 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index cdd5a18..ac86aad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,54 @@
-soas%.done: soas%.iso soas%.removable.img.tar.lzma soas%.tree.tar.lzma soas%xo.iso soas%xo.tree.tar.lzma soas%.img soas%.plc
+
+soas%.done: create.soas%.iso create.soas%.tree.tar.lzma sized.soas%.tree \
+			create.soas%.4gremovable.img.tar.lzma create.soas%.2gremovable.img.tar.lzma \
+			create.soas%xo.iso create.soas%xo.tree.tar.lzma sized.soas%xo.tree \
+			create.soas%xo.img soas%xo.plc
 	touch $@
+
+create.%: sized.% %.sha1sum
+	echo $@ done
+
+sized.%: % %.size.txt
+	echo $@ done
+
+%.size.txt: %
+	du -sk $^ | cut -f 1 > $@
+%.sha1sum: %
+	sha1sum $^ > $@
+%.tree.tar: %.tree
+	tar -c -C $^ . > $@
+%.tree.tar.lzma: %.tree.tar
+	lzma -1k $^
+%.tar.lzma: %
+	tar -c $^ | lzma -1 > $@
+
 soas%xo.iso:
 	livecd-creator --skip-compression --cache=../cache --fslabel soas$*xo -c ../soas-xo.ks
-	md5sum $@ > $@.md5sum
-	sha1sum $@ > $@.sha1sum
 soas%.iso:
 	livecd-creator --skip-compression --cache=../cache --fslabel soas$* -c ../soas.ks
-	md5sum $@ > $@.md5sum
-	sha1sum $@ > $@.sha1sum
+
 soas%.tree: soas%.iso
 	../livecd-iso-to-bootable-tree.sh $^ $@
-	du -sk $@ | cut -f 1 > $@.size.txt
+	touch $@
 	chroot $@ rpm -qa | sort > $@.packages.txt
 	chroot $@ rpm -qa --queryformat="%10{SIZE}\t%{NAME}\n" | sort -k1,1n > $@.packages-sizes.txt
-soas%.tree.tar.lzma: soas%.tree
-	tar -c -C $^ . | lzma -1 > $@
-	md5sum $@ > $@.md5sum
-	sha1sum $@ > $@.sha1sum
-soas%.removable.img: soas%.tree
-	../bootable-tree-to-removable-img.sh $^ $@
-	du -sk $@ | cut -f 1 > $@.size.txt
-soas%.removable.img.tar.lzma: soas%.removable.img
-	tar -c $^ | lzma -1 > $@
-	md5sum $@ > $@.md5sum
-	sha1sum $@ > $@.sha1sum
-soas%.img: soas%xo.tree
+
+soas%.4gremovable.img: soas%.tree
+	../bootable-tree-to-removable-img.sh $^ $@ --4G
+soas%.2gremovable.img: soas%.tree
+	../bootable-tree-to-removable-img.sh $^ $@ --2G
+
+soas%xo.img: soas%xo.tree
 	../bootable-tree-to-xo.sh $^ $@
-	du -sk $@ | cut -f 1 > $@.size.txt
-	md5sum $@ > $@.md5sum
-	sha1sum $@ > $@.sha1sum
-soas%.plc: soas%xo.img
+soas%xo.plc: soas%xo.img
 	../image-digestor.sh $^
 
-.PRECIOUS: soas%.iso soas%.removable.img soas%.removable.img.tar.lzma soas%.tree soas%.tree.tar.lzma soas%xo.iso soas%xo.tree soas%xo.tree.tar.lzmma soas%.img soas%.plc
+
+.PRECIOUS: soas%.iso soas%.tree soas%.tree.tar soas%.tree.tar.lzma \
+			soas%.4gremovable.img soas%.4gremovable.img.tar.lzma \
+			soas%.2gremovable.img soas%.2gremovable.img.tar.lzma \
+			soas%xo.iso soas%xo.tree soas%xo.tree.tar soas%xo.tree.tar.lzma \
+			soas%xo.img soas%xo.plc \
+			%.size.txt %.sha1sum
+
+.PHONY: create.% sized.%
diff --git a/bootable-tree-to-removable-img.sh b/bootable-tree-to-removable-img.sh
index 182345a..ce1ef98 100755
--- a/bootable-tree-to-removable-img.sh
+++ b/bootable-tree-to-removable-img.sh
@@ -21,12 +21,13 @@ PATH=/sbin:/usr/sbin:$PATH
 
 ROOT=$1
 output=${2:-soas}
+outputsize=${3:---4G}
 
 echo "Making removable image $ROOT --> $output"
 
 TMP_MNT=$(mktemp -d ./removable.XXXXXX)
 
-device=`../make_fake_device.sh $output`
+device=`../make_fake_device.sh $outputsize $output`
 mount -t ext2 $device $TMP_MNT
 
 cp -a $ROOT/* $TMP_MNT
diff --git a/build b/build
index 91cbf24..29ecca4 100755
--- a/build
+++ b/build
@@ -22,6 +22,9 @@ done
 
 diff -U 1 $prevbuild.tree.packages.txt $buildname.tree.packages.txt | grep -v ^@@ > $buildname.tree.package-changes.txt
 
+xdelta delta $prevbuild.tree.tar $buildname.tree.tar $buildname.tree.tar.xdelta-to-$prevbuild
+xdelta delta ${prevbuild}xo.tree.tar ${buildname}xo.tree.tar ${buildname}xo.tree.tar.xdelta-to-${prevbuild}xo
+
 echo $buildname > lastbuild
 date ; date >> ${buildname}.buildlog