Merge jdk8u40-b02

Thu, 14 Aug 2014 13:23:24 -0700

author
lana
date
Thu, 14 Aug 2014 13:23:24 -0700
changeset 1156
b6a148730f2b
parent 1154
94e610b01431
parent 1155
c7b4d867b82d
child 1157
a0224ac41351

Merge

     1.1 --- a/make/Jprt.gmk	Wed Aug 13 14:49:44 2014 -0700
     1.2 +++ b/make/Jprt.gmk	Thu Aug 14 13:23:24 2014 -0700
     1.3 @@ -32,6 +32,10 @@
     1.4    JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
     1.5  endif
     1.6  
     1.7 +ifeq ($(SKIP_BOOT_CYCLE), false)
     1.8 +  jprt_bundle: bootcycle-images
     1.9 +endif
    1.10 +
    1.11  # This target must be called in the context of a SPEC file
    1.12  jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
    1.13  	@$(call CheckIfMakeAtEnd)

mercurial