./Makefile

*** 154,169 ****
  ifeq ($(BUILD_DEPLOY), true)
    generic_build_repo_series:: $(DEPLOY)
    clobber:: deploy-clobber
  endif
  
- ifeq ($(BUILD_JDK), true)
-   ifeq ($(BUNDLE_RULES_AVAILABLE), true)
-     generic_build_repo_series:: openjdk-binary-plugs-bundles
-   endif
- endif
- 
  # The debug build, fastdebug or debug. Needs special handling.
  #  Note that debug builds do NOT do INSTALL steps, but must be done
  #  after the product build and before the INSTALL step of the product build.
  #
  #   DEBUG_NAME is fastdebug or debug
--- 154,163 ----
*** 299,309 ****
  
  ifneq ($(SKIP_OPENJDK_BUILD), true)
    ifeq ($(BUILD_JDK), true)
      ifeq ($(BUNDLE_RULES_AVAILABLE), true)
  
- OPENJDK_PLUGS=$(ABS_OUTPUTDIR)/$(OPENJDK_BINARY_PLUGS_INAME)
  OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output
  OPENJDK_BUILD_NAME \
    = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE)
  OPENJDK_BUILD_BINARY_ZIP=$(ABS_BIN_BUNDLEDIR)/$(OPENJDK_BUILD_NAME).zip
  BUILT_IMAGE=$(ABS_OUTPUTDIR)/j2sdk-image
--- 293,302 ----
*** 328,338 ****
          ($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \
            OPENJDK=true \
            GENERATE_DOCS=false \
            ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \
            ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \
-           ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \
            ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \
            ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \
                  product_build )
          $(RM) $(OPENJDK_BUILD_BINARY_ZIP)
          ( $(CD) $(OPENJDK_OUTPUTDIR)/j2sdk-image && \
--- 321,330 ----
*** 543,553 ****
    $(MAKE) ALT_BOOTDIR=/opt/java/jdk1.5.0 \n\
    $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk1.6.0 \n\
  "
  
  ################################################################
! # Source and binary plug bundling
  ################################################################
  ifeq ($(BUNDLE_RULES_AVAILABLE), true)
    include $(BUNDLE_RULES)
  endif
  
--- 535,545 ----
    $(MAKE) ALT_BOOTDIR=/opt/java/jdk1.5.0 \n\
    $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk1.6.0 \n\
  "
  
  ################################################################
! # Source bundling
  ################################################################
  ifeq ($(BUNDLE_RULES_AVAILABLE), true)
    include $(BUNDLE_RULES)
  endif