From ebbab6bbae913efeadfa3c6a1b082664a125f95b Mon Sep 17 00:00:00 2001 From: Dan Price Date: Sat, 12 Jun 2010 23:20:18 -0700 Subject: 6932709 libc mountpoints shouldn't be tagged with preserve= 6948967 opensolaris.zone= persists in ON manifests, should be expunged 6948970 eval in pkg/Makefile masks pkgmogrify failures 6949340 Fix various zones related packaging oddities 6951274 most variant.opensolaris.zone and reboot-needed attributes could be added by rules 6954463 legacy, renamed SUNWiscsitgt and SUNWmms need to be obsoleted properly 6954897 README.pkg should be more helpful describing need for on-extra --- usr/src/pkg/manifests/system-data-keyboard-keytables.mf | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'usr/src/pkg/manifests/system-data-keyboard-keytables.mf') diff --git a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf b/usr/src/pkg/manifests/system-data-keyboard-keytables.mf index 17b5e1a08c..cf86e8fdd6 100644 --- a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf +++ b/usr/src/pkg/manifests/system-data-keyboard-keytables.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/data/keyboard/keytables@$(PKGVERS) set name=pkg.description \ value="Configuration tables that specify keyboard attributes such as localized meanings for individual keys" set name=pkg.summary value="Keyboard configuration tables" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/share group=sys @@ -125,8 +124,8 @@ $(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us $(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us101a_pc $(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us_5 $(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us_hobo -file path=usr/share/lib/keytables/type_6/arabia file path=usr/share/lib/keytables/type_6/albania +file path=usr/share/lib/keytables/type_6/arabia file path=usr/share/lib/keytables/type_6/belarus file path=usr/share/lib/keytables/type_6/belgium file path=usr/share/lib/keytables/type_6/brazil -- cgit v1.2.3