--- a/.hgtags-top-repo Thu Jun 16 20:57:05 2016 +0000
+++ b/.hgtags-top-repo Wed Jul 05 21:50:35 2017 +0200
@@ -365,3 +365,4 @@
647e0142a5a52749db572b5e6638d561def6479e jdk-9+120
cae471d3b87783e0a3deea658e1e1c84b2485b6c jdk-9+121
346be2df0f5b31d423807f53a719d1b9a67f3354 jdk-9+122
+405d811c0d7b9b48ff718ae6c240b732f098c028 jdk-9+123
--- a/common/autoconf/basics.m4 Thu Jun 16 20:57:05 2016 +0000
+++ b/common/autoconf/basics.m4 Wed Jul 05 21:50:35 2017 +0200
@@ -1022,13 +1022,21 @@
AC_MSG_CHECKING([what type of tar was found])
AC_MSG_RESULT([$TAR_TYPE])
+ TAR_CREATE_FILE_PARAM=""
+
if test "x$TAR_TYPE" = "xgnu"; then
TAR_INCLUDE_PARAM="T"
TAR_SUPPORTS_TRANSFORM="true"
+ if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+ # When using gnu tar for Solaris targets, need to use compatibility mode
+ TAR_CREATE_EXTRA_PARAM="--format=ustar"
+ fi
else
TAR_INCLUDE_PARAM="I"
TAR_SUPPORTS_TRANSFORM="false"
fi
+ AC_SUBST(TAR_TYPE)
+ AC_SUBST(TAR_CREATE_EXTRA_PARAM)
AC_SUBST(TAR_INCLUDE_PARAM)
AC_SUBST(TAR_SUPPORTS_TRANSFORM)
])
--- a/common/autoconf/generated-configure.sh Thu Jun 16 20:57:05 2016 +0000
+++ b/common/autoconf/generated-configure.sh Wed Jul 05 21:50:35 2017 +0200
@@ -953,6 +953,8 @@
UNZIP
TAR_SUPPORTS_TRANSFORM
TAR_INCLUDE_PARAM
+TAR_CREATE_EXTRA_PARAM
+TAR_TYPE
FIND_DELETE
OUTPUT_SYNC
OUTPUT_SYNC_SUPPORTED
@@ -5092,7 +5094,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1465306933
+DATE_WHEN_GENERATED=1466007828
###############################################################################
#
@@ -21172,9 +21174,15 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR_TYPE" >&5
$as_echo "$TAR_TYPE" >&6; }
+ TAR_CREATE_FILE_PARAM=""
+
if test "x$TAR_TYPE" = "xgnu"; then
TAR_INCLUDE_PARAM="T"
TAR_SUPPORTS_TRANSFORM="true"
+ if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+ # When using gnu tar for Solaris targets, need to use compatibility mode
+ TAR_CREATE_EXTRA_PARAM="--format=ustar"
+ fi
else
TAR_INCLUDE_PARAM="I"
TAR_SUPPORTS_TRANSFORM="false"
@@ -21183,6 +21191,8 @@
+
+
# These tools might not be installed by default,
# need hint on how to install them.
--- a/common/autoconf/spec.gmk.in Thu Jun 16 20:57:05 2016 +0000
+++ b/common/autoconf/spec.gmk.in Wed Jul 05 21:50:35 2017 +0200
@@ -687,6 +687,8 @@
DTRACE := @DTRACE@
FIXPATH:=@FIXPATH@
+TAR_TYPE:=@TAR_TYPE@
+TAR_CREATE_EXTRA_PARAM:=@TAR_CREATE_EXTRA_PARAM@
TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@
TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@
--- a/make/Bundles.gmk Thu Jun 16 20:57:05 2016 +0000
+++ b/make/Bundles.gmk Wed Jul 05 21:50:35 2017 +0200
@@ -77,7 +77,8 @@
ifneq ($$($1_SUBDIR), )
ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO), tar.gz-true-false)
$(CD) $$($1_BASE_DIR) \
- && ( $(TAR) cf - -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
+ && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
+ -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
--transform 's|^|$$($1_SUBDIR)/|' $(TAR_IGNORE_EXIT_VALUE) ) \
| $(GZIP) > $$@
else
@@ -97,7 +98,8 @@
endif
ifeq ($$($1_TYPE), tar.gz)
$(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \
- ( $(TAR) cf - $$($1_SUBDIR) $(TAR_IGNORE_EXIT_VALUE) ) | $(GZIP) > $$@
+ ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) $$($1_SUBDIR) $(TAR_IGNORE_EXIT_VALUE) ) \
+ | $(GZIP) > $$@
else ifeq ($$($1_TYPE), zip)
$(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIP) -qr $$@ .
endif
@@ -105,7 +107,8 @@
else
ifeq ($$($1_TYPE), tar.gz)
$(CD) $$($1_BASE_DIR) \
- && ( $(TAR) cf - -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
+ && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
+ -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
$(TAR_IGNORE_EXIT_VALUE) ) \
| $(GZIP) > $$@
else ifeq ($$($1_TYPE), zip)