packages/upgrade-X
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
Thu, 18 Feb 2010 16:03:08 -0800
changeset 907 3c35d611cdaa
parent 905 d2b59d5a79ed
child 919 425233ae7236
permissions -rw-r--r--
6927784 Remove SCCS ident tags from X gate
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
     1
#!/bin/ksh93
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     2
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     3
###
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 577
diff changeset
     4
# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
731
d06e4a0dca56 6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]: X consolidation portion
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 725
diff changeset
     5
# Use is subject to license terms.
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     6
#
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     7
# Permission is hereby granted, free of charge, to any person obtaining a
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     8
# copy of this software and associated documentation files (the
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
     9
# "Software"), to deal in the Software without restriction, including
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    10
# without limitation the rights to use, copy, modify, merge, publish,
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    11
# distribute, and/or sell copies of the Software, and to permit persons
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    12
# to whom the Software is furnished to do so, provided that the above
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    13
# copyright notice(s) and this permission notice appear in all copies of
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    14
# the Software and that both the above copyright notice(s) and this
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    15
# permission notice appear in supporting documentation.
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    16
#
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    17
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    18
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    19
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    20
# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    21
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    22
# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    23
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    24
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    25
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    26
#
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    27
# Except as contained in this notice, the name of a copyright holder
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    28
# shall not be used in advertising or otherwise to promote the sale, use
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    29
# or other dealings in this Software without prior written authorization
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    30
# of the copyright holder.
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    31
#
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    32
###########################################################################
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    33
#
763
16e275b50576 6868816 move xscreensaver from X consolidation to Desktop consolidation
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 744
diff changeset
    34
#
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    35
# Description: This script upgrades X software on a Solaris Nevada
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    36
#	       system. It should be run as root from a X package area.
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    37
#
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    38
# Arguments:	-a 	Ignored (was: install ALL packages, which is now the
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    39
#			default behaviour.)
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    40
#		-q	Be quiet and don't report packages that aren't 
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    41
#			installed.
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
    42
#		-r	Remove packages only, and don't add new ones.
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
    43
#			(Useful for removing newer build before going back to
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
    44
#			 an older one with fewer/different packages)
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    45
#		-R path	Install under alternate root path (passed to pkgadd)
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    46
#
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    47
###
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    48
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    49
# Update this when X package version number changes
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    50
XVERS="6.9.0.5.11"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    51
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    52
# Set up error reporting function
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    53
progname="$0"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    54
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    55
function fatal_error
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    56
{
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    57
    print -u2 "${progname}: ERROR: $*"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    58
    exit 1
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
    59
}
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
    60
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    61
####
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    62
#
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    63
#   Process command line options
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    64
#
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    65
####
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    66
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    67
QUIET=0
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    68
ALTROOT=""
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
    69
REMOVE_ONLY=0
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
    70
ACTION='upgrade'
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    71
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
    72
while getopts aqrR: flag ; do
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    73
    case $flag in
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    74
      a)	;;
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    75
      q)	QUIET=1 ;;
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
    76
      r)	REMOVE_ONLY=1 ; ACTION='removal' ;;
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    77
      R)	ALTROOT="${OPTARG}" ;;
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    78
      ?)	printf "Usage: %s: [-q]\n"  $0
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    79
		exit 1 ;;
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    80
    esac
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    81
done
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    82
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    83
ADDITIONAL_PKG_FLAGS=""
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    84
if [[ ! -z "${ALTROOT}" ]] ; then
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    85
    ADDITIONAL_PKG_FLAGS+="-R ${ALTROOT}"
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    86
fi
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    87
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    88
# Make sure directories that are needed, but not included in pkgmaps
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    89
# are created in alternate roots.
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    90
# Arguments: directory_path permissions owner:group
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    91
function altroot_dir_check
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    92
{
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    93
    if [[ ( ! -z "${ALTROOT}" ) && ( ! -d "${ALTROOT}$1" ) ]] ; then
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    94
	print "Creating ${ALTROOT}$1"
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    95
	mkdir -p "${ALTROOT}$1"
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    96
	chown $3 "${ALTROOT}$1"
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    97
	chmod $2 "${ALTROOT}$1"
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    98
    fi
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
    99
}
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   100
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   101
altroot_dir_check / root:root 0755
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   102
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   103
###
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   104
#  
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   105
#   First check for a correct upgrade environment. 
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   106
#
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   107
###
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   108
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   109
MACH="$(uname -p)"
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   110
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   111
DATE="$(LANG=C date '+%d%b%y-%H:%M:%S')"
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   112
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   113
USER="$(/bin/id | grep root | wc -l)"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   114
if [[ $USER -eq 0 ]] ; then
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   115
    fatal_error "You must be root to run this script"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   116
fi
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   117
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   118
X_BASE_PKG=SUNWxwplt/pkginfo
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   119
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   120
if [[ -f ${X_BASE_PKG} ]]; then
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   121
    X_ARCH="$(awk -F= '$1 == "ARCH" {print $2}' ${X_BASE_PKG})"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   122
    X_VERSION="$(awk -F= '$1 == "SUNW_PRODVERS" {print $2}' ${X_BASE_PKG})"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   123
    X_BUILD="$(nawk '/^VERSION=/ {FS="[,.]+" ; print $(NF-4)/100}' ${X_BASE_PKG})"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   124
else
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   125
v    fatal_error "Cannot find base X package -- SUNWxwplt\n" \ 
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   126
	"You need to run this script from the X ${XVERS} package area"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   127
fi
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   128
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   129
if [[ "${X_ARCH}" != "${MACH}" ]]; then
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   130
    fatal_error "SUNWxwplt package has wrong architecture (${X_ARCH}).\n" \
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   131
	"It should have a ${MACH} architecture string."
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   132
fi
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   133
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   134
if [[ -z "${X_VERSION}" ]]; then
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   135
    fatal_error "Cannot find SUNWxwplt package version.\n" \
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   136
	"It should have a X ${XVERS} version string."
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   137
else
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   138
    if [[ "${X_VERSION}" != "${XVERS}" ]]; then
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   139
	fatal_error "SUNWxwplt package has wrong version (${X_VERSION}).\n" \
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   140
	    "It should have a X ${XVERS} version string."
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   141
    fi
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   142
fi
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   143
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   144
if [[ ( -z "${ALTROOT}" ) && ( "$(uname -r)" != "5.11" ) ]] ; then
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   145
    fatal_error "Incorrect Solaris version number.\n" \
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   146
	"X ${XVERS} is only supported on Solaris Nevada"
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   147
fi
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   148
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   149
if [[ -f /usr/bin/pkg ]] ; then
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   150
    if /usr/bin/pkg ${ADDITIONAL_PKG_FLAGS} list SUNWxwplt > /dev/null 2>&1 ; then
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   151
	fatal_error "Cannot run on system with IPS installed X packages."
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   152
    fi
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   153
fi
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   154
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   155
PKG_UPGRADE_LOG="${ALTROOT}/var/tmp/SunSoft_X${XVERS}_B${X_BUILD}_upgrade.log.${DATE}"
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   156
altroot_dir_check /var 0755 root:sys
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   157
altroot_dir_check /var/tmp 1777 root:sys
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   158
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   159
####
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   160
#
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   161
#   List of packages to upgrade
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   162
#
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   163
####
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   164
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   165
# List of official (deliverable) X Consolidation packages for all platforms
523
0bd5357585fa 6743280 Convert to X.Org mkfontdir and finish porting libfont changes to libXfont
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 513
diff changeset
   166
# and all supported builds/releases 
0bd5357585fa 6743280 Convert to X.Org mkfontdir and finish porting libfont changes to libXfont
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 513
diff changeset
   167
# Packages needed to be able to run mkfontdir come first, since later packages
0bd5357585fa 6743280 Convert to X.Org mkfontdir and finish porting libfont changes to libXfont
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 513
diff changeset
   168
# will need them - those are SUNWfreetype2 & SUNWxwfsw.   The rest are listed
0bd5357585fa 6743280 Convert to X.Org mkfontdir and finish porting libfont changes to libXfont
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 513
diff changeset
   169
# in alphabetical order.
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   170
pkg_list="
523
0bd5357585fa 6743280 Convert to X.Org mkfontdir and finish porting libfont changes to libXfont
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 513
diff changeset
   171
	SUNWfreetype2
0bd5357585fa 6743280 Convert to X.Org mkfontdir and finish porting libfont changes to libXfont
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 513
diff changeset
   172
	SUNWxwfsw
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   173
	SUNWxwfnt
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   174
	SUNWfontconfig 
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   175
	SUNWfontconfig-root
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   176
	SUNWfontconfig-docs 
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   177
	SUNWfont-daewoo-misc
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   178
	SUNWfont-isas-misc
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   179
	SUNWfont-jis-misc
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   180
	SUNWfont-misc-ethiopic
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   181
	SUNWfont-misc-meltho
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   182
	SUNWfont-xorg-cyrillic
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   183
	SUNWfont-xorg-core
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   184
	SUNWfont-xorg-iso8859-1
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   185
	SUNWfont-xorg-iso8859-2
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   186
	SUNWfont-xorg-iso8859-3
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   187
	SUNWfont-xorg-iso8859-4
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   188
	SUNWfont-xorg-iso8859-5
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   189
	SUNWfont-xorg-iso8859-7
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   190
	SUNWfont-xorg-iso8859-8
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   191
	SUNWfont-xorg-iso8859-9
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   192
	SUNWfont-xorg-iso8859-10
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   193
	SUNWfont-xorg-iso8859-11
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   194
	SUNWfont-xorg-iso8859-13
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   195
	SUNWfont-xorg-iso8859-14
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   196
	SUNWfont-xorg-iso8859-15
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   197
	SUNWfont-xorg-iso8859-16
577
cd96438515cb 6752912 Integrate libpixman [LSARC 2008/637]
Stuart Kreitman <Stuart.Kreitman@Sun.COM>
parents: 536
diff changeset
   198
	SUNWpciaccess
cd96438515cb 6752912 Integrate libpixman [LSARC 2008/637]
Stuart Kreitman <Stuart.Kreitman@Sun.COM>
parents: 536
diff changeset
   199
	SUNWpixman
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   200
	SUNWsynergy
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   201
	SUNWttf-bh-luxi
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   202
	SUNWttf-bitstream-vera
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   203
	SUNWttf-dejavu
653
99e8cbe3eca5 6803790 Add Google Droid fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 651
diff changeset
   204
	SUNWttf-google-droid
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   205
	SUNWttf-liberation
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   206
	SUNWvncviewer
835
3d369dc6447e 6737076 Bring in Xorg's xcompmgr window manager
Stuart Kreitman <Stuart.Kreitman@Sun.COM>
parents: 792
diff changeset
   207
	SUNWxcompmgr
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   208
	SUNWxcursor-themes
792
be478ae051ae 6885155 Xorg modularization: xdm 1.1.9 [LSARC/2009/512]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 791
diff changeset
   209
	SUNWxdm-root
be478ae051ae 6885155 Xorg modularization: xdm 1.1.9 [LSARC/2009/512]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 791
diff changeset
   210
	SUNWxdm
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   211
	SUNWxorg-client-docs
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   212
	SUNWxorg-client-programs
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   213
	SUNWxorg-clientlibs
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   214
	SUNWxorg-compatlinks
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   215
	SUNWxorg-graphics-ddx
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   216
	SUNWxorg-headers
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   217
	SUNWxorg-mesa
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   218
	SUNWxorg-server
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   219
	SUNWxorg-tsol-module
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   220
	SUNWxvnc
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   221
	SUNWxwacx
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   222
	SUNWxwcft
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   223
	SUNWxwdem
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   224
	SUNWxwdxm
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   225
	SUNWxwfs
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   226
	SUNWxwice
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   227
	SUNWxwinc
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   228
	SUNWxwman
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   229
	SUNWxwmod
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   230
	SUNWxwoft
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   231
	SUNWxwopt
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   232
	SUNWxwplr
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   233
	SUNWxwplt
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   234
	SUNWxwpmn
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   235
	SUNWxwrtl
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   236
	SUNWxwslb
731
d06e4a0dca56 6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]: X consolidation portion
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 725
diff changeset
   237
	SUNWxwxft
d06e4a0dca56 6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]: X consolidation portion
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 725
diff changeset
   238
"
d06e4a0dca56 6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]: X consolidation portion
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 725
diff changeset
   239
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   240
####
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   241
#
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   242
#   Deal with changes since various older Nevada builds
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   243
#
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   244
####        
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   245
721
2dec3915ec1e 6846155 Update Xsun packaging in preparation for x86 removal
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset
   246
# Packages to remove because they are obsolete and not being replaced
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   247
REM_PKGS=""
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   248
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   249
# snv_46: 6261914 Removal of STSF & Xst [PSARC 2006/087]
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   250
REM_PKGS+=" SUNWstsf SUNWstsfr SUNWxwxst"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   251
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   252
# snv_91: 6699573 CDE Font Administration Tools removal [LSARC 2008/010]
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   253
REM_PKGS+=" SUNWxwfa"
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   254
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   255
# snv_97: 6731942 Remove SUNWxwsrc package
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   256
REM_PKGS+=" SUNWxwsrc"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   257
513
9c7b32aa7a41 6741034 Merge SUNWi1of into SUNWxwfnt
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 512
diff changeset
   258
# snv_98: 6741034 Merge SUNWi1of into SUNWxwfnt
9c7b32aa7a41 6741034 Merge SUNWi1of into SUNWxwfnt
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 512
diff changeset
   259
REM_PKGS+=" SUNWi1of"
9c7b32aa7a41 6741034 Merge SUNWi1of into SUNWxwfnt
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 512
diff changeset
   260
619
a4e261f11dff 6798225 stop building/delivering SUNWxwdim
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 606
diff changeset
   261
# snv_107: 6582489 X11R7.4: Xorg server 1.5.3 and associated driver updates
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 577
diff changeset
   262
# Merged SUNWxorg-doc into SUNWxorg-server & SUNWxorg-graphics-ddx
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 577
diff changeset
   263
REM_PKGS+=" SUNWxorg-doc"
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 577
diff changeset
   264
619
a4e261f11dff 6798225 stop building/delivering SUNWxwdim
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 606
diff changeset
   265
# snv_108: 6798225 stop building/delivering SUNWxwdim
a4e261f11dff 6798225 stop building/delivering SUNWxwdim
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 606
diff changeset
   266
REM_PKGS+=" SUNWxwdim"
a4e261f11dff 6798225 stop building/delivering SUNWxwdim
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 606
diff changeset
   267
663
bacf28202a5a 6815064 Merge SUNWxwhl into SUNWxwinc and change link target to /usr/X11/include
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 653
diff changeset
   268
# snv_111: 6815064 Merge SUNWxwhl into SUNWxwinc
bacf28202a5a 6815064 Merge SUNWxwhl into SUNWxwinc and change link target to /usr/X11/include
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 653
diff changeset
   269
REM_PKGS+=" SUNWxwhl"
bacf28202a5a 6815064 Merge SUNWxwhl into SUNWxwinc and change link target to /usr/X11/include
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 653
diff changeset
   270
721
2dec3915ec1e 6846155 Update Xsun packaging in preparation for x86 removal
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset
   271
# snv_116: 6840423 merge SUNWxorg-devel-docs into SUNWxwpmn, 
2dec3915ec1e 6846155 Update Xsun packaging in preparation for x86 removal
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset
   272
#	   6826940 remove SUNWxorg-cfg (Xorg 1.6 upgrade)
2dec3915ec1e 6846155 Update Xsun packaging in preparation for x86 removal
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset
   273
REM_PKGS+=" SUNWxorg-devel-docs SUNWxorg-cfg"
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   274
725
52ac4b072555 6850136 Removal of Xsun-based Xvfb & Xnest servers [PSARC 2008/033]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 721
diff changeset
   275
# snv_118: 6850136 Removal of Xsun-based Xvfb & Xnest servers [PSARC 2008/033]
905
d2b59d5a79ed 6926932 Removal of Xsun on SPARC [PSARC 2008/033]: X consolidation portion
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
   276
REM_PKGS+=" SUNWxwsrv"
d2b59d5a79ed 6926932 Removal of Xsun on SPARC [PSARC 2008/033]: X consolidation portion
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
   277
d2b59d5a79ed 6926932 Removal of Xsun on SPARC [PSARC 2008/033]: X consolidation portion
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
   278
# snv_118: 6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]
d2b59d5a79ed 6926932 Removal of Xsun on SPARC [PSARC 2008/033]: X consolidation portion
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
   279
# snv_135: 6926932 Removal of Xsun on SPARC [PSARC 2008/033]
d2b59d5a79ed 6926932 Removal of Xsun on SPARC [PSARC 2008/033]: X consolidation portion
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset
   280
REM_PKGS+=" SUNWxsun-headers SUNWxsun-server SUNWxwts SUNWxwpsr"
731
d06e4a0dca56 6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]: X consolidation portion
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 725
diff changeset
   281
744
7f935d506429 6859233 Removal of Xprint [PSARC 2009/294]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 731
diff changeset
   282
# snv_120: 6859233 Removal of Xprint [PSARC 2009/294]
7f935d506429 6859233 Removal of Xprint [PSARC 2009/294]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 731
diff changeset
   283
REM_PKGS+=" SUNWxprint-server SUNWxwpft"
725
52ac4b072555 6850136 Removal of Xsun-based Xvfb & Xnest servers [PSARC 2008/033]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 721
diff changeset
   284
763
16e275b50576 6868816 move xscreensaver from X consolidation to Desktop consolidation
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 744
diff changeset
   285
# snv_122: 6868816 move xscreensaver from X consolidation to Desktop cons.
16e275b50576 6868816 move xscreensaver from X consolidation to Desktop consolidation
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 744
diff changeset
   286
# Packages intentionally not added to REM_PKGS since they were moved
16e275b50576 6868816 move xscreensaver from X consolidation to Desktop consolidation
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 744
diff changeset
   287
# to Desktop, and upgrade-X should no longer touch them.
16e275b50576 6868816 move xscreensaver from X consolidation to Desktop consolidation
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 744
diff changeset
   288
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   289
# Check for shared SMF manifest scripts now required by our packages
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   290
if [[ ! -f /usr/sadm/install/scripts/i.manifest ]] ; then
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   291
    fatal_error "Cannot install on a Nevada build older than nv_17.\n" \ 
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   292
     "This build of X requires a system with the shared SMF manifest class\n" \
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   293
     "action scripts installed in /usr/sadm/install/scripts/i.manifest\n" \
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   294
     "(See Solaris bug id 6209178)\n"
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   295
fi
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   296
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   297
# /etc/svc & /var/svc/profile directories needed by manifest packaging scripts
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   298
altroot_dir_check /etc 0755 root:sys
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   299
altroot_dir_check /etc/svc 0755 root:sys
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   300
altroot_dir_check /var/svc 0755 root:sys
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   301
altroot_dir_check /var/svc/profile 0755 root:sys
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   302
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   303
# Need to be able to install symlinks to /usr/lib/isaexec in SUNWxorg-server
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   304
if [[ (! -z "${ALTROOT}") && (! -f "${ALTROOT}/usr/lib/isaexec") ]] ; then
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   305
    altroot_dir_check /usr 0755 root:sys
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   306
    altroot_dir_check /usr/lib 0755 root:sys
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   307
    touch ${ALTROOT}/usr/lib/isaexec
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   308
fi
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   309
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   310
# S10/greenline upgrade support
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   311
function svc_disable 
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   312
{
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   313
    svcname="svc:$1:default";
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   314
    if [[ "$2" = "" ]] ; then
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   315
	manifest="/var/svc/manifest/$1.xml"
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   316
    else
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   317
	manifest="/var/svc/manifest/$2"
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   318
    fi
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   319
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   320
    if [[ -f $manifest ]] ; then
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   321
	/usr/sbin/svcadm -v disable -s $svcname 2>&1 | tee -a $PKG_UPGRADE_LOG
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   322
    fi
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   323
}
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   324
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   325
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   326
###
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   327
#
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   328
#   Do the upgrade
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   329
#
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   330
###
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   331
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   332
print ""
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   333
print "Starting X ${XVERS} Build ${X_BUILD} ${ACTION}"
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   334
if [[ ! -z ${ALTROOT} ]] ; then
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   335
    print " in alternate root ${ALTROOT}"
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   336
fi
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   337
print "  The ${ACTION} log file can be found at:"
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   338
print "    $PKG_UPGRADE_LOG"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   339
print ""
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   340
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   341
VERBOSE="-n -a /tmp/admin.$$"
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   342
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   343
cat >/tmp/admin.$$ <<EOF
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   344
basedir=default
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   345
mail=
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   346
runlevel=quit
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   347
conflict=nocheck
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   348
setuid=nocheck
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   349
action=nocheck
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   350
partial=nocheck
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   351
instance=unique
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   352
idepend=nocheck
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   353
rdepend=nocheck
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   354
space=quit
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   355
EOF
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   356
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   357
# Back up OWconfig before adding/removing packages to 
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   358
# workaround pkg bug 4946663/4992643
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   359
if [[ -f ${ALTROOT}/usr/openwin/server/etc/OWconfig ]]; then
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   360
    cp ${ALTROOT}/usr/openwin/server/etc/OWconfig ${ALTROOT}/var/tmp/OWconfig.${DATE}
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   361
fi
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   362
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   363
# Remove all instances of the specified package
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   364
function remove_package 
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   365
{
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   366
    pkg=$1
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   367
    if /bin/pkginfo ${ADDITIONAL_PKG_FLAGS} -q ${pkg}.\* ; then
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   368
	for p in $(pkginfo ${ADDITIONAL_PKG_FLAGS} ${pkg}.\* | awk '{print $2}') ; do
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   369
	    if [[ -z ${ALTROOT} ]] ; then
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   370
		case "$pkg" in
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   371
		    SUNWxwplr*)
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   372
			svc_disable network/fs/tcp6 network/fs-tcp6.xml
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   373
			svc_disable application/opengl/ogl-select
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   374
			svc_disable application/x11/xfs
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   375
			svc_disable application/x11/xvnc-inetd
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   376
			;;
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   377
		    SUNWfontconfig-root*)
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   378
			svc_disable application/font/fc-cache
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   379
			;;
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   380
		    SUNWstsfr*)
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   381
			svc_disable application/font/stfsloader
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   382
			;;
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   383
		esac
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   384
	    fi
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   385
	    /usr/sbin/pkgrm ${ADDITIONAL_PKG_FLAGS} ${VERBOSE} ${p} 2>&1 \
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   386
		| tee -a ${PKG_UPGRADE_LOG} | grep $pkg
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   387
	done
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   388
    fi
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   389
}
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   390
721
2dec3915ec1e 6846155 Update Xsun packaging in preparation for x86 removal
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset
   391
# Remove packages in reverse order, so mkfontdir/etc. are removed last
2dec3915ec1e 6846155 Update Xsun packaging in preparation for x86 removal
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset
   392
reverse_pkg_list="$(print -f '%s\n' ${pkg_list} | tail -r)"
2dec3915ec1e 6846155 Update Xsun packaging in preparation for x86 removal
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset
   393
2dec3915ec1e 6846155 Update Xsun packaging in preparation for x86 removal
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset
   394
for pkg in ${REM_PKGS} ${reverse_pkg_list}; do
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   395
    remove_package $pkg
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   396
done
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   397
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   398
# Special handling for Sun OpenGL on SPARC until their packages are updated
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   399
if [[ "${MACH}" == "sparc" ]] ; then
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   400
    if [[ -h ${ALTROOT}/usr/include/GL ]] ; then
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   401
	print "Moving SUNWglh links"| tee -a ${PKG_UPGRADE_LOG}
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   402
	removef ${ADDITIONAL_PKG_FLAGS} SUNWglh /usr/include/GL \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   403
		| tee -a ${PKG_UPGRADE_LOG}
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   404
	rm ${ALTROOT}/usr/include/GL
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   405
	installf ${ADDITIONAL_PKG_FLAGS} SUNWglh \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   406
		/usr/include/SUNWgl=../openwin/include/GL s \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   407
		| tee -a ${PKG_UPGRADE_LOG}
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   408
	installf -f SUNWglh | tee -a ${PKG_UPGRADE_LOG}
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   409
    fi
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   410
    if [[ -h ${ALTROOT}/usr/lib/libGL.so.1 ]] ; then
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   411
	print "Moving SUNWglrt links" | tee -a ${PKG_UPGRADE_LOG}
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   412
	removef ${ADDITIONAL_PKG_FLAGS} SUNWglrt \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   413
		/usr/lib/libGL* /usr/lib/sparcv9/libGL* \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   414
		| tee -a ${PKG_UPGRADE_LOG}
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   415
	rm ${ALTROOT}/usr/lib/libGL* ${ALTROOT}/usr/lib/sparcv9/libGL*
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   416
	mkdir -p ${ALTROOT}/usr/lib/SUNWgl/sparcv9
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   417
	for f in ${ALTROOT}/usr/openwin/lib/libGL* ; do
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   418
	    bf=$(basename $f)
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   419
	    installf ${ADDITIONAL_PKG_FLAGS} SUNWglrt \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   420
		/usr/lib/SUNWgl/$bf=../../openwin/lib/$bf s \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   421
		| tee -a ${PKG_UPGRADE_LOG}
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   422
	done
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   423
	for f in ${ALTROOT}/usr/openwin/lib/sparcv9/libGL* ; do
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   424
	    bf=$(basename $f)
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   425
	    installf ${ADDITIONAL_PKG_FLAGS} SUNWglrt \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   426
		/usr/lib/SUNWgl/sparcv9/$bf=../../../openwin/lib/$bf s \
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   427
		| tee -a ${PKG_UPGRADE_LOG}
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   428
	done
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   429
	installf -f SUNWglrt | tee -a ${PKG_UPGRADE_LOG}
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   430
    fi
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   431
fi
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   432
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   433
if [[ $REMOVE_ONLY -eq 0 ]] ; then
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   434
    for pkg in ${pkg_list} ; do
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   435
	if [[ -e $pkg ]] ; then
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   436
	    /usr/sbin/pkgadd ${ADDITIONAL_PKG_FLAGS} -S ${VERBOSE} \
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   437
		-d . $pkg 2>&1 | tee -a ${PKG_UPGRADE_LOG} | grep $pkg
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   438
	    print ""
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   439
	else
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   440
	    if [[ $QUIET -eq 0 ]] ; then
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   441
		print "No replacement found for $pkg"
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   442
	    fi
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   443
	fi
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   444
    done
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   445
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   446
    # Start the rebuild of fontconfig caches & reset OpenGL links now, 
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   447
    # instead of at next reboot
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   448
    if [[ -z "${ALTROOT}" ]] ; then
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   449
	/usr/sbin/svccfg -s application/font/fc-cache setprop options/force_rebuild="true"
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   450
	/usr/sbin/svcadm restart application/font/fc-cache
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   451
	/usr/sbin/svcadm enable application/font/fc-cache
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 837
diff changeset
   452
	/usr/sbin/svcadm restart application/opengl/ogl-select
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   453
    fi
536
25f17a95d600 6748141 SUNWxwfnt, SUNWxwcft, SUNWxwoft installs fail due to libfont.so.1: open failed
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 523
diff changeset
   454
fi
244
6e6c16040af9 Open source most of the remaining X package definitions
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset
   455
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   456
print "X ${XVERS} ${action} is complete"
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   457
print " "
837
ee480af8e87c 6896574 Font repackaging and upgrade to X11R7.5 fonts
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 835
diff changeset
   458
print "  The ${action} log file can be found at:"
512
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   459
print "    $PKG_UPGRADE_LOG"
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   460
dca0b5524781 6741768 upgrade-X script improvements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 478
diff changeset
   461
exit 0