/hg/icedtea7: PR2545: Extend tarball checksumming option to allo...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jul 17 00:55:08 UTC 2015
changeset a3787c18ead8 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a3787c18ead8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 17 01:40:01 2015 +0100
PR2545: Extend tarball checksumming option to allow the checksum to be specified
2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2545: Extend tarball checksumming option to
allow the checksum to be specified
* INSTALL: Update documentation, replacing
--disable-x-checksum options with
--with-x-checksum options.
* Makefile.am:
(OPENJDK_SUM): Set to either OPENJDK_SHA256SUM
or the checksum supplied by the user.
(CORBA_SUM): Set to either CORBA_SHA256SUM
or the checksum supplied by the user.
(JAXP_SUM): Set to either JAXP_SHA256SUM
or the checksum supplied by the user.
(JAXWS_SUM): Set to either JAXWS_SHA256SUM
or the checksum supplied by the user.
(JDK_SUM): Set to either JDK_SHA256SUM
or the checksum supplied by the user.
(LANGTOOLS_SUM): Set to either LANGTOOLS_SHA256SUM
or the checksum supplied by the user.
(CACAO_SUM): Set to either CACAO_SHA256SUM
or the checksum supplied by the user.
(JAMVM_SUM): Set to either JAMVM_SHA256SUM
or the checksum supplied by the user.
(HOTSPOT_SUM): Set to either HS_SHA256SUM
or the checksum supplied by the user.
(download-openjdk): Use OPENJDK_SUM instead
of OPENJDK_SHA256SUM directly.
(download-corba): Use CORBA_SUM instead
of CORBA_SHA256SUM directly.
(download-jaxp): Use JAXP_SUM instead
of JAXP_SHA256SUM directly.
(download-jaxws): Use JAXWS_SUM instead
of JAXWS_SHA256SUM directly.
(download-jdk): Use JDK_SUM instead
of JDK_SHA256SUM directly.
(download-langtools): Use LANGTOOLS_SUM instead
of LANGTOOLS_SHA256SUM directly.
(download-cacao): Use CACAO_SUM instead
of CACAO_SHA256SUM directly.
(download-jamvm): Use JAMVM_SUM instead
of JAMVM_SHA256SUM directly.
(download-hotspot): Use HOTSPOT_SUM instead
of HS_SHA256SUM directly.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_OPENJDK_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_OPENJDK_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_CORBA_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_CORBA_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_JAXP_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_JAXP_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_JAXWS_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_JAXWS_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_JDK_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_JDK_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_LANGTOOLS_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_LANGTOOLS_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_CACAO_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_CACAO_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_JAMVM_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_JAMVM_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_HOTSPOT_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_HOTSPOT_CHECKSUM is
set if the specified value is other than
"yes" or "no".
diffstat:
ChangeLog | 101 +++++++++++++++++++++++++++
INSTALL | 72 ++++++++++++-------
Makefile.am | 90 +++++++++++++++++++----
NEWS | 1 +
acinclude.m4 | 216 ++++++++++++++++++++++------------------------------------
5 files changed, 300 insertions(+), 180 deletions(-)
diffs (truncated from 815 to 500 lines):
diff -r cff3873b35b5 -r a3787c18ead8 ChangeLog
--- a/ChangeLog Fri Jul 17 00:06:58 2015 +0100
+++ b/ChangeLog Fri Jul 17 01:40:01 2015 +0100
@@ -1,3 +1,104 @@
+2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2545: Extend tarball checksumming option to
+ allow the checksum to be specified
+ * INSTALL: Update documentation, replacing
+ --disable-x-checksum options with
+ --with-x-checksum options.
+ * Makefile.am:
+ (OPENJDK_SUM): Set to either OPENJDK_SHA256SUM
+ or the checksum supplied by the user.
+ (CORBA_SUM): Set to either CORBA_SHA256SUM
+ or the checksum supplied by the user.
+ (JAXP_SUM): Set to either JAXP_SHA256SUM
+ or the checksum supplied by the user.
+ (JAXWS_SUM): Set to either JAXWS_SHA256SUM
+ or the checksum supplied by the user.
+ (JDK_SUM): Set to either JDK_SHA256SUM
+ or the checksum supplied by the user.
+ (LANGTOOLS_SUM): Set to either LANGTOOLS_SHA256SUM
+ or the checksum supplied by the user.
+ (CACAO_SUM): Set to either CACAO_SHA256SUM
+ or the checksum supplied by the user.
+ (JAMVM_SUM): Set to either JAMVM_SHA256SUM
+ or the checksum supplied by the user.
+ (HOTSPOT_SUM): Set to either HS_SHA256SUM
+ or the checksum supplied by the user.
+ (download-openjdk): Use OPENJDK_SUM instead
+ of OPENJDK_SHA256SUM directly.
+ (download-corba): Use CORBA_SUM instead
+ of CORBA_SHA256SUM directly.
+ (download-jaxp): Use JAXP_SUM instead
+ of JAXP_SHA256SUM directly.
+ (download-jaxws): Use JAXWS_SUM instead
+ of JAXWS_SHA256SUM directly.
+ (download-jdk): Use JDK_SUM instead
+ of JDK_SHA256SUM directly.
+ (download-langtools): Use LANGTOOLS_SUM instead
+ of LANGTOOLS_SHA256SUM directly.
+ (download-cacao): Use CACAO_SUM instead
+ of CACAO_SHA256SUM directly.
+ (download-jamvm): Use JAMVM_SUM instead
+ of JAMVM_SHA256SUM directly.
+ (download-hotspot): Use HOTSPOT_SUM instead
+ of HS_SHA256SUM directly.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_OPENJDK_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_OPENJDK_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_CORBA_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_CORBA_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_JAXP_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_JAXP_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_JAXWS_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_JAXWS_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_JDK_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_JDK_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_LANGTOOLS_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_LANGTOOLS_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_CACAO_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_CACAO_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_JAMVM_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_JAMVM_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_HOTSPOT_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_HOTSPOT_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+
2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2540: Specify a cacerts file for the OpenJDK
diff -r cff3873b35b5 -r a3787c18ead8 INSTALL
--- a/INSTALL Fri Jul 17 00:06:58 2015 +0100
+++ b/INSTALL Fri Jul 17 01:40:01 2015 +0100
@@ -157,45 +157,63 @@
- /usr/share/java/ecj.jar
- /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar
* --with-openjdk-src-zip: Specify the location of the OpenJDK tarball to avoid downloading.
-* --disable-openjdk-checksum: Don't check that the tarball specified by --with-openjdk-src-zip
- has the same checksum as the expected OpenJDK source zip, so a locally modified version can
- be used instead.
+* --with-openjdk-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-openjdk-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-openjdk-checksum doesn't check the tarball specified by
+ --with-openjdk-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-hotspot-src-zip: Specify the location of the HotSpot tarball to avoid downloading.
-* --disable-hotspot-checksum: Don't check that the tarball specified by --with-hotspot-src-zip
- has the same checksum as the expected HotSpot source zip, so a locally modified version can
- be used instead.
+* --with-hotspot-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-hotspot-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-hotspot-checksum doesn't check the tarball specified by
+ --with-hotspot-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-corba-src-zip: Specify the location of the CORBA tarball to avoid downloading.
-* --disable-corba-checksum: Don't check that the tarball specified by --with-corba-src-zip
- has the same checksum as the expected CORBA source zip, so a locally modified version can
- be used instead.
+* --with-corba-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-corba-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-corba-checksum doesn't check the tarball specified by
+ --with-corba-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-jaxp-src-zip: Specify the location of the JAXP tarball to avoid downloading.
-* --disable-jaxp-checksum: Don't check that the tarball specified by --with-jaxp-src-zip
- has the same checksum as the expected JAXP source zip, so a locally modified version can
- be used instead.
+* --with-jaxp-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-jaxp-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-jaxp-checksum doesn't check the tarball specified by
+ --with-jaxp-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-jaxws-src-zip: Specify the location of the JAXWS tarball to avoid downloading.
-* --disable-jaxws-checksum: Don't check that the tarball specified by --with-jaxws-src-zip
- has the same checksum as the expected JAXWS source zip, so a locally modified version can
- be used instead.
+* --with-jaxws-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-jaxws-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-jaxws-checksum doesn't check the tarball specified by
+ --with-jaxws-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-jdk-src-zip: Specify the location of the JDK tarball to avoid downloading.
-* --disable-jdk-checksum: Don't check that the tarball specified by --with-jdk-src-zip
- has the same checksum as the expected JDK source zip, so a locally modified version can
- be used instead.
+* --with-jdk-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-jdk-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-jdk-checksum doesn't check the tarball specified by
+ --with-jdk-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-langtools-src-zip: Specify the location of the langtools tarball to avoid downloading.
-* --disable-langtools-checksum: Don't check that the tarball specified by --with-langtools-src-zip
- has the same checksum as the expected langtools source zip, so a locally modified version can
- be used instead.
+* --with-langtools-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-langtools-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-langtools-checksum doesn't check the tarball specified by
+ --with-langtools-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-alt-jar: Use the specified jar binary in the second stage rather than the one just built.
* --with-cacao-home: Specify the location of an installed CACAO to use rather than downloading
and building one.
* --with-cacao-src-zip: Specify the location of a CACAO tarball to avoid downloading.
-* --disable-cacao-checksum: Don't check that the tarball specified by --with-cacao-src-zip
- has the same checksum as the expected CACAO source zip, so a locally modified version can
- be used instead.
+* --with-cacao-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-cacao-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-cacao-checksum doesn't check the tarball specified by
+ --with-cacao-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-cacao-src-dir: Specify the location of a CACAO source tree to avoid downloading.
* --with-jamvm-src-zip: Specify the location of a JamVM tarball to avoid downloading.
-* --disable-jamvm-checksum: Don't check that the tarball specified by --with-jamvm-src-zip
- has the same checksum as the expected JamVM source zip, so a locally modified version can
- be used instead.
+* --with-jamvm-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-jamvm-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-jamvm-checksum doesn't check the tarball specified by
+ --with-jamvm-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option.
* --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
* --with-llvm-config: Specify the location of the llvm-config binary.
diff -r cff3873b35b5 -r a3787c18ead8 Makefile.am
--- a/Makefile.am Fri Jul 17 00:06:58 2015 +0100
+++ b/Makefile.am Fri Jul 17 01:40:01 2015 +0100
@@ -180,54 +180,108 @@
OPENJDK_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_OPENJDK_CHECKSUM
+OPENJDK_SUM = @OPENJDK_CHECKSUM@
+else
+OPENJDK_SUM = $(OPENJDK_SHA256SUM)
+endif
+
if DISABLE_CORBA_CHECKSUM
CORBA_SHA256SUM_BIN = true
else
CORBA_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_CORBA_CHECKSUM
+CORBA_SUM = @CORBA_CHECKSUM@
+else
+CORBA_SUM = $(CORBA_SHA256SUM)
+endif
+
if DISABLE_JAXP_CHECKSUM
JAXP_SHA256SUM_BIN = true
else
JAXP_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_JAXP_CHECKSUM
+JAXP_SUM = @JAXP_CHECKSUM@
+else
+JAXP_SUM = $(JAXP_SHA256SUM)
+endif
+
if DISABLE_JAXWS_CHECKSUM
JAXWS_SHA256SUM_BIN = true
else
JAXWS_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_JAXWS_CHECKSUM
+JAXWS_SUM = @JAXWS_CHECKSUM@
+else
+JAXWS_SUM = $(JAXWS_SHA256SUM)
+endif
+
if DISABLE_JDK_CHECKSUM
JDK_SHA256SUM_BIN = true
else
JDK_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_JDK_CHECKSUM
+JDK_SUM = @JDK_CHECKSUM@
+else
+JDK_SUM = $(JDK_SHA256SUM)
+endif
+
if DISABLE_LANGTOOLS_CHECKSUM
LANGTOOLS_SHA256SUM_BIN = true
else
LANGTOOLS_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_LANGTOOLS_CHECKSUM
+LANGTOOLS_SUM = @LANGTOOLS_CHECKSUM@
+else
+LANGTOOLS_SUM = $(LANGTOOLS_SHA256SUM)
+endif
+
if DISABLE_CACAO_CHECKSUM
CACAO_SHA256SUM_BIN = true
else
CACAO_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_CACAO_CHECKSUM
+CACAO_SUM = @CACAO_CHECKSUM@
+else
+CACAO_SUM = $(CACAO_SHA256SUM)
+endif
+
if DISABLE_JAMVM_CHECKSUM
JAMVM_SHA256SUM_BIN = true
else
JAMVM_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_JAMVM_CHECKSUM
+JAMVM_SUM = @JAMVM_CHECKSUM@
+else
+JAMVM_SUM = $(JAMVM_SHA256SUM)
+endif
+
if DISABLE_HOTSPOT_CHECKSUM
HOTSPOT_SHA256SUM_BIN = true
else
HOTSPOT_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_HOTSPOT_CHECKSUM
+HOTSPOT_SUM = @HOTSPOT_CHECKSUM@
+else
+HOTSPOT_SUM = $(HS_SHA256SUM)
+endif
+
if WITH_HGREV
REV_ARG = -r $(HGREV)
endif
@@ -973,7 +1027,7 @@
if USE_ALT_OPENJDK_SRC_ZIP
ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
endif
- if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \
+ if ! echo "$(OPENJDK_SUM) $(OPENJDK_SRC_ZIP)" \
| $(OPENJDK_SHA256SUM_BIN) --check ; \
then \
if test "x$(enable_downloading)" = "xyes"; then \
@@ -981,7 +1035,7 @@
mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
fi ; \
$(WGET) $(ICEDTEA_URL)/$(OPENJDK_SRC_ZIP); \
- if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \
+ if ! echo "$(OPENJDK_SUM) $(OPENJDK_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
echo "ERROR: Bad download of OpenJDK root zip"; false; \
fi; \
@@ -1002,7 +1056,7 @@
if USE_ALT_CORBA_SRC_ZIP
ln -sf $(ALT_CORBA_SRC_ZIP) $(CORBA_SRC_ZIP)
endif
- if ! echo "$(CORBA_SHA256SUM) $(CORBA_SRC_ZIP)" \
+ if ! echo "$(CORBA_SUM) $(CORBA_SRC_ZIP)" \
| $(CORBA_SHA256SUM_BIN) --check ; \
then \
if test "x$(enable_downloading)" = "xyes"; then \
@@ -1010,7 +1064,7 @@
mv $(CORBA_SRC_ZIP) $(CORBA_SRC_ZIP).old ; \
fi ; \
$(WGET) $(ICEDTEA_URL)/$(CORBA_SRC_ZIP); \
- if ! echo "$(CORBA_SHA256SUM) $(CORBA_SRC_ZIP)" \
+ if ! echo "$(CORBA_SUM) $(CORBA_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
echo "ERROR: Bad download of CORBA zip"; false; \
fi; \
@@ -1031,7 +1085,7 @@
if USE_ALT_JAXP_SRC_ZIP
ln -sf $(ALT_JAXP_SRC_ZIP) $(JAXP_SRC_ZIP)
endif
- if ! echo "$(JAXP_SHA256SUM) $(JAXP_SRC_ZIP)" \
+ if ! echo "$(JAXP_SUM) $(JAXP_SRC_ZIP)" \
| $(JAXP_SHA256SUM_BIN) --check ; \
then \
if test "x$(enable_downloading)" = "xyes"; then \
@@ -1039,7 +1093,7 @@
mv $(JAXP_SRC_ZIP) $(JAXP_SRC_ZIP).old ; \
fi ; \
$(WGET) $(ICEDTEA_URL)/$(JAXP_SRC_ZIP); \
- if ! echo "$(JAXP_SHA256SUM) $(JAXP_SRC_ZIP)" \
+ if ! echo "$(JAXP_SUM) $(JAXP_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
echo "ERROR: Bad download of JAXP zip"; false; \
fi; \
@@ -1060,7 +1114,7 @@
if USE_ALT_JAXWS_SRC_ZIP
ln -sf $(ALT_JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP)
endif
- if ! echo "$(JAXWS_SHA256SUM) $(JAXWS_SRC_ZIP)" \
+ if ! echo "$(JAXWS_SUM) $(JAXWS_SRC_ZIP)" \
| $(JAXWS_SHA256SUM_BIN) --check ; \
then \
if test "x$(enable_downloading)" = "xyes"; then \
@@ -1068,7 +1122,7 @@
mv $(JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP).old ; \
fi ; \
$(WGET) $(ICEDTEA_URL)/$(JAXWS_SRC_ZIP); \
- if ! echo "$(JAXWS_SHA256SUM) $(JAXWS_SRC_ZIP)" \
+ if ! echo "$(JAXWS_SUM) $(JAXWS_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
echo "ERROR: Bad download of JAXWS zip"; false; \
fi; \
@@ -1089,7 +1143,7 @@
if USE_ALT_JDK_SRC_ZIP
ln -sf $(ALT_JDK_SRC_ZIP) $(JDK_SRC_ZIP)
endif
- if ! echo "$(JDK_SHA256SUM) $(JDK_SRC_ZIP)" \
+ if ! echo "$(JDK_SUM) $(JDK_SRC_ZIP)" \
| $(JDK_SHA256SUM_BIN) --check ; \
then \
if test "x$(enable_downloading)" = "xyes"; then \
@@ -1097,7 +1151,7 @@
mv $(JDK_SRC_ZIP) $(JDK_SRC_ZIP).old ; \
fi ; \
$(WGET) $(ICEDTEA_URL)/$(JDK_SRC_ZIP); \
- if ! echo "$(JDK_SHA256SUM) $(JDK_SRC_ZIP)" \
+ if ! echo "$(JDK_SUM) $(JDK_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
echo "ERROR: Bad download of JDK zip"; false; \
fi; \
@@ -1118,7 +1172,7 @@
if USE_ALT_LANGTOOLS_SRC_ZIP
ln -sf $(ALT_LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP)
endif
- if ! echo "$(LANGTOOLS_SHA256SUM) $(LANGTOOLS_SRC_ZIP)" \
+ if ! echo "$(LANGTOOLS_SUM) $(LANGTOOLS_SRC_ZIP)" \
| $(LANGTOOLS_SHA256SUM_BIN) --check ; \
then \
if test "x$(enable_downloading)" = "xyes"; then \
@@ -1126,7 +1180,7 @@
mv $(LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP).old ; \
fi ; \
$(WGET) $(ICEDTEA_URL)/$(LANGTOOLS_SRC_ZIP); \
- if ! echo "$(LANGTOOLS_SHA256SUM) $(LANGTOOLS_SRC_ZIP)" \
+ if ! echo "$(LANGTOOLS_SUM) $(LANGTOOLS_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
echo "ERROR: Bad download of langtools zip"; false; \
fi; \
@@ -1183,7 +1237,7 @@
if USE_ALT_CACAO_SRC_ZIP
ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
endif
- if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
+ if ! echo "$(CACAO_SUM) $(CACAO_SRC_ZIP)" \
| $(CACAO_SHA256SUM_BIN) --check ; \
then \
if test "x$(enable_downloading)" = "xyes"; then \
@@ -1191,7 +1245,7 @@
mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
fi ; \
$(WGET) $(CACAO_URL) -O $(CACAO_SRC_ZIP); \
- if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
+ if ! echo "$(CACAO_SUM) $(CACAO_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
echo "ERROR: Bad download of CACAO zip"; false; \
fi; \
@@ -1214,7 +1268,7 @@
if USE_ALT_JAMVM_SRC_ZIP
ln -sf $(ALT_JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP)
endif
- if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \
+ if ! echo "$(JAMVM_SUM) $(JAMVM_SRC_ZIP)" \
| $(JAMVM_SHA256SUM_BIN) --check ; \
then \
if test "x$(enable_downloading)" = "xyes"; then \
@@ -1222,7 +1276,7 @@
mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \
fi ; \
$(WGET) $(JAMVM_URL) -O $(JAMVM_SRC_ZIP); \
- if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \
+ if ! echo "$(JAMVM_SUM) $(JAMVM_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
echo "ERROR: Bad download of JamVM zip"; false; \
fi; \
@@ -1247,7 +1301,7 @@
ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
endif
echo "Using HotSpot build: ${HSBUILD}"
- if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
+ if ! echo "$(HOTSPOT_SUM) $(HOTSPOT_SRC_ZIP)" \
| $(HOTSPOT_SHA256SUM_BIN) --check ; \
then \
if test "x$(enable_downloading)" = "xyes"; then \
@@ -1263,7 +1317,7 @@
$(WGET) $(HS_URL)/$(HSBUILD).$(TAR_SUFFIX) -O $(HOTSPOT_SRC_ZIP) ; \
fi ; \
fi ; \
- if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
+ if ! echo "$(HOTSPOT_SUM) $(HOTSPOT_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
echo "ERROR: Bad download of HotSpot zip"; false; \
fi; \
diff -r cff3873b35b5 -r a3787c18ead8 NEWS
--- a/NEWS Fri Jul 17 00:06:58 2015 +0100
+++ b/NEWS Fri Jul 17 01:40:01 2015 +0100
@@ -337,6 +337,7 @@
- PR2537: Desktop files do not allow installation from multiple versions of IcedTea
- PR2539: Libraries in some subdirectories of jre/lib/{arch} are not installed
- PR2540: Specify a cacerts file for the OpenJDK build as we do for OpenJDK 8
+ - PR2545: Extend tarball checksumming option to allow the checksum to be specified
* AArch64 port
- Add copyright to aarch64_ad.m4
- S8069593: Changes to JavaThread::_thread_state must use acquire and release
diff -r cff3873b35b5 -r a3787c18ead8 acinclude.m4
--- a/acinclude.m4 Fri Jul 17 00:06:58 2015 +0100
+++ b/acinclude.m4 Fri Jul 17 01:40:01 2015 +0100
@@ -3083,243 +3083,189 @@
[
AC_REQUIRE([IT_WITH_OPENJDK_SRC_ZIP])
AC_MSG_CHECKING([whether to enable checksumming of the specified OpenJDK tarball])
- AC_ARG_ENABLE([openjdk-checksum],
- [AS_HELP_STRING(--disable-openjdk-checksum,checksum the specified OpenJDK tarball [[default=yes]])],
+ AC_ARG_WITH([openjdk-checksum],
+ [AS_HELP_STRING(--with-openjdk-checksum,checksum the specified OpenJDK tarball [[default=yes]])],
[
- case "${enableval}" in
More information about the distro-pkg-dev
mailing list