/hg/icedtea6: Backport S7042040: Remove disk space sanity check

Wed May 11 10:11:45 PDT 2011

changeset 439a9cd78f8c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=439a9cd78f8c
author: Omair Majid <omajid at redhat.com>
date: Wed May 11 13:11:03 2011 -0400

	Backport S7042040: Remove disk space sanity check

	Replace custom patch patches/no-sync.patch with upstream's fix.

	2011-05-11 Omair Majid <omajid at redhat.com>

	 Backport S7042040: Remove disk space sanity check
	       * Makefile.am (ICEDTEA_PATCHES): Add
	patches/openjdk/7042040-no_disk_space_check.patch. Remove
	patches/no-sync.patch.
	       * patches/openjdk/7042040-no_disk_space_check.patch: New file.
	       * patches/no-sync.patch: Remove. Upstream's fix is an improved
	version.


diffstat:

 ChangeLog                                         |    9 +
 Makefile.am                                       |    2 +-
 NEWS                                              |    1 +
 patches/no-sync.patch                             |   13 --
 patches/openjdk/7042040-no_disk_space_check.patch |  112 ++++++++++++++++++++++
 5 files changed, 123 insertions(+), 14 deletions(-)

diffs (176 lines):

diff -r 84df81e017c4 -r 439a9cd78f8c ChangeLog

--- a/ChangeLog	Wed May 11 11:19:34 2011 -0400
+++ b/ChangeLog	Wed May 11 13:11:03 2011 -0400
@@ -1,3 +1,12 @@
+2011-05-11  Omair Majid  <omajid at redhat.com>
+
+	Backport S7042040: Remove disk space sanity check
+	* Makefile.am (ICEDTEA_PATCHES): Add
+	patches/openjdk/7042040-no_disk_space_check.patch. Remove
+	patches/no-sync.patch.
+	* patches/openjdk/7042040-no_disk_space_check.patch: New file.
+	* patches/no-sync.patch: Remove. Upstream's fix is an improved version.
+
 2011-05-11  Andrew Su  <asu at redhat.com>
 
 	* AUTHORS: Added Denis Lila, Marathon, and Andrew Su.
diff -r 84df81e017c4 -r 439a9cd78f8c Makefile.am
--- a/Makefile.am	Wed May 11 11:19:34 2011 -0400
+++ b/Makefile.am	Wed May 11 13:11:03 2011 -0400
@@ -272,7 +272,7 @@
 	patches/arm.patch \
 	patches/hotspot/$(HSBUILD)/arm.patch \
 	patches/debug-dir.patch \
-	patches/no-sync.patch \
+	patches/openjdk/7042040-no_disk_space_check.patch \
 	patches/override-redirect-metacity.patch \
 	patches/openjdk/6967533-pre_epoch.patch \
 	patches/fonts-rhel.patch \
diff -r 84df81e017c4 -r 439a9cd78f8c NEWS
--- a/NEWS	Wed May 11 11:19:34 2011 -0400
+++ b/NEWS	Wed May 11 13:11:03 2011 -0400
@@ -26,6 +26,7 @@
   - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used
   - S7018387: Xrender pipeline may leak GC's
   - S7036754: Stroked quads sometimes contain NaN
+  - S7042040: Remove disk space sanity check
 * Bug fixes
   - PR637: make check should exit with an error code if any regression test failed.
   - G356743: Support libpng 1.5.
diff -r 84df81e017c4 -r 439a9cd78f8c patches/no-sync.patch
--- a/patches/no-sync.patch	Wed May 11 11:19:34 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -r 388276965253 make/common/shared/Sanity.gmk
---- openjdk.orig/jdk/make/common/shared/Sanity.gmk	Wed Jun 16 20:46:10 2010 +0200
-+++ openjdk/jdk/make/common/shared/Sanity.gmk	Wed Jun 30 00:50:32 2010 +0100
-@@ -57,8 +57,8 @@
- endif
- 
- ifeq ($(PLATFORM), linux)
--  FREE_SPACE := $(shell $(DF) --sync -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
--  TEMP_FREE_SPACE := $(shell $(DF) --sync -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
-+  FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
-+  TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
-   ifeq ($(ARCH), amd64)
-     LINUX_VERSION := $(shell \
-         if [ -r "$(LINUX_VERSION_INFO)" ] ; then \
diff -r 84df81e017c4 -r 439a9cd78f8c patches/openjdk/7042040-no_disk_space_check.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7042040-no_disk_space_check.patch	Wed May 11 13:11:03 2011 -0400
@@ -0,0 +1,115 @@
+# HG changeset patch
+# User andrew
+# Date 1305128024 14400
+# Node ID 6b74421f46b04f8cbe898ed4d8896b46be70becf
+# Parent  fe6a8ddfe33d460fe19867c6625ee6390934e4b7
+7042040: Remove disk space sanity check
+Summary: Remove outdated disk space checks using df
+Reviewed-by: ohair, omajid
+
+diff -r fe6a8ddfe33d -r 6b74421f46b0 make/common/shared/Platform.gmk
+--- openjdk/jdk/make/common/shared/Platform.gmk	Tue May 10 11:58:42 2011 +0200
++++ openjdk/jdk/make/common/shared/Platform.gmk	Wed May 11 11:33:44 2011 -0400
+@@ -75,7 +75,6 @@
+ #     USING_CYGWIN                windows only: true or false
+ #     WINDOWS_NT_VERSION_STRING   windows only: long version name
+ #     REQUIRED_OS_VERSION         required OS version, e.g. 5.10, 2.4
+-#     REQUIRED_FREE_SPACE         minimum disk space needed for outputdir
+ #     ISHIELD_TEMP_MIN            windows only: minimum disk space in temp area
+ #     REQUIRED_ZIP_VER            required version of zip
+ #     REQUIRED_UNZIP_VER          required version of unzip
+@@ -171,13 +170,6 @@
+   else
+     REQUIRED_OS_VERSION = 5.8
+   endif
+-  # Minimum disk space needed as determined by running 'du -sk' on 
+-  #    a fully built workspace.
+-  ifeq ($(ARCH_FAMILY), sparc)
+-    REQUIRED_FREE_SPACE=1300000
+-  else
+-    REQUIRED_FREE_SPACE=1040000
+-  endif
+   # How much RAM does this machine have:
+   MB_OF_MEMORY=$(shell /etc/prtconf | fgrep 'Memory size:' | expand | cut -d' ' -f3)
+ endif
+@@ -247,9 +239,6 @@
+ 
+   # Suffix for file bundles used in previous release
+   BUNDLE_FILE_SUFFIX=.tar.gz
+-  # Minimum disk space needed as determined by running 'du -sk' on 
+-  #    a fully built workspace.
+-  REQUIRED_FREE_SPACE=1460000
+   LINUX_VERSION_INFO = /etc/redhat-release
+   ifeq ($(ARCH_DATA_MODEL), 32)
+     REQUIRED_LINUX_VER = Advanced Server
+@@ -371,9 +360,6 @@
+   ARCH_VM_SUBDIR=jre/bin
+   # Suffix for file bundles used in previous release
+   BUNDLE_FILE_SUFFIX=.tar
+-  # Minimum disk space needed as determined by running 'du -sk' on 
+-  #    a fully built workspace.
+-  REQUIRED_FREE_SPACE=500000
+   # ISHIELD_TEMP_MIN is the difference of an empty C:\TEMP vs. one after a
+   #     bundles build on windows.
+   ISHIELD_TEMP_MIN=250000
+diff -r fe6a8ddfe33d -r 6b74421f46b0 make/common/shared/Sanity-Settings.gmk
+--- openjdk/jdk/make/common/shared/Sanity-Settings.gmk	Tue May 10 11:58:42 2011 +0200
++++ openjdk/jdk/make/common/shared/Sanity-Settings.gmk	Wed May 11 11:33:44 2011 -0400
+@@ -189,8 +189,6 @@
+ endif
+ ALL_SETTINGS+=$(call addRequiredVersionSetting,OS_VERSION)
+ ALL_SETTINGS+=$(call addRequiredSetting,OS_NAME)
+-ALL_SETTINGS+=$(call addRequiredSetting,TEMP_FREE_SPACE)
+-ALL_SETTINGS+=$(call addRequiredSetting,FREE_SPACE)
+ ALL_SETTINGS+=$(call addRequiredSetting,MB_OF_MEMORY)
+ 
+ 
+diff -r fe6a8ddfe33d -r 6b74421f46b0 make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk	Tue May 10 11:58:42 2011 +0200
++++ openjdk/jdk/make/common/shared/Sanity.gmk	Wed May 11 11:33:44 2011 -0400
+@@ -46,8 +46,6 @@
+ # Settings and rules to validate the JDK build environment.
+ 
+ ifeq ($(PLATFORM), solaris)
+-  FREE_SPACE := $(shell $(DF) -b $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$2;}')
+-  TEMP_FREE_SPACE := $(shell $(DF) -b $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$2;}')
+   REQ_PATCH_LIST = $(JDK_TOPDIR)/make/PatchList.solaris
+   ifeq ($(ARCH_FAMILY), sparc)
+     PATCH_POSITION = $$4
+@@ -57,8 +55,6 @@
+ endif
+ 
+ ifeq ($(PLATFORM), linux)
+-  FREE_SPACE := $(shell $(DF) --sync -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
+-  TEMP_FREE_SPACE := $(shell $(DF) --sync -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
+   ifeq ($(ARCH), amd64)
+     LINUX_VERSION := $(shell \
+         if [ -r "$(LINUX_VERSION_INFO)" ] ; then \
+@@ -82,8 +78,6 @@
+ endif
+ 
+ ifeq ($(PLATFORM), windows)
+-  FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
+-  TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
+   # Localized systeminfo has localized labels, but not localized values.
+   _WINDOWS_VERSION := \
+     $(shell systeminfo 2> $(DEV_NULL) | grep 'Microsoft' | grep 'Windows' | \
+@@ -675,18 +669,6 @@
+ 	    "      Either obtain these permissions or set ALT_OUTPUTDIR. \n" \
+ 	    "" >> $(ERROR_FILE) ; \
+ 	fi
+-	@#
+-	@# OUTPUTDIR must have enough free space...
+-	@#
+-	@if [ $(FREE_SPACE) -lt $(REQUIRED_FREE_SPACE) ]; then \
+-	  $(ECHO) "WARNING: You may not have enough free space in your OUTPUTDIR. The \n" \
+-	    "        current value of OUTPUTDIR is \n" \
+-	    "            $(OUTPUTDIR) \n" \
+-	    "        You need "$(REQUIRED_FREE_SPACE)" Kbytes free on this device to build \n" \
+-	    "        and it appears that only "$(FREE_SPACE)" Kbytes are free. \n" \
+-	    "        Either obtain more space or set ALT_OUTPUTDIR to a larger disk. \n" \
+-	    "" >> $(WARNING_FILE) ; \
+-	fi
+ 
+ ######################################################
+ # if specified, ALT_BOOTDIR must point to non-relative path if set

