/hg/icedtea6: Avoid passing --sync to df in the OpenJDK sanity c...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jun 30 06:44:25 PDT 2010
changeset 4fbf7302ddbe in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4fbf7302ddbe
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 30 00:53:06 2010 +0100
Avoid passing --sync to df in the OpenJDK sanity check.
2010-06-29 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
* patches/no-sync.patch: Don't pass --sync to df; the file
space check does not need to be so accurate that we have to
flush all buffers to disc.
diffstat:
3 files changed, 24 insertions(+), 1 deletion(-)
ChangeLog | 8 ++++++++
Makefile.am | 3 ++-
patches/no-sync.patch | 14 ++++++++++++++
diffs (46 lines):
diff -r b434625f3fd8 -r 4fbf7302ddbe ChangeLog
--- a/ChangeLog Wed Jun 30 00:47:55 2010 +0100
+++ b/ChangeLog Wed Jun 30 00:53:06 2010 +0100
@@ -1,3 +1,11 @@ 2010-06-28 Andrew John Hughes <ahughes@
+2010-06-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * patches/no-sync.patch: Don't pass --sync
+ to df; the file space check does not need
+ to be so accurate that we have to flush all
+ buffers to disc.
+
2010-06-28 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r b434625f3fd8 -r 4fbf7302ddbe Makefile.am
--- a/Makefile.am Wed Jun 30 00:47:55 2010 +0100
+++ b/Makefile.am Wed Jun 30 00:53:06 2010 +0100
@@ -289,7 +289,8 @@ ICEDTEA_PATCHES = \
patches/arm.patch \
patches/shark-debug-option.patch \
patches/openjdk/6961732.patch \
- patches/debug-dir.patch
+ patches/debug-dir.patch \
+ patches/no-sync.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r b434625f3fd8 -r 4fbf7302ddbe patches/no-sync.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/no-sync.patch Wed Jun 30 00:53:06 2010 +0100
@@ -0,0 +1,14 @@
+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 \
More information about the distro-pkg-dev
mailing list