diff options
| author | Martin Dengler <martin@martindengler.com> | 2009-11-08 14:50:00 (GMT) |
|---|---|---|
| committer | Martin Dengler <martin@martindengler.com> | 2009-11-08 14:50:00 (GMT) |
| commit | c5c87a991001e179a34c8b09500121cdab06957c (patch) | |
| tree | 64a6931811f4ba0bf822d01bca625e63faaf58bf /Makefile | |
| parent | 89dc93372e9856c31e59b1e572066b96be96fede (diff) | |
just make one removable/fulldisk image
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 9 insertions, 17 deletions
@@ -56,10 +56,8 @@ soas%.tree: soas%.iso chroot $@ rpm -qa | sort > $@.packages.txt chroot $@ rpm -qa --queryformat="%10{SIZE}\t%{NAME}\n" | sort -k1,1n > $@.packages-sizes.txt -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%.fulldisk.img: soas%.tree + ../bootable-tree-to-fulldisk-img.sh $^ $@ soas%xo.img: soas%xo.tree ../bootable-tree-to-xo.sh $^ $@ @@ -72,7 +70,7 @@ soas%xo.plc: soas%xo.img ### Announcements, size changes, xdeltas, and other .txt files ################################ -exts := .tree .2gremovable.img.tar.lzma .4gremovable.img.tar.lzma xo.tree xo.img +exts := .tree .fulldisk.img.tar.lzma xo.tree xo.img sized_names = soas$(nextbuild)$(ext).size-change.txt sized_changes := $(foreach ext,$(exts),$(sized_names)) @@ -85,8 +83,8 @@ soas$(nextbuild)%.size-change.txt: soas$(nextbuild)%.size.txt $(prevbuild)%.size soas%.tree.tar.xdelta: soas%.tree.tar -xdelta delta $(prevbuild).tree.tar $^ $@ -soas$(nextbuild)%removable.img.xdelta: soas$(nextbuild)%removable.img - -xdelta delta $(prevbuild)$*removable.img $^ $@ +soas$(nextbuild)fulldisk.img.xdelta: soas$(nextbuild)fulldisk.img + -xdelta delta $(prevbuild)fulldisk.img $^ $@ soas$(nextbuild).tree.package-changes.txt: $(prevbuild).tree.packages.txt soas$(nextbuild).tree.packages.txt diff -U 1 $^ | grep -v ^@@ > $@ || echo "[No changes]" > $@ @@ -97,14 +95,8 @@ soas$(nextbuild).tree.package-changes.txt: $(prevbuild).tree.packages.txt soas$( ################################ .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%.4gremovable.img.tar.lzma.size-change.txt \ - soas%.2gremovable.img.tar.lzma.size-change.txt \ - soas%xo.4gremovable.img soas%xo.4gremovable.img.tar.lzma \ - soas%xo.2gremovable.img soas%xo.2gremovable.img.tar.lzma \ - soas%xo.4gremovable.img.tar.lzma.size-change.txt \ - soas%xo.2gremovable.img.tar.lzma.size-change.txt \ + soas%.fulldisk.img soas%.fulldisk.img.tar.lzma soas%.fulldisk.img.tar.lzma.size-change.txt \ + soas%xo.fulldisk.img soas%xo.fulldisk.img.tar.lzma soas%xo.fulldisk.img.tar.lzma.size-change.txt \ soas%xo.iso soas%xo.tree soas%xo.tree.tar soas%xo.tree.tar.lzma \ soas%xo.img soas%xo.plc \ soas%xo.tree.size-change.txt \ @@ -116,10 +108,10 @@ soas$(nextbuild).tree.package-changes.txt: $(prevbuild).tree.packages.txt soas$( soas%.done: create.soas%.iso sized.soas%.tree \ create.soas%.tree.tar.lzma soas%.tree.tar.xdelta \ + create.soas%.fulldisk.img.tar.lzma soas%.fulldisk.img.xdelta \ create.soas%xo.iso sized.soas%xo.tree \ create.soas%xo.tree.tar.lzma soas%xo.tree.tar.xdelta \ - create.soas%xo.4gremovable.img.tar.lzma soas%xo.4gremovable.img.xdelta \ - create.soas%xo.2gremovable.img.tar.lzma soas%xo.2gremovable.img.xdelta \ + create.soas%xo.fulldisk.img.tar.lzma soas%xo.fulldisk.img.xdelta \ create.soas%xo.img soas%xo.plc \ create.soas%.vmdk.zip touch $@ |