[illumos-gate merge]

commit cb159270e9e67dea31dfbd991ec758829de14d35
    7800 Support build with OpenJDK 8
commit defc4c8acfa01dba1ef3c13ca0cafccfcede51c0
    7719 sdev_create() doesn't enforce EISDIR in non-GZ

	Conflicts:
	usr/src/test/os-tests/tests/Makefile
	usr/src/test/os-tests/runfiles/default.run

22 files changed, 207 insertions, 39 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index a30139872e..4b5dcdda6d 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -120,6 +120,8 @@ ONBLD_TOOLS=		$(BUILD_TOOLS)/onbld
 JAVA_HOME=	/usr/java
 # define buildtime JAVA_ROOT
 JAVA_ROOT=	/usr/java
+# define to build with JAVA 8
+BLD_JAVA_8=	$(POUND_SIGN)
 
 GCC_ROOT=	/opt/gcc/4.4.4
 GCCLIBDIR=	$(GCC_ROOT)/lib
diff --git a/usr/src/cmd/pools/poold/Makefile b/usr/src/cmd/pools/poold/Makefile
index 814fa34c09..cc1e3791f1 100644
--- a/usr/src/cmd/pools/poold/Makefile
+++ b/usr/src/cmd/pools/poold/Makefile
@@ -32,6 +32,7 @@ MANIFEST=	poold.xml
 SVCMETHOD=	svc-poold
 
 include $(SRC)/cmd/Makefile.cmd
+$(BLD_JAVA_8)include $(SRC)/cmd/Makefile.cmd.64
 
 JAVA_SUBDIRS =	com/sun/solaris/service/exception \
 		com/sun/solaris/service/kstat \
@@ -58,6 +59,11 @@ msg :=		TARGET = msg
 $(ROOTMANIFEST):=	FILEMODE= 444
 JARFILE =	JPool.jar
 
+JAVA_LIB_PATH =	$(JAVA_ROOT)/jre/lib/$(MACH)/client
+LIBPOOL_PATH = $(ROOTLIB)
+$(BLD_JAVA_8)JAVA_LIB_PATH =	$(JAVA_ROOT)/jre/lib/$(MACH64)/server
+$(BLD_JAVA_8)LIBPOOL_PATH = $(ROOTLIB64)
+
 # JAVA_SUBDIRS and PACKAGEDOCS must be synchronized to ensure 
 # javadoc documentation is generated for all packages.
 
@@ -73,11 +79,13 @@ ROOTUSRLIBDRP = $(ROOTLIB)/pool
 INCS =		-I../common \
 		-I$(JAVA_ROOT)/include \
 		-I$(JAVA_ROOT)/include/solaris
-LDLIBS +=	-lpool -L$(JAVA_ROOT)/jre/lib/$(MACH)/client -ljvm
+LDLIBS +=	-lpool -L$(JAVA_LIB_PATH) -ljvm
 # runpath should point to runtime JAVA_HOME
-LDFLAGS +=	-R$(JAVA_HOME)/jre/lib/$(MACH)/client
+LDFLAGS +=	-R$(JAVA_LIB_PATH)
+
 LINTFLAGS +=	-erroff=E_NAME_USED_NOT_DEF2
-LINTLIBS +=	-L$(ROOTLIB) -lpool
+$(BLD_JAVA_8)LINTFLAGS64 += -erroff=E_NAME_USED_NOT_DEF2
+LINTLIBS +=	-L$(LIBPOOL_PATH) -lpool
 
 CPPFLAGS +=	$(INCS)
 ROOTCMDDIR =	$(ROOT)/usr/lib/pool
diff --git a/usr/src/cmd/pools/poold/libjkstat/Makefile b/usr/src/cmd/pools/poold/libjkstat/Makefile
index 6f9caf443b..810de1da26 100644
--- a/usr/src/cmd/pools/poold/libjkstat/Makefile
+++ b/usr/src/cmd/pools/poold/libjkstat/Makefile
@@ -22,12 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include $(SRC)/lib/Makefile.lib
 
 SUBDIRS =	$(MACH)
+$(BLD_JAVA_8)SUBDIRS = $(MACH64)
 
 all :=		TARGET = all
 clean :=	TARGET = clean
diff --git a/usr/src/cmd/pools/poold/libjkstat/amd64/Makefile b/usr/src/cmd/pools/poold/libjkstat/amd64/Makefile
new file mode 100644
index 0000000000..519c74c98b
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjkstat/amd64/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Alexander Pyhalov
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjkstat/sparcv9/Makefile b/usr/src/cmd/pools/poold/libjkstat/sparcv9/Makefile
new file mode 100644
index 0000000000..519c74c98b
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjkstat/sparcv9/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Alexander Pyhalov
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjlgrp/Makefile b/usr/src/cmd/pools/poold/libjlgrp/Makefile
index 15721c3e8f..e8481498b8 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/Makefile
+++ b/usr/src/cmd/pools/poold/libjlgrp/Makefile
@@ -22,12 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include $(SRC)/lib/Makefile.lib
 
 SUBDIRS =	$(MACH)
+$(BLD_JAVA_8)SUBDIRS = $(MACH64)
 
 all :=		TARGET = all
 clean :=	TARGET = clean
diff --git a/usr/src/cmd/pools/poold/libjlgrp/amd64/Makefile b/usr/src/cmd/pools/poold/libjlgrp/amd64/Makefile
new file mode 100644
index 0000000000..519c74c98b
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjlgrp/amd64/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Alexander Pyhalov
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjlgrp/sparcv9/Makefile b/usr/src/cmd/pools/poold/libjlgrp/sparcv9/Makefile
new file mode 100644
index 0000000000..519c74c98b
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjlgrp/sparcv9/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Alexander Pyhalov
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjpool/Makefile b/usr/src/cmd/pools/poold/libjpool/Makefile
index 8cdd821a9e..1a1b192654 100644
--- a/usr/src/cmd/pools/poold/libjpool/Makefile
+++ b/usr/src/cmd/pools/poold/libjpool/Makefile
@@ -22,12 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include $(SRC)/lib/Makefile.lib
 
 SUBDIRS =	$(MACH)
+$(BLD_JAVA_8)SUBDIRS = $(MACH64)
 
 all :=		TARGET = all
 clean :=	TARGET = clean
diff --git a/usr/src/cmd/pools/poold/libjpool/amd64/Makefile b/usr/src/cmd/pools/poold/libjpool/amd64/Makefile
new file mode 100644
index 0000000000..519c74c98b
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjpool/amd64/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Alexander Pyhalov
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjpool/sparcv9/Makefile b/usr/src/cmd/pools/poold/libjpool/sparcv9/Makefile
new file mode 100644
index 0000000000..519c74c98b
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjpool/sparcv9/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Alexander Pyhalov
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjsyslog/Makefile b/usr/src/cmd/pools/poold/libjsyslog/Makefile
index 80b59a3afb..e92960f43a 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/Makefile
+++ b/usr/src/cmd/pools/poold/libjsyslog/Makefile
@@ -22,12 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include $(SRC)/lib/Makefile.lib
 
 SUBDIRS =	$(MACH)
+$(BLD_JAVA_8)SUBDIRS = $(MACH64)
 
 all :=		TARGET = all
 clean :=	TARGET = clean
diff --git a/usr/src/cmd/pools/poold/libjsyslog/amd64/Makefile b/usr/src/cmd/pools/poold/libjsyslog/amd64/Makefile
new file mode 100644
index 0000000000..519c74c98b
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjsyslog/amd64/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Alexander Pyhalov
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjsyslog/sparcv9/Makefile b/usr/src/cmd/pools/poold/libjsyslog/sparcv9/Makefile
new file mode 100644
index 0000000000..519c74c98b
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjsyslog/sparcv9/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Alexander Pyhalov
+#
+
+include ../Makefile.com
+include $(SRC)/Makefile.master.64
+
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/poold.c b/usr/src/cmd/pools/poold/poold.c
index b354ebc99c..bb18d7e856 100644
--- a/usr/src/cmd/pools/poold/poold.c
+++ b/usr/src/cmd/pools/poold/poold.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * poold - dynamically adjust pool configuration according to load.
  */
@@ -54,16 +52,6 @@
 #define	POOLD_DEF_LIBPATH	"/usr/lib/pool"
 #define	SMF_SVC_INSTANCE	"svc:/system/pools/dynamic:default"
 
-#if defined(sparc)
-#define	PLAT	"sparc"
-#else
-#if defined(i386)
-#define	PLAT	"i386"
-#else
-#error Unrecognized platform.
-#endif
-#endif
-
 #define	CLASS_FIELD_DESC(class_desc)	"L" class_desc ";"
 
 #define	LEVEL_CLASS_DESC	"java/util/logging/Level"
diff --git a/usr/src/lib/libdns_sd/java/com/apple/dnssd/Makefile b/usr/src/lib/libdns_sd/java/com/apple/dnssd/Makefile
index 1da9c33f51..334b97f158 100644
--- a/usr/src/lib/libdns_sd/java/com/apple/dnssd/Makefile
+++ b/usr/src/lib/libdns_sd/java/com/apple/dnssd/Makefile
@@ -22,7 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 include ../Makefile.com
 
@@ -43,6 +42,7 @@ DOCAPIDIR = $(JAVASRCDIR)/docs/api
 DOCDESTDIR = $(ROOTDNSSDJAVAHOME)/javadoc/dnssd
 DOCAPIDESTDIR = $(DOCDESTDIR)/api
 DOCEXAMPLESDESTDIR = $(DOCDESTDIR)/examples
+$(BLD_JAVA_8)XDOCLINT_OPTION = -Xdoclint:none
 
 EXAMPLESDIR = $(JAVASRCDIR)/docs/examples
 EXAMPLESSRC = $(JAVASRCDIR)/docs/examples/src
@@ -140,11 +140,11 @@ $(DOCEXAMPLESDESTDIR)/%: %
 install_doc: $(CLASSES) $(DOCAPIDESTDIR)
 	-$(RM) -r $(DOCAPIDESTDIR)/*
 	cd $(TOP); umask 022; \
-	$(JAVADOC) $(JAVASRCDIR)/*.java -notimestamp -classpath \
+	$(JAVADOC) $(JAVASRCDIR)/*.java $(XDOCLINT_OPTION) -notimestamp -classpath \
 	$(CLASSPATH) -d $(DOCAPIDESTDIR) -public $(DNSSD_PKG)
 
 doc:
 	-@mkdir -p $(DOCAPIDIR)
 	cd $(TOP); umask 022; \
-	$(JAVADOC) $(JAVASRCDIR)/*.java -notimestamp -classpath \
+	$(JAVADOC) $(JAVASRCDIR)/*.java $(XDOCLINT_OPTION) -notimestamp -classpath \
      	$(CLASSPATH) -d $(DOCAPIDIR) -public $(DNSSD_PKG)
diff --git a/usr/src/lib/libdtrace_jni/java/Makefile b/usr/src/lib/libdtrace_jni/java/Makefile
index e0f3e8e31a..3141eeaa90 100644
--- a/usr/src/lib/libdtrace_jni/java/Makefile
+++ b/usr/src/lib/libdtrace_jni/java/Makefile
@@ -55,6 +55,7 @@ DOCAPIDESTDIR=$(DOCDESTDIR)/api
 DOCEXAMPLESDESTDIR=$(DOCDESTDIR)/examples
 DOCHTMLDESTDIR=$(DOCDESTDIR)/html
 DOCIMAGESDESTDIR=$(DOCDESTDIR)/images
+$(BLD_JAVA_8)XDOCLINT_OPTION=-Xdoclint:none
 
 $(JARDESTDIR)/%: $(JARS)/%
 	$(INS.file)
@@ -189,7 +190,7 @@ $(DOCAPIDESTDIR)/index.html: $(DTRACE_API_CLASSES)
 		-@mkdir -p $(DOCAPIDESTDIR)
 		-$(RM) -r $(DOCAPIDESTDIR)/*
 		cd $(APIJAVASRC); umask 022; \
-		$(JAVADOC) -protected -use -notimestamp \
+		$(JAVADOC) -protected -use -notimestamp $(XDOCLINT_OPTION) \
 		-classpath $(APICLASSPATH) -d $(DOCAPIDESTDIR) \
 		$(PKGNAME)
 
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index a00bdfc452..e1e1880dbc 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -167,6 +167,10 @@ PM_TRANSFORMS= common_actions publish restart_fmri facets defaults \
 	extract_metadata
 PM_INC= transforms manifests
 
+JAVA_8_ONLY=$(BLD_JAVA_8)
+JAVA_7_ONLY=
+$(BLD_JAVA_8)JAVA_7_ONLY=$(POUND_SIGN)
+
 PKGMOG_DEFINES= \
 	i386_ONLY=$(POUND_SIGN) \
 	sparc_ONLY=$(POUND_SIGN) \
@@ -182,7 +186,9 @@ PKGMOG_DEFINES= \
 	PERL_VERSION=$(PERL_VERSION) \
 	PERL_PKGVERS=$(PERL_PKGVERS) \
 	PYTHON_VERSION=$(PYTHON_VERSION) \
-	PYTHON_PKGVERS=$(PYTHON_PKGVERS)
+	PYTHON_PKGVERS=$(PYTHON_PKGVERS) \
+	JAVA_8_ONLY=$(JAVA_8_ONLY) \
+	JAVA_7_ONLY=$(JAVA_7_ONLY)
 
 PKGDEP_TOKENS_i386= \
 	'PLATFORM=i86hvm' \
diff --git a/usr/src/pkg/manifests/developer-dtrace.mf b/usr/src/pkg/manifests/developer-dtrace.mf
index dad7a39f2e..d8ebeb21a1 100644
--- a/usr/src/pkg/manifests/developer-dtrace.mf
+++ b/usr/src/pkg/manifests/developer-dtrace.mf
@@ -66,7 +66,8 @@ dir path=usr/share/lib/java/javadoc/dtrace/api/org/opensolaris/os/dtrace \
 dir \
     path=usr/share/lib/java/javadoc/dtrace/api/org/opensolaris/os/dtrace/class-use \
     group=other
-dir path=usr/share/lib/java/javadoc/dtrace/api/resources group=other
+$(JAVA_7_ONLY)dir path=usr/share/lib/java/javadoc/dtrace/api/resources \
+    group=other
 dir path=usr/share/lib/java/javadoc/dtrace/examples group=other
 dir path=usr/share/lib/java/javadoc/dtrace/html group=other
 dir path=usr/share/lib/java/javadoc/dtrace/images group=other
@@ -624,12 +625,18 @@ file \
     group=other
 file path=usr/share/lib/java/javadoc/dtrace/api/overview-tree.html group=other
 file path=usr/share/lib/java/javadoc/dtrace/api/package-list group=other
-file path=usr/share/lib/java/javadoc/dtrace/api/resources/background.gif \
+$(JAVA_7_ONLY)file \
+    path=usr/share/lib/java/javadoc/dtrace/api/resources/background.gif \
+    group=other
+$(JAVA_7_ONLY)file \
+    path=usr/share/lib/java/javadoc/dtrace/api/resources/tab.gif group=other
+$(JAVA_7_ONLY)file \
+    path=usr/share/lib/java/javadoc/dtrace/api/resources/titlebar.gif \
     group=other
-file path=usr/share/lib/java/javadoc/dtrace/api/resources/tab.gif group=other
-file path=usr/share/lib/java/javadoc/dtrace/api/resources/titlebar.gif \
+$(JAVA_7_ONLY)file \
+    path=usr/share/lib/java/javadoc/dtrace/api/resources/titlebar_end.gif \
     group=other
-file path=usr/share/lib/java/javadoc/dtrace/api/resources/titlebar_end.gif \
+$(JAVA_8_ONLY)file path=usr/share/lib/java/javadoc/dtrace/api/script.js \
     group=other
 file path=usr/share/lib/java/javadoc/dtrace/api/serialized-form.html \
     group=other
diff --git a/usr/src/pkg/manifests/service-network-dns-mdns.mf b/usr/src/pkg/manifests/service-network-dns-mdns.mf
index d88be620ac..4c809b4ae7 100644
--- a/usr/src/pkg/manifests/service-network-dns-mdns.mf
+++ b/usr/src/pkg/manifests/service-network-dns-mdns.mf
@@ -52,7 +52,8 @@ dir path=usr/share/lib/java/javadoc/dnssd/api group=other
 dir path=usr/share/lib/java/javadoc/dnssd/api/com group=other
 dir path=usr/share/lib/java/javadoc/dnssd/api/com/apple group=other
 dir path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd group=other
-dir path=usr/share/lib/java/javadoc/dnssd/api/resources group=other
+$(JAVA_7_ONLY)dir path=usr/share/lib/java/javadoc/dnssd/api/resources \
+    group=other
 dir path=usr/share/lib/java/javadoc/dnssd/examples group=other
 dir path=usr/share/man
 dir path=usr/share/man/man1m
@@ -133,12 +134,18 @@ file path=usr/share/lib/java/javadoc/dnssd/api/index-all.html group=other
 file path=usr/share/lib/java/javadoc/dnssd/api/index.html group=other
 file path=usr/share/lib/java/javadoc/dnssd/api/overview-tree.html group=other
 file path=usr/share/lib/java/javadoc/dnssd/api/package-list group=other
-file path=usr/share/lib/java/javadoc/dnssd/api/resources/background.gif \
+$(JAVA_7_ONLY)file \
+    path=usr/share/lib/java/javadoc/dnssd/api/resources/background.gif \
+    group=other
+$(JAVA_7_ONLY)file path=usr/share/lib/java/javadoc/dnssd/api/resources/tab.gif \
+    group=other
+$(JAVA_7_ONLY)file \
+    path=usr/share/lib/java/javadoc/dnssd/api/resources/titlebar.gif \
     group=other
-file path=usr/share/lib/java/javadoc/dnssd/api/resources/tab.gif group=other
-file path=usr/share/lib/java/javadoc/dnssd/api/resources/titlebar.gif \
+$(JAVA_7_ONLY)file \
+    path=usr/share/lib/java/javadoc/dnssd/api/resources/titlebar_end.gif \
     group=other
-file path=usr/share/lib/java/javadoc/dnssd/api/resources/titlebar_end.gif \
+$(JAVA_8_ONLY)file path=usr/share/lib/java/javadoc/dnssd/api/script.js \
     group=other
 file path=usr/share/lib/java/javadoc/dnssd/api/serialized-form.html \
     group=other
diff --git a/usr/src/pkg/manifests/service-resource-pools-poold.mf b/usr/src/pkg/manifests/service-resource-pools-poold.mf
index 9f87fa566c..28abe1ac18 100644
--- a/usr/src/pkg/manifests/service-resource-pools-poold.mf
+++ b/usr/src/pkg/manifests/service-resource-pools-poold.mf
@@ -48,4 +48,3 @@ link path=usr/lib/pool/libjkstat.so target=./libjkstat.so.1
 link path=usr/lib/pool/libjlgrp.so target=./libjlgrp.so.1
 link path=usr/lib/pool/libjpool.so target=./libjpool.so.1
 link path=usr/lib/pool/libjsyslog.so target=./libjsyslog.so.1
-depend fmri=runtime/java type=require
diff --git a/usr/src/pkg/manifests/system-test-ostest.mf b/usr/src/pkg/manifests/system-test-ostest.mf
index 7a1a0624f4..64daf4a64f 100644
--- a/usr/src/pkg/manifests/system-test-ostest.mf
+++ b/usr/src/pkg/manifests/system-test-ostest.mf
@@ -26,6 +26,7 @@ dir path=opt/os-tests/bin
 dir path=opt/os-tests/runfiles
 dir path=opt/os-tests/tests
 dir path=opt/os-tests/tests/file-locking
+dir path=opt/os-tests/tests/sdevfs
 dir path=opt/os-tests/tests/secflags
 dir path=opt/os-tests/tests/sigqueue
 file path=opt/os-tests/README mode=0444
@@ -37,6 +38,7 @@ file path=opt/os-tests/tests/file-locking/acquire-lock.64 mode=0555
 file path=opt/os-tests/tests/file-locking/runtests.32 mode=0555
 file path=opt/os-tests/tests/file-locking/runtests.64 mode=0555
 file path=opt/os-tests/tests/poll_test mode=0555
+file path=opt/os-tests/tests/sdevfs/sdevfs_eisdir mode=0555
 file path=opt/os-tests/tests/secflags/addrs-32 mode=0555
 file path=opt/os-tests/tests/secflags/addrs-64 mode=0555
 file path=opt/os-tests/tests/secflags/secflags_aslr mode=0555