From 603d5c74c8a0125c27b230ca3fef92bb6a72f8ef Mon Sep 17 00:00:00 2001 From: Richard Lowe Date: Thu, 5 Mar 2015 16:30:12 -0500 Subject: [PATCH] 5685 remove storage meta-packages from illumos Reviewed by: Josef 'Jeff' Sipek Reviewed by: Alexander Pyhalov Approved by: Dan McDonald --- usr/src/pkg/manifests/storage-nas.mf | 4 ++-- usr/src/pkg/manifests/storage-server.mf | 4 ++-- usr/src/pkg/manifests/storage-storage-nas.mf | 10 ++-------- .../manifests/{storage-nas.mf => storage-storage-server.mf} | 9 ++++----- 4 files changed, 10 insertions(+), 17 deletions(-) copy usr/src/pkg/manifests/{storage-nas.mf => storage-storage-server.mf} (83%) diff --git a/usr/src/pkg/manifests/storage-nas.mf b/usr/src/pkg/manifests/storage-nas.mf index 17b390f8df..f017ac6ddd 100644 --- a/usr/src/pkg/manifests/storage-nas.mf +++ b/usr/src/pkg/manifests/storage-nas.mf @@ -24,6 +24,6 @@ # set name=pkg.fmri value=pkg:/storage-nas@0.1,5.11-0.133 -set name=pkg.renamed value=true +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true set name=variant.arch value=$(ARCH) -depend fmri=storage/storage-nas type=require diff --git a/usr/src/pkg/manifests/storage-server.mf b/usr/src/pkg/manifests/storage-server.mf index d9acbf3cef..2e718b8b87 100644 --- a/usr/src/pkg/manifests/storage-server.mf +++ b/usr/src/pkg/manifests/storage-server.mf @@ -24,6 +24,6 @@ # set name=pkg.fmri value=pkg:/storage-server@0.1,5.11-0.133 -set name=pkg.renamed value=true +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true set name=variant.arch value=$(ARCH) -depend fmri=storage/storage-server type=require diff --git a/usr/src/pkg/manifests/storage-storage-nas.mf b/usr/src/pkg/manifests/storage-storage-nas.mf index 3e5a17e931..588c92ba80 100644 --- a/usr/src/pkg/manifests/storage-storage-nas.mf +++ b/usr/src/pkg/manifests/storage-storage-nas.mf @@ -25,12 +25,6 @@ set name=pkg.fmri \ value=pkg:/storage/storage-nas@0.1,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) -set name=pkg.summary value="Network Attached Storage cluster" -set name=info.classification \ - value=org.opensolaris.category.2008:Drivers/Storage +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true set name=variant.arch value=$(ARCH) -depend fmri=network/iscsi/initiator type=require -depend fmri=service/file-system/nfs type=require -depend fmri=service/file-system/smb type=require -depend fmri=service/storage/ndmp type=require -depend fmri=service/storage/virus-scan type=require diff --git a/usr/src/pkg/manifests/storage-nas.mf b/usr/src/pkg/manifests/storage-storage-server.mf similarity index 83% copy from usr/src/pkg/manifests/storage-nas.mf copy to usr/src/pkg/manifests/storage-storage-server.mf index 17b390f8df..3381ae7751 100644 --- a/usr/src/pkg/manifests/storage-nas.mf +++ b/usr/src/pkg/manifests/storage-storage-server.mf @@ -19,11 +19,10 @@ # CDDL HEADER END # -# # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# -set name=pkg.fmri value=pkg:/storage-nas@0.1,5.11-0.133 -set name=pkg.renamed value=true +set name=pkg.fmri \ + value=pkg:/storage/storage-server@0.1,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true set name=variant.arch value=$(ARCH) -depend fmri=storage/storage-nas type=require -- 2.11.4.GIT