Mercurial > hg > release > icedtea6-1.6
changeset 1727:649522401c6f
Make replace-hotspot more robust.
2010-03-31 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(replace-hotspot.stamp): Don't delete openjdk/hotspot
until new HotSpot is available, extracted and has the
correct permissions. Fail immediately if one stage fails.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 31 Mar 2010 22:14:59 +0100 |
| parents | f9061e19dfb0 |
| children | e78e331c336a |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 31 01:41:40 2010 +0100 +++ b/ChangeLog Wed Mar 31 22:14:59 2010 +0100 @@ -1,3 +1,10 @@ +2010-03-31 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (replace-hotspot.stamp): Don't delete openjdk/hotspot + until new HotSpot is available, extracted and has the + correct permissions. Fail immediately if one stage fails. + 2010-03-31 Andrew John Hughes <ahughes@redhat.com> * patches/hotspot/default/icedtea-gcc-stack-markings.patch:
--- a/Makefile.am Wed Mar 31 01:41:40 2010 +0100 +++ b/Makefile.am Wed Mar 31 22:14:59 2010 +0100 @@ -827,11 +827,11 @@ stamps/replace-hotspot.stamp: stamps/extract.stamp if WITH_ALT_HSBUILD if test "x${HSBUILD}" != "xoriginal"; then \ - rm -rf openjdk/hotspot ; \ if test -e ${HOTSPOT_SRC_ZIP} ; \ then \ - $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \ - chmod -R ug+w master-* ; \ + $(TAR) xf $(HOTSPOT_SRC_ZIP) && \ + chmod -R ug+w master-* && \ + rm -rf openjdk/hotspot && \ mv master-$$($(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \ $(abs_top_srcdir)/hotspot.map) openjdk/hotspot ; \ fi ; \