Looks good.

/Erik


On 2018-09-10 01:10, Magnus Ihse Bursie wrote:


On 2018-09-05 15:26, Alan Bateman wrote:
On 05/09/2018 13:58, Magnus Ihse Bursie wrote:
The file sdp.conf.template is copied only when building for solaris, but it resides in the unix source directory.
SDP is legacy now and we should probably think about removing it, esp. with the rsocket support in the works.

In the mean time, as the SDP support is compiled into libnet on Linux, then we should copy the template in the Linux image too.

Updated patch, which copies the SDP template for linux too:

diff --git a/make/copy/Copy-java.base.gmk b/make/copy/Copy-java.base.gmk
--- a/make/copy/Copy-java.base.gmk
+++ b/make/copy/Copy-java.base.gmk
@@ -183,7 +183,7 @@

 TARGETS += $(COPY_NET_PROPERTIES)

-ifeq ($(OPENJDK_TARGET_OS), solaris)
+ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux), )
   $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
       FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
       DEST := $(CONF_DST_DIR)/sdp, \


/Magnus


Reply via email to