diff options
| author | Martin Dengler <martin@martindengler.com> | 2009-08-24 23:34:12 (GMT) |
|---|---|---|
| committer | Martin Dengler <martin@martindengler.com> | 2009-08-24 23:34:12 (GMT) |
| commit | 4a280489a011f43410073b7b97300c164a666a49 (patch) | |
| tree | c2e118ac13628e5d6bcaf2765525646a05f6b86e | |
| parent | 9d8af7195d3192e4456939cdcf7e7efdc9ea4766 (diff) | |
change xo buildnames to be more convenient
| -rw-r--r-- | Makefile | 14 | ||||
| -rwxr-xr-x | build | 8 |
2 files changed, 10 insertions, 12 deletions
@@ -1,7 +1,7 @@ -soas%.done: soas%.iso soas%.removable.img.tar.lzma soas%.tree.tar.lzma soasxo%.tree.tar.lzma soasxo%.img soasxo%.plc +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 touch $@ -soasxo%.iso: - livecd-creator --skip-compression --cache=../cache --fslabel soasxo$* -c ../soas-xo.ks +soas%xo.iso: + livecd-creator --skip-compression --cache=../cache --fslabel soas$*xo -c ../soas-xo.ks md5sum $@ > $@.md5sum sha1sum $@ > $@.sha1sum soas%.iso: @@ -24,14 +24,12 @@ soas%.removable.img.tar.lzma: soas%.removable.img tar -c $^ | lzma -1 > $@ md5sum $@ > $@.md5sum sha1sum $@ > $@.sha1sum -soasxo%.img: soasxo%.tree +soas%.img: soas%xo.tree ../bootable-tree-to-xo.sh $^ $@ du -sk $@ | cut -f 1 > $@.size.txt md5sum $@ > $@.md5sum sha1sum $@ > $@.sha1sum -soasxo%.plc: soasxo%.img +soas%.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%.img soas%.plc - - +.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 @@ -14,10 +14,10 @@ echo building $buildname ; echo building $buildname >> ${buildname}.buildlog /usr/bin/time nice setarch i586 \ make -f ../Makefile ${buildname}.done >> ${buildname}.buildlog 2>&1 -for ext in tree removable.img xo.img ; do - prevsize=$(< $prevbuild.$ext.size.txt) - nextsize=$(< $buildname.$ext.size.txt) - python -c "oldk = $prevsize ; newk = $nextsize ; print '%0.2fM / %dK' % (newk / 1024.0, newk - oldk)" > $buildname.$ext.size-change.txt +for ext in .tree .removable.img .xo.tree .img ; do + prevsize=$(< $prevbuild$ext.size.txt) + nextsize=$(< $buildname$ext.size.txt) + python -c "oldk = $prevsize ; newk = $nextsize ; print '%0.2fM / %dK' % (newk / 1024.0, newk - oldk)" > $buildname$ext.size-change.txt done diff -U 1 $prevbuild.tree.packages.txt $buildname.tree.packages.txt | grep -v ^@@ > $buildname.tree.package-changes.txt |