From f5c2e7ea56aaa46a9976476fb0cb1f02b9426f07 Mon Sep 17 00:00:00 2001 From: Theo Schlossnagle Date: Thu, 6 Dec 2012 16:29:54 -0800 Subject: [PATCH] 3352 would like 64bit install libraries Reviewed by: Garrett D'Amore Reviewed by: Richard Lowe Reviewed by: Igor Kozhukhov Reviewed by: Christopher Siden Approved by: Garrett D'Amore --- exception_lists/packaging | 11 +++++++++++ usr/src/Targetdirs | 11 +++++++++++ usr/src/lib/libbe/Makefile | 2 ++ usr/src/lib/libbe/Makefile.com | 3 +-- usr/src/lib/{libfdisk => libbe}/amd64/Makefile | 8 ++++---- usr/src/lib/{libfdisk/amd64 => libbe/sparcv9}/Makefile | 8 ++++---- usr/src/lib/libdhcputil/Makefile | 4 ++-- usr/src/lib/{libfdisk => libdhcputil}/amd64/Makefile | 9 ++++----- usr/src/lib/{libfdisk/amd64 => libdhcputil/sparcv9}/Makefile | 9 ++++----- usr/src/lib/libfdisk/amd64/Makefile | 1 - usr/src/lib/libfdisk/{amd64 => sparcv9}/Makefile | 4 +--- usr/src/lib/libfstyp/Makefile | 4 ++-- usr/src/lib/{libfdisk => libfstyp}/amd64/Makefile | 6 ++---- usr/src/lib/{libfdisk/amd64 => libfstyp/sparcv9}/Makefile | 7 ++----- usr/src/lib/libinstzones/Makefile | 2 ++ usr/src/lib/{libfdisk => libinstzones}/amd64/Makefile | 8 ++++---- usr/src/lib/libinstzones/common/zones_locks.c | 8 +++++--- usr/src/lib/{libfdisk/amd64 => libinstzones/sparcv9}/Makefile | 8 ++++---- usr/src/lib/libwanboot/Makefile | 4 ++-- usr/src/lib/libwanboot/Makefile.com | 5 ++++- usr/src/lib/{libfdisk => libwanboot}/amd64/Makefile | 9 ++++----- usr/src/lib/{libfdisk/amd64 => libwanboot/sparcv9}/Makefile | 9 ++++----- usr/src/lib/libwanbootutil/Makefile | 4 ++-- usr/src/lib/libwanbootutil/Makefile.com | 5 ++++- usr/src/lib/{libfdisk => libwanbootutil}/amd64/Makefile | 9 ++++----- .../lib/{libfdisk/amd64 => libwanbootutil/sparcv9}/Makefile | 9 ++++----- usr/src/lib/libzoneinfo/Makefile | 4 ++-- usr/src/lib/{libfdisk => libzoneinfo}/amd64/Makefile | 10 ++++------ usr/src/lib/{libfdisk/amd64 => libzoneinfo/sparcv9}/Makefile | 9 ++++----- usr/src/lib/pylibbe/Makefile | 2 ++ usr/src/lib/pylibbe/Makefile.com | 2 ++ usr/src/lib/{libfdisk => pylibbe}/amd64/Makefile | 7 +++---- usr/src/lib/pylibbe/common/libbe_py.c | 3 ++- usr/src/lib/{libfdisk/amd64 => pylibbe/sparcv9}/Makefile | 7 +++---- usr/src/pkg/manifests/developer-library-lint.mf | 3 +++ usr/src/pkg/manifests/install-beadm.mf | 7 +++++++ usr/src/pkg/manifests/package-svr4.mf | 3 +++ usr/src/pkg/manifests/system-boot-wanboot-internal.mf | 5 +++++ usr/src/pkg/manifests/system-boot-wanboot.mf | 3 +++ usr/src/pkg/manifests/system-library-install-libinstzones.mf | 3 +++ usr/src/pkg/manifests/system-library.mf | 8 ++++++++ 41 files changed, 147 insertions(+), 96 deletions(-) copy usr/src/lib/{libfdisk => libbe}/amd64/Makefile (78%) copy usr/src/lib/{libfdisk/amd64 => libbe/sparcv9}/Makefile (78%) copy usr/src/lib/{libfdisk => libdhcputil}/amd64/Makefile (77%) copy usr/src/lib/{libfdisk/amd64 => libdhcputil/sparcv9}/Makefile (77%) copy usr/src/lib/libfdisk/{amd64 => sparcv9}/Makefile (90%) copy usr/src/lib/{libfdisk => libfstyp}/amd64/Makefile (84%) copy usr/src/lib/{libfdisk/amd64 => libfstyp/sparcv9}/Makefile (84%) copy usr/src/lib/{libfdisk => libinstzones}/amd64/Makefile (78%) copy usr/src/lib/{libfdisk/amd64 => libinstzones/sparcv9}/Makefile (78%) copy usr/src/lib/{libfdisk => libwanboot}/amd64/Makefile (77%) copy usr/src/lib/{libfdisk/amd64 => libwanboot/sparcv9}/Makefile (77%) copy usr/src/lib/{libfdisk => libwanbootutil}/amd64/Makefile (77%) copy usr/src/lib/{libfdisk/amd64 => libwanbootutil/sparcv9}/Makefile (77%) copy usr/src/lib/{libfdisk => libzoneinfo}/amd64/Makefile (77%) copy usr/src/lib/{libfdisk/amd64 => libzoneinfo/sparcv9}/Makefile (77%) copy usr/src/lib/{libfdisk => pylibbe}/amd64/Makefile (84%) copy usr/src/lib/{libfdisk/amd64 => pylibbe/sparcv9}/Makefile (84%) diff --git a/exception_lists/packaging b/exception_lists/packaging index 3e713e43d6..ebd5918bcb 100644 --- a/exception_lists/packaging +++ b/exception_lists/packaging @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2011 Nexenta Systems, Inc. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # # @@ -228,10 +229,14 @@ usr/include/sys/kmdb.h # lib/libdhcpagent.so lib/libdhcputil.so +lib/amd64/libdhcputil.so i386 +lib/sparcv9/libdhcputil.so sparc lib/llib-ldhcpagent lib/llib-ldhcpagent.ln lib/llib-ldhcputil lib/llib-ldhcputil.ln +lib/amd64/llib-ldhcputil.ln i386 +lib/sparcv9/llib-ldhcputil.ln sparc usr/include/dhcp_hostconf.h usr/include/dhcp_impl.h usr/include/dhcp_inittab.h @@ -242,16 +247,22 @@ usr/include/dhcpagent_util.h usr/include/dhcpmsg.h usr/lib/libdhcpagent.so usr/lib/libdhcputil.so +usr/lib/amd64/libdhcputil.so i386 +usr/lib/sparcv9/libdhcputil.so sparc usr/lib/llib-ldhcpagent usr/lib/llib-ldhcpagent.ln usr/lib/llib-ldhcputil usr/lib/llib-ldhcputil.ln +usr/lib/amd64/llib-ldhcputil.ln i386 +usr/lib/sparcv9/llib-ldhcputil.ln sparc # # These files are installed in the proto area by the build of libinstzones # and libpkg # usr/lib/llib-linstzones usr/lib/llib-linstzones.ln +usr/lib/amd64/llib-linstzones.ln i386 +usr/lib/sparcv9/llib-linstzones.ln sparc usr/lib/llib-lpkg usr/lib/llib-lpkg.ln # diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index 8147256866..d81535d3f4 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -23,6 +23,7 @@ # Copyright 2011, Richard Lowe # Copyright 2011 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # # @@ -288,6 +289,7 @@ DIRS= \ /usr/lib/pool \ /usr/lib/python2.6 \ /usr/lib/python2.6/vendor-packages \ + /usr/lib/python2.6/vendor-packages/64 \ /usr/lib/python2.6/vendor-packages/solaris \ /usr/lib/python2.6/vendor-packages/zfs \ /usr/lib/python2.6/vendor-packages/beadm \ @@ -1207,6 +1209,10 @@ $(ROOT)/usr/lib/$(MACH64)/libdevinfo.so.1:= \ REALPATH=../../../lib/$(MACH64)/libdevinfo.so.1 $(ROOT)/usr/lib/$(MACH64)/libdevinfo.so:= \ REALPATH=../../../lib/$(MACH64)/libdevinfo.so.1 +$(ROOT)/usr/lib/$(MACH64)/libdhcputil.so.1:= \ + REALPATH=../../../lib/$(MACH64)/libdhcputil.so.1 +$(ROOT)/usr/lib/$(MACH64)/libdhcputil.so:= \ + REALPATH=../../../lib/$(MACH64)/libdhcputil.so.1 $(ROOT)/usr/lib/$(MACH64)/libdl.so.1:= \ REALPATH=../../../lib/$(MACH64)/libdl.so.1 $(ROOT)/usr/lib/$(MACH64)/libdl.so:= \ @@ -1411,6 +1417,8 @@ $(ROOT)/usr/lib/$(MACH64)/llib-ldevid.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-ldevid.ln $(ROOT)/usr/lib/$(MACH64)/llib-ldevinfo.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-ldevinfo.ln +$(ROOT)/usr/lib/$(MACH64)/llib-ldhcputil.ln:= \ + REALPATH=../../../lib/$(MACH64)/llib-ldhcputil.ln $(ROOT)/usr/lib/$(MACH64)/llib-ldl.ln:= \ REALPATH=../../../lib/$(MACH64)/llib-ldl.ln $(ROOT)/usr/lib/$(MACH64)/llib-ldoor.ln:= \ @@ -1789,6 +1797,8 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/libdevid.so.1 \ /usr/lib/$(MACH64)/libdevinfo.so \ /usr/lib/$(MACH64)/libdevinfo.so.1 \ + /usr/lib/$(MACH64)/libdhcputil.so \ + /usr/lib/$(MACH64)/libdhcputil.so.1 \ /usr/lib/$(MACH64)/libdl.so \ /usr/lib/$(MACH64)/libdl.so.1 \ /usr/lib/$(MACH64)/libdlpi.so \ @@ -1889,6 +1899,7 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/llib-ldevice.ln \ /usr/lib/$(MACH64)/llib-ldevid.ln \ /usr/lib/$(MACH64)/llib-ldevinfo.ln \ + /usr/lib/$(MACH64)/llib-ldhcputil.ln \ /usr/lib/$(MACH64)/llib-ldl.ln \ /usr/lib/$(MACH64)/llib-ldoor.ln \ /usr/lib/$(MACH64)/llib-lefi.ln \ diff --git a/usr/src/lib/libbe/Makefile b/usr/src/lib/libbe/Makefile index 9dd98e3b90..0e68a32954 100644 --- a/usr/src/lib/libbe/Makefile +++ b/usr/src/lib/libbe/Makefile @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.lib @@ -31,6 +32,7 @@ HDRS= libbe.h \ HDRDIR= common SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean diff --git a/usr/src/lib/libbe/Makefile.com b/usr/src/lib/libbe/Makefile.com index b8349c1d1a..013d2bdc37 100644 --- a/usr/src/lib/libbe/Makefile.com +++ b/usr/src/lib/libbe/Makefile.com @@ -23,6 +23,7 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # Copyright 2011 Nexenta Systems, Inc. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # @@ -63,6 +64,4 @@ all: $(LIBS) $(LIBRARY) lint: lintcheck -install: $(ROOTLIBS) - include ../../Makefile.targ diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libbe/amd64/Makefile similarity index 78% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libbe/amd64/Makefile index 7aad038610..5d3fa158a8 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libbe/amd64/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,10 +20,9 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2011 OmniTI Computer Consulting, Inc. All rights reserved. # Use is subject to license terms. # -# include ../Makefile.com include ../../Makefile.lib.64 diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libbe/sparcv9/Makefile similarity index 78% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libbe/sparcv9/Makefile index 7aad038610..5d3fa158a8 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libbe/sparcv9/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,10 +20,9 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2011 OmniTI Computer Consulting, Inc. All rights reserved. # Use is subject to license terms. # -# include ../Makefile.com include ../../Makefile.lib.64 diff --git a/usr/src/lib/libdhcputil/Makefile b/usr/src/lib/libdhcputil/Makefile index f5abdf9627..d0ebae7172 100644 --- a/usr/src/lib/libdhcputil/Makefile +++ b/usr/src/lib/libdhcputil/Makefile @@ -20,10 +20,9 @@ # # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -34,6 +33,7 @@ LOCHDRDIR = common COMHDRDIR = $(SRC)/common/net/dhcp HDRDIR = $(LOCHDRDIR) SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) POFILE = libdhcputil.po MSGFILES = common/dhcpmsg.c XGETFLAGS = -a -x libdhcputil.xcl diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libdhcputil/amd64/Makefile similarity index 77% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libdhcputil/amd64/Makefile index 7aad038610..df2bad0003 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libdhcputil/amd64/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,9 +20,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libdhcputil/sparcv9/Makefile similarity index 77% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libdhcputil/sparcv9/Makefile index 7aad038610..df2bad0003 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libdhcputil/sparcv9/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,9 +20,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libfdisk/amd64/Makefile index 7aad038610..036c13779e 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libfdisk/amd64/Makefile @@ -22,7 +22,6 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# include ../Makefile.com include ../../Makefile.lib.64 diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libfdisk/sparcv9/Makefile similarity index 90% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libfdisk/sparcv9/Makefile index 7aad038610..31e1868b2d 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libfdisk/sparcv9/Makefile @@ -19,9 +19,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com diff --git a/usr/src/lib/libfstyp/Makefile b/usr/src/lib/libfstyp/Makefile index b9cf46e1eb..1878db324c 100644 --- a/usr/src/lib/libfstyp/Makefile +++ b/usr/src/lib/libfstyp/Makefile @@ -21,8 +21,7 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.lib @@ -32,6 +31,7 @@ HDRS= libfstyp.h libfstyp_module.h HDRDIR= common SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all install := TARGET= install diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libfstyp/amd64/Makefile similarity index 84% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libfstyp/amd64/Makefile index 7aad038610..3df0cea286 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libfstyp/amd64/Makefile @@ -19,12 +19,10 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libfstyp/sparcv9/Makefile similarity index 84% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libfstyp/sparcv9/Makefile index 7aad038610..1f55b03d7c 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libfstyp/sparcv9/Makefile @@ -18,13 +18,10 @@ # # CDDL HEADER END # -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/lib/libinstzones/Makefile b/usr/src/lib/libinstzones/Makefile index 12deb8b6c8..85d3363ba1 100644 --- a/usr/src/lib/libinstzones/Makefile +++ b/usr/src/lib/libinstzones/Makefile @@ -20,6 +20,7 @@ # # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # Use is subject to license terms. # @@ -32,6 +33,7 @@ HDRDIR = hdrs SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all install := TARGET = install diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libinstzones/amd64/Makefile similarity index 78% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libinstzones/amd64/Makefile index 7aad038610..5d3fa158a8 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libinstzones/amd64/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,10 +20,9 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2011 OmniTI Computer Consulting, Inc. All rights reserved. # Use is subject to license terms. # -# include ../Makefile.com include ../../Makefile.lib.64 diff --git a/usr/src/lib/libinstzones/common/zones_locks.c b/usr/src/lib/libinstzones/common/zones_locks.c index 6352e496bc..5cc1d3bfeb 100644 --- a/usr/src/lib/libinstzones/common/zones_locks.c +++ b/usr/src/lib/libinstzones/common/zones_locks.c @@ -24,7 +24,9 @@ * Use is subject to license terms. */ - +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * Module: zones_locks.c @@ -208,9 +210,9 @@ _z_acquire_lock(char **r_lockKey, char *a_zoneName, char *a_lockObject, if (a_pid > 0) { (void) _z_add_arg(args, "-p"); /* lock valid process i.d. */ - (void) _z_add_arg(args, "%ld", getpid()); + (void) _z_add_arg(args, "%lld", (long long)getpid()); (void) _z_add_arg(args, "-z"); /* lock valid zone i.d. */ - (void) _z_add_arg(args, "%ld", getzoneid()); + (void) _z_add_arg(args, "%lld", (long long)getzoneid()); } /* execute command */ diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libinstzones/sparcv9/Makefile similarity index 78% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libinstzones/sparcv9/Makefile index 7aad038610..5d3fa158a8 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libinstzones/sparcv9/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,10 +20,9 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2011 OmniTI Computer Consulting, Inc. All rights reserved. # Use is subject to license terms. # -# include ../Makefile.com include ../../Makefile.lib.64 diff --git a/usr/src/lib/libwanboot/Makefile b/usr/src/lib/libwanboot/Makefile index 45cf48d3d2..580716ccc2 100644 --- a/usr/src/lib/libwanboot/Makefile +++ b/usr/src/lib/libwanboot/Makefile @@ -21,13 +21,13 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include $(SRC)/lib/Makefile.lib SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) HDRS = boot_http.h \ bootinfo.h \ diff --git a/usr/src/lib/libwanboot/Makefile.com b/usr/src/lib/libwanboot/Makefile.com index 54a5b54119..ed69ec0b8a 100644 --- a/usr/src/lib/libwanboot/Makefile.com +++ b/usr/src/lib/libwanboot/Makefile.com @@ -21,6 +21,8 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2012 by Delphix. All rights reserved. +# LIBRARY = libwanboot.a VERS = .1 @@ -74,7 +76,8 @@ SRCDIR = $(LOC_DIR) $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) # OpenSSL requires us to turn this off -LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN +LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN +LINTFLAGS64 += -erroff=E_BAD_PTR_CAST_ALIGN CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(LOC_DIR) -I$(COM_DIR) -I$(DHCP_DIR) diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libwanboot/amd64/Makefile similarity index 77% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libwanboot/amd64/Makefile index 7aad038610..df2bad0003 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libwanboot/amd64/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,9 +20,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libwanboot/sparcv9/Makefile similarity index 77% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libwanboot/sparcv9/Makefile index 7aad038610..df2bad0003 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libwanboot/sparcv9/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,9 +20,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com diff --git a/usr/src/lib/libwanbootutil/Makefile b/usr/src/lib/libwanbootutil/Makefile index 060530d0a3..235b47827d 100644 --- a/usr/src/lib/libwanbootutil/Makefile +++ b/usr/src/lib/libwanbootutil/Makefile @@ -21,13 +21,13 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.lib SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) # Library header. HDRS = wanbootutil.h diff --git a/usr/src/lib/libwanbootutil/Makefile.com b/usr/src/lib/libwanbootutil/Makefile.com index 29434247e6..4bc03836e1 100644 --- a/usr/src/lib/libwanbootutil/Makefile.com +++ b/usr/src/lib/libwanbootutil/Makefile.com @@ -22,6 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2012 by Delphix. All rights reserved. +# LIBRARY = libwanbootutil.a VERS = .1 @@ -60,7 +62,8 @@ $(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) # Library includes sources created via rpcgen. And rpcgen unfortunately # created unused function variables. -LINTFLAGS += -erroff=E_FUNC_VAR_UNUSED +LINTFLAGS += -erroff=E_FUNC_VAR_UNUSED +LINTFLAGS64 += -erroff=E_FUNC_VAR_UNUSED CPPFLAGS += -I$(CRYPTO_DIR) diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libwanbootutil/amd64/Makefile similarity index 77% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libwanbootutil/amd64/Makefile index 7aad038610..df2bad0003 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libwanbootutil/amd64/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,9 +20,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libwanbootutil/sparcv9/Makefile similarity index 77% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libwanbootutil/sparcv9/Makefile index 7aad038610..df2bad0003 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libwanbootutil/sparcv9/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,9 +20,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com diff --git a/usr/src/lib/libzoneinfo/Makefile b/usr/src/lib/libzoneinfo/Makefile index 291a026f98..6f3f633d35 100644 --- a/usr/src/lib/libzoneinfo/Makefile +++ b/usr/src/lib/libzoneinfo/Makefile @@ -21,8 +21,7 @@ # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.lib @@ -30,6 +29,7 @@ include ../Makefile.lib HDRS= libzoneinfo.h HDRDIR= common SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libzoneinfo/amd64/Makefile similarity index 77% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libzoneinfo/amd64/Makefile index 7aad038610..da4f984f67 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libzoneinfo/amd64/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -18,10 +19,7 @@ # # CDDL HEADER END # -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/libzoneinfo/sparcv9/Makefile similarity index 77% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/libzoneinfo/sparcv9/Makefile index 7aad038610..df2bad0003 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/libzoneinfo/sparcv9/Makefile @@ -2,8 +2,9 @@ # 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. +# Common Development and Distribution License, Version 1.0 only +# (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. @@ -19,9 +20,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com diff --git a/usr/src/lib/pylibbe/Makefile b/usr/src/lib/pylibbe/Makefile index 64e8106641..ee2a576b8a 100644 --- a/usr/src/lib/pylibbe/Makefile +++ b/usr/src/lib/pylibbe/Makefile @@ -21,11 +21,13 @@ # # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.lib SUBDIRS= $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) XGETTEXT= $(GNUXGETTEXT) XGETFLAGS= $(GNUXGETFLAGS) diff --git a/usr/src/lib/pylibbe/Makefile.com b/usr/src/lib/pylibbe/Makefile.com index 6fa379ddcc..aa26dec043 100644 --- a/usr/src/lib/pylibbe/Makefile.com +++ b/usr/src/lib/pylibbe/Makefile.com @@ -21,6 +21,7 @@ # # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # LIBRARY = libbe_py.a @@ -33,6 +34,7 @@ PYTHON = $(PYTHON_26) LIBLINKS = SRCDIR = ../common ROOTLIBDIR= $(ROOT)/usr/lib/python2.6/vendor-packages +ROOTLIBDIR64= $(ROOT)/usr/lib/python2.6/vendor-packages/64 PYOBJS= $(PYSRCS:%.py=$(SRCDIR)/%.pyc) PYFILES= $(PYSRCS) $(PYSRCS:%.py=%.pyc) ROOTPYBEFILES= $(PYFILES:%=$(ROOTLIBDIR)/%) diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/pylibbe/amd64/Makefile similarity index 84% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/pylibbe/amd64/Makefile index 7aad038610..32e9e54ca4 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/pylibbe/amd64/Makefile @@ -18,13 +18,12 @@ # # CDDL HEADER END # + # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) diff --git a/usr/src/lib/pylibbe/common/libbe_py.c b/usr/src/lib/pylibbe/common/libbe_py.c index b4f6ca0e52..f07f32b59a 100644 --- a/usr/src/lib/pylibbe/common/libbe_py.c +++ b/usr/src/lib/pylibbe/common/libbe_py.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. */ #include @@ -168,7 +169,7 @@ beCopy(PyObject *self, PyObject *args) char *trgtSnapName = NULL; char *rpool = NULL; char *beDescription = NULL; - int pos = 0; + Py_ssize_t pos = 0; int ret = BE_PY_SUCCESS; nvlist_t *beAttrs = NULL; nvlist_t *beProps = NULL; diff --git a/usr/src/lib/libfdisk/amd64/Makefile b/usr/src/lib/pylibbe/sparcv9/Makefile similarity index 84% copy from usr/src/lib/libfdisk/amd64/Makefile copy to usr/src/lib/pylibbe/sparcv9/Makefile index 7aad038610..32e9e54ca4 100644 --- a/usr/src/lib/libfdisk/amd64/Makefile +++ b/usr/src/lib/pylibbe/sparcv9/Makefile @@ -18,13 +18,12 @@ # # CDDL HEADER END # + # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # include ../Makefile.com include ../../Makefile.lib.64 -install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) +install: all $(ROOTLIBS64) diff --git a/usr/src/pkg/manifests/developer-library-lint.mf b/usr/src/pkg/manifests/developer-library-lint.mf index b9cd8cd7b3..2297b35983 100644 --- a/usr/src/pkg/manifests/developer-library-lint.mf +++ b/usr/src/pkg/manifests/developer-library-lint.mf @@ -22,6 +22,7 @@ # # Copyright 2011 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # set name=pkg.fmri value=pkg:/developer/library/lint@$(PKGVERS) @@ -201,6 +202,7 @@ file path=usr/lib/$(ARCH64)/llib-lcommputil.ln file path=usr/lib/$(ARCH64)/llib-lcrypt.ln file path=usr/lib/$(ARCH64)/llib-lexacct.ln file path=usr/lib/$(ARCH64)/llib-lform.ln +file path=usr/lib/$(ARCH64)/llib-lfstyp.ln file path=usr/lib/$(ARCH64)/llib-lgss.ln file path=usr/lib/$(ARCH64)/llib-lhotplug.ln file path=usr/lib/$(ARCH64)/llib-lidmap.ln @@ -229,6 +231,7 @@ file path=usr/lib/$(ARCH64)/llib-lsldap.ln file path=usr/lib/$(ARCH64)/llib-lsmbios.ln $(sparc_ONLY)file path=usr/lib/$(ARCH64)/llib-lv12n.ln file path=usr/lib/$(ARCH64)/llib-lvolmgt.ln +file path=usr/lib/$(ARCH64)/llib-lzoneinfo.ln file path=usr/lib/$(ARCH64)/values-Xa.o file path=usr/lib/$(ARCH64)/values-Xc.o file path=usr/lib/$(ARCH64)/values-Xs.o diff --git a/usr/src/pkg/manifests/install-beadm.mf b/usr/src/pkg/manifests/install-beadm.mf index c31c2abd99..2a94f501ca 100644 --- a/usr/src/pkg/manifests/install-beadm.mf +++ b/usr/src/pkg/manifests/install-beadm.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2010 Nexenta Systems, Inc. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # set name=pkg.fmri value=pkg:/install/beadm@$(PKGVERS) @@ -32,8 +33,10 @@ dir path=sbin group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib +dir path=usr/lib/$(ARCH64) dir path=usr/lib/python2.6 dir path=usr/lib/python2.6/vendor-packages +dir path=usr/lib/python2.6/vendor-packages/64 dir path=usr/lib/python2.6/vendor-packages/beadm dir path=usr/sbin dir path=usr/share @@ -41,12 +44,16 @@ dir path=usr/share/man dir path=usr/share/man/man1m file path=sbin/beadm mode=0555 file path=usr/include/libbe.h +file path=usr/lib/$(ARCH64)/libbe.so.1 +file path=usr/lib/$(ARCH64)/llib-lbe.ln file path=usr/lib/libbe.so.1 file path=usr/lib/llib-lbe file path=usr/lib/llib-lbe.ln +file path=usr/lib/python2.6/vendor-packages/64/libbe_py.so file path=usr/lib/python2.6/vendor-packages/libbe_py.so file path=usr/share/man/man1m/beadm.1m license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +link path=usr/lib/$(ARCH64)/libbe.so target=./libbe.so.1 link path=usr/lib/libbe.so target=./libbe.so.1 link path=usr/sbin/beadm target=../../sbin/beadm diff --git a/usr/src/pkg/manifests/package-svr4.mf b/usr/src/pkg/manifests/package-svr4.mf index 7475f54890..5476930ec4 100644 --- a/usr/src/pkg/manifests/package-svr4.mf +++ b/usr/src/pkg/manifests/package-svr4.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # set name=pkg.fmri value=pkg:/package/svr4@$(PKGVERS) @@ -36,6 +37,7 @@ dir path=lib/svc/manifest/system group=sys dir path=usr group=sys dir path=usr/bin dir path=usr/lib +dir path=usr/lib/$(ARCH64) dir path=usr/sadm dir path=usr/sadm/install dir path=usr/sadm/install/bin @@ -62,6 +64,7 @@ file path=usr/bin/pkgmk mode=0555 file path=usr/bin/pkgparam group=sys mode=0555 file path=usr/bin/pkgproto mode=0555 file path=usr/bin/pkgtrans mode=0555 +file path=usr/lib/$(ARCH64)/libinstzones.so.1 file path=usr/lib/libinstzones.so.1 file path=usr/lib/libpkg.so.1 file path=usr/sadm/install/bin/pkginstall group=sys mode=0555 diff --git a/usr/src/pkg/manifests/system-boot-wanboot-internal.mf b/usr/src/pkg/manifests/system-boot-wanboot-internal.mf index 9d7ec63389..d9c6e60174 100644 --- a/usr/src/pkg/manifests/system-boot-wanboot-internal.mf +++ b/usr/src/pkg/manifests/system-boot-wanboot-internal.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # set name=pkg.fmri value=pkg:/system/boot/wanboot/internal@$(PKGVERS) @@ -40,6 +41,8 @@ file path=usr/include/p12aux.h file path=usr/include/p12err.h file path=usr/include/parseURL.h file path=usr/include/wanboot_conf.h +file path=usr/lib/$(ARCH64)/llib-lwanboot.ln +file path=usr/lib/$(ARCH64)/llib-lwanbootutil.ln file path=usr/lib/llib-lwanboot file path=usr/lib/llib-lwanboot.ln file path=usr/lib/llib-lwanbootutil @@ -47,5 +50,7 @@ file path=usr/lib/llib-lwanbootutil.ln legacy pkg=SUNWwbint desc="Solaris WAN boot internal" name="WAN boot internal" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +link path=usr/lib/$(ARCH64)/libwanboot.so target=./libwanboot.so.1 +link path=usr/lib/$(ARCH64)/libwanbootutil.so target=./libwanbootutil.so.1 link path=usr/lib/libwanboot.so target=./libwanboot.so.1 link path=usr/lib/libwanbootutil.so target=./libwanbootutil.so.1 diff --git a/usr/src/pkg/manifests/system-boot-wanboot.mf b/usr/src/pkg/manifests/system-boot-wanboot.mf index 27cfa8c217..ee8f0be815 100644 --- a/usr/src/pkg/manifests/system-boot-wanboot.mf +++ b/usr/src/pkg/manifests/system-boot-wanboot.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # set name=pkg.fmri value=pkg:/system/boot/wanboot@$(PKGVERS) @@ -35,6 +36,8 @@ dir path=usr/lib/inet dir path=usr/lib/inet/wanboot dir path=usr/sbin dir path=usr/share/man/man1m +file path=usr/lib/$(ARCH64)/libwanboot.so.1 +file path=usr/lib/$(ARCH64)/libwanbootutil.so.1 file path=usr/lib/inet/wanboot/bootlog-cgi mode=0555 file path=usr/lib/inet/wanboot/encr mode=0555 file path=usr/lib/inet/wanboot/hmac mode=0555 diff --git a/usr/src/pkg/manifests/system-library-install-libinstzones.mf b/usr/src/pkg/manifests/system-library-install-libinstzones.mf index 6051fb484c..be1a429986 100644 --- a/usr/src/pkg/manifests/system-library-install-libinstzones.mf +++ b/usr/src/pkg/manifests/system-library-install-libinstzones.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/install/libinstzones@$(PKGVERS) @@ -32,9 +33,11 @@ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/include dir path=usr/lib +dir path=usr/lib/$(ARCH64) file path=usr/include/instzones_api.h legacy pkg=SUNWinstallint desc="Solaris Install internal files" \ name="Solaris Install Internal Files" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +link path=usr/lib/$(ARCH64)/libinstzones.so target=./libinstzones.so.1 link path=usr/lib/libinstzones.so target=./libinstzones.so.1 diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf index c372fa01a8..90888c3979 100644 --- a/usr/src/pkg/manifests/system-library.mf +++ b/usr/src/pkg/manifests/system-library.mf @@ -22,6 +22,7 @@ # # Copyright 2011 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # @@ -179,6 +180,7 @@ file path=lib/$(ARCH64)/libcurses.so.1 file path=lib/$(ARCH64)/libdevice.so.1 file path=lib/$(ARCH64)/libdevid.so.1 file path=lib/$(ARCH64)/libdevinfo.so.1 +file path=lib/$(ARCH64)/libdhcputil.so.1 file path=lib/$(ARCH64)/libdl.so.1 file path=lib/$(ARCH64)/libdladm.so.1 file path=lib/$(ARCH64)/libdlpi.so.1 @@ -326,6 +328,7 @@ file path=usr/lib/$(ARCH64)/libdisasm.so.1 file path=usr/lib/$(ARCH64)/libdll.so.1 file path=usr/lib/$(ARCH64)/libexacct.so.1 file path=usr/lib/$(ARCH64)/libform.so.1 +file path=usr/lib/$(ARCH64)/libfstyp.so.1 file path=usr/lib/$(ARCH64)/libhotplug.so.1 file path=usr/lib/$(ARCH64)/libidmap.so.1 file path=usr/lib/$(ARCH64)/libike.so.1 @@ -359,6 +362,7 @@ file path=usr/lib/$(ARCH64)/libsum.so.1 $(sparc_ONLY)file path=usr/lib/$(ARCH64)/libv12n.so.1 file path=usr/lib/$(ARCH64)/libvolmgt.so.1 file path=usr/lib/$(ARCH64)/liby.so.1 +file path=usr/lib/$(ARCH64)/libzoneinfo.so.1 file path=usr/lib/$(ARCH64)/nss_ad.so.1 file path=usr/lib/$(ARCH64)/nss_ldap.so.1 file path=usr/lib/$(ARCH64)/passwdutil.so.1 @@ -787,6 +791,8 @@ link path=usr/lib/$(ARCH64)/libdevinfo.so \ target=../../../lib/$(ARCH64)/libdevinfo.so.1 link path=usr/lib/$(ARCH64)/libdevinfo.so.1 \ target=../../../lib/$(ARCH64)/libdevinfo.so.1 +link path=usr/lib/$(ARCH64)/libdhcputil.so.1 \ + target=../../../lib/$(ARCH64)/libdhcputil.so.1 link path=usr/lib/$(ARCH64)/libdisasm.so target=libdisasm.so.1 link path=usr/lib/$(ARCH64)/libdl.so target=../../../lib/$(ARCH64)/libdl.so.1 link path=usr/lib/$(ARCH64)/libdl.so.1 \ @@ -813,6 +819,7 @@ $(i386_ONLY)link path=usr/lib/$(ARCH64)/libfdisk.so \ $(i386_ONLY)link path=usr/lib/$(ARCH64)/libfdisk.so.1 \ target=../../../lib/$(ARCH64)/libfdisk.so.1 link path=usr/lib/$(ARCH64)/libform.so target=libform.so.1 +link path=usr/lib/$(ARCH64)/libfstyp.so target=./libfstyp.so.1 link path=usr/lib/$(ARCH64)/libgen.so \ target=../../../lib/$(ARCH64)/libgen.so.1 link path=usr/lib/$(ARCH64)/libgen.so.1 \ @@ -982,6 +989,7 @@ link path=usr/lib/$(ARCH64)/libxnet.so \ link path=usr/lib/$(ARCH64)/libxnet.so.1 \ target=../../../lib/$(ARCH64)/libxnet.so.1 link path=usr/lib/$(ARCH64)/liby.so target=liby.so.1 +link path=usr/lib/$(ARCH64)/libzoneinfo.so target=./libzoneinfo.so.1 link path=usr/lib/$(ARCH64)/nss_compat.so.1 \ target=../../../lib/$(ARCH64)/nss_compat.so.1 link path=usr/lib/$(ARCH64)/nss_dns.so.1 \ -- 2.11.4.GIT