Mercurial > illumos > illumos-gate
changeset 10014:dab5af34d388
6855377 zfs unit test driver (zut) fails to install in local zones
| author | Tim Haley <Tim.Haley@Sun.COM> |
|---|---|
| date | Wed, 01 Jul 2009 16:54:27 -0600 |
| parents | 785c0044f0cd |
| children | 0bf0ddae6058 |
| files | usr/src/pkgdefs/Makefile usr/src/pkgdefs/SUNWonzfs/Makefile usr/src/pkgdefs/SUNWonzfs/depend usr/src/pkgdefs/SUNWonzfs/pkginfo.tmpl usr/src/pkgdefs/SUNWonzfs/postinstall.tmpl usr/src/pkgdefs/SUNWonzfs/preremove.tmpl usr/src/pkgdefs/SUNWonzfs/prototype_com usr/src/pkgdefs/SUNWonzfs/prototype_i386 usr/src/pkgdefs/SUNWonzfs/prototype_sparc usr/src/pkgdefs/SUNWonzfsr/Makefile usr/src/pkgdefs/SUNWonzfsr/pkginfo.tmpl usr/src/pkgdefs/SUNWonzfsr/postinstall.tmpl usr/src/pkgdefs/SUNWonzfsr/preremove.tmpl usr/src/pkgdefs/SUNWonzfsr/prototype_com usr/src/pkgdefs/SUNWonzfsr/prototype_i386 usr/src/pkgdefs/SUNWonzfsr/prototype_sparc |
| diffstat | 16 files changed, 269 insertions(+), 72 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/pkgdefs/Makefile Wed Jul 01 14:55:56 2009 -0700 +++ b/usr/src/pkgdefs/Makefile Wed Jul 01 16:54:27 2009 -0600 @@ -367,6 +367,7 @@ SUNWocfh \ SUNWocfr \ SUNWonfmes \ + SUNWonzfsr \ SUNWonzfs \ SUNWosdem \ SUNWypr \
--- a/usr/src/pkgdefs/SUNWonzfs/Makefile Wed Jul 01 14:55:56 2009 -0700 +++ b/usr/src/pkgdefs/SUNWonzfs/Makefile Wed Jul 01 16:54:27 2009 -0600 @@ -25,9 +25,6 @@ include ../Makefile.com -TMPLFILES += postinstall preremove -DATAFILES += depend - .KEEP_STATE: all: $(FILES)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/pkgdefs/SUNWonzfs/depend Wed Jul 01 16:54:27 2009 -0600 @@ -0,0 +1,34 @@ +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +P SUNWcar Core Architecture, (Root) +P SUNWcakr Core Solaris Kernel Architecture (Root) +P SUNWkvm Core Architecture, (Kvm) +P SUNWcsr Core Solaris, (Root) +P SUNWckr Core Solaris Kernel (Root) +P SUNWcnetr Core Solaris Network Infrastructure (Root) +P SUNWcsu Core Solaris, (Usr) +P SUNWcsd Core Solaris Devices +P SUNWcsl Core Solaris Libraries +P SUNWonzfsr ZFS test driver
--- a/usr/src/pkgdefs/SUNWonzfs/pkginfo.tmpl Wed Jul 01 14:55:56 2009 -0700 +++ b/usr/src/pkgdefs/SUNWonzfs/pkginfo.tmpl Wed Jul 01 16:54:27 2009 -0600 @@ -18,11 +18,9 @@ # # CDDL HEADER END # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # This required package information file describes characteristics of the # package, such as package abbreviation, full package name, package version, # and package architecture. @@ -43,3 +41,6 @@ CLASSES="none" BASEDIR=/ SUNW_PKGVERS="1.0" +SUNW_PKG_ALLZONES="true" +SUNW_PKG_HOLLOW="false" +SUNW_PKG_THISZONE="false"
--- a/usr/src/pkgdefs/SUNWonzfs/postinstall.tmpl Wed Jul 01 14:55:56 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -#!/sbin/sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -include drv_utils - -pkg_drvadd -m '* 0666 root sys' zut || exit 1
--- a/usr/src/pkgdefs/SUNWonzfs/preremove.tmpl Wed Jul 01 14:55:56 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -#!/sbin/sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -include drv_utils - -pkg_drvrem zut || exit 1
--- a/usr/src/pkgdefs/SUNWonzfs/prototype_com Wed Jul 01 14:55:56 2009 -0700 +++ b/usr/src/pkgdefs/SUNWonzfs/prototype_com Wed Jul 01 16:54:27 2009 -0600 @@ -24,14 +24,9 @@ i pkginfo i copyright i depend -i postinstall -i preremove # # SUNWonzfs # -d none kernel 755 root sys -d none kernel/drv 0755 root sys -f none kernel/drv/zut.conf 644 root sys d none usr 755 root sys d none usr/bin 755 root bin l none usr/bin/ztest=../../usr/lib/isaexec
--- a/usr/src/pkgdefs/SUNWonzfs/prototype_i386 Wed Jul 01 14:55:56 2009 -0700 +++ b/usr/src/pkgdefs/SUNWonzfs/prototype_i386 Wed Jul 01 16:54:27 2009 -0600 @@ -23,9 +23,6 @@ # !include prototype_com # -f none kernel/drv/zut 755 root sys -d none kernel/drv/amd64 755 root sys -f none kernel/drv/amd64/zut 755 root sys d none usr/sbin/amd64 755 root bin f none usr/sbin/amd64/zinject 555 root bin d none usr/sbin/i86 755 root bin
--- a/usr/src/pkgdefs/SUNWonzfs/prototype_sparc Wed Jul 01 14:55:56 2009 -0700 +++ b/usr/src/pkgdefs/SUNWonzfs/prototype_sparc Wed Jul 01 16:54:27 2009 -0600 @@ -24,8 +24,6 @@ # !include prototype_com # -d none kernel/drv/sparcv9 755 root sys -f none kernel/drv/sparcv9/zut 755 root sys d none usr/sbin/sparcv9 755 root bin f none usr/sbin/sparcv9/zinject 555 root bin d none usr/bin/sparcv9 755 root bin
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/pkgdefs/SUNWonzfsr/Makefile Wed Jul 01 16:54:27 2009 -0600 @@ -0,0 +1,38 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# + +include ../Makefile.com + +TMPLFILES += postinstall preremove +DATAFILES += depend + +.KEEP_STATE: + +all: $(FILES) + +install: all pkg + +include ../Makefile.targ +include ../Makefile.prtarg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/pkgdefs/SUNWonzfsr/pkginfo.tmpl Wed Jul 01 16:54:27 2009 -0600 @@ -0,0 +1,46 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# This required package information file describes characteristics of the +# package, such as package abbreviation, full package name, package version, +# and package architecture. +# +PKG="SUNWonzfsr" +NAME="ZFS unbundled driver" +ARCH="ISA" +VERSION="ONVERS,REV=0.0.0" +SUNW_PRODNAME="SunOS" +SUNW_PRODVERS="RELEASE/VERSION" +SUNW_PKGTYPE="root" +MAXINST="1000" +CATEGORY="system" +DESC="ZFS test driver" +VENDOR="Sun Microsystems, Inc." +HOTLINE="Please contact your local service provider" +EMAIL="" +CLASSES="none" +BASEDIR=/ +SUNW_PKGVERS="1.0" +SUNW_PKG_ALLZONES="true" +SUNW_PKG_HOLLOW="true" +SUNW_PKG_THISZONE="false"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/pkgdefs/SUNWonzfsr/postinstall.tmpl Wed Jul 01 16:54:27 2009 -0600 @@ -0,0 +1,28 @@ +#!/sbin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# + +include drv_utils + +pkg_drvadd -m '* 0666 root sys' zut || exit 1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/pkgdefs/SUNWonzfsr/preremove.tmpl Wed Jul 01 16:54:27 2009 -0600 @@ -0,0 +1,28 @@ +#!/sbin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# + +include drv_utils + +pkg_drvrem zut || exit 1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/pkgdefs/SUNWonzfsr/prototype_com Wed Jul 01 16:54:27 2009 -0600 @@ -0,0 +1,34 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +i pkginfo +i copyright +i depend +i postinstall +i preremove +# +# SUNWonzfsr +# +d none kernel 755 root sys +d none kernel/drv 0755 root sys +f none kernel/drv/zut.conf 644 root sys
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/pkgdefs/SUNWonzfsr/prototype_i386 Wed Jul 01 16:54:27 2009 -0600 @@ -0,0 +1,28 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +!include prototype_com +# +f none kernel/drv/zut 755 root sys +d none kernel/drv/amd64 755 root sys +f none kernel/drv/amd64/zut 755 root sys
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/usr/src/pkgdefs/SUNWonzfsr/prototype_sparc Wed Jul 01 16:54:27 2009 -0600 @@ -0,0 +1,28 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# +!include prototype_com +# +d none kernel/drv/sparcv9 755 root sys +f none kernel/drv/sparcv9/zut 755 root sys