From 6e97ac37caa91ff03dc2ddcd224b8c93d1f2063b Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Thu, 5 Dec 2013 13:53:56 -0500 Subject: [PATCH] Packaging support for MacOS X 10.9 "Mavericks". Based on work originally done by Matt Haught . Reviewed-on: http://gerrit.openafs.org/10539 Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit cb53d255a6285c884c6a5ea9a20427327b1ab9b3) Reviewed-on: http://gerrit.openafs.org/10542 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Stephan Wiesand (cherry picked from commit 77826dd3eeb5355834e073553462856df64b9e81) Change-Id: Ib609dfbaa337f0e5046e9a0d03aebbbfdf26873a Reviewed-on: http://gerrit.openafs.org/10610 Reviewed-by: Stephan Wiesand Tested-by: Stephan Wiesand --- src/packaging/MacOS/InstallationCheck.13 | 19 +++++++++++++++++++ .../MacOS/InstallationCheck.strings.13 | 1 + src/packaging/MacOS/ReadMe.rtf.13 | 7 +++++++ src/packaging/MacOS/buildpkg.sh.in | 3 +++ 4 files changed, 30 insertions(+) create mode 100644 src/packaging/MacOS/InstallationCheck.13 create mode 100644 src/packaging/MacOS/InstallationCheck.strings.13 create mode 100644 src/packaging/MacOS/ReadMe.rtf.13 diff --git a/src/packaging/MacOS/InstallationCheck.13 b/src/packaging/MacOS/InstallationCheck.13 new file mode 100644 index 0000000000..accb253b91 --- /dev/null +++ b/src/packaging/MacOS/InstallationCheck.13 @@ -0,0 +1,19 @@ +#!/bin/sh +majorvers=`uname -r | sed 's/\..*//'` +if [ $majorvers -ne 13 ]; then + exit 112 +fi + +# check for temporary versions of ThisCell and CellAlias +# and move them aside +tmpthiscell=/private/tmp/org.OpenAFS.Install.ThisCell.$USER +tmpcellalias=/private/tmp/org.OpenAFS.Install.CellAlias.$USER +date=`date +%Y%m%d%H%M` +if [ -e $tmpthiscell ]; then + mv -f $tmpthiscell $tmpthiscell.$date +fi +if [ -e $tmpcellalias ]; then + mv -f $tmpcellalias $tmpcellalias.$date +fi + +exit 0 diff --git a/src/packaging/MacOS/InstallationCheck.strings.13 b/src/packaging/MacOS/InstallationCheck.strings.13 new file mode 100644 index 0000000000..26b9e8f337 --- /dev/null +++ b/src/packaging/MacOS/InstallationCheck.strings.13 @@ -0,0 +1 @@ +"16" = "This OpenAFS release requires Mountain Lion (10.9)"; diff --git a/src/packaging/MacOS/ReadMe.rtf.13 b/src/packaging/MacOS/ReadMe.rtf.13 new file mode 100644 index 0000000000..fadf33f22e --- /dev/null +++ b/src/packaging/MacOS/ReadMe.rtf.13 @@ -0,0 +1,7 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf320 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\margl1440\margr1440\vieww9000\viewh9000\viewkind0 +\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural + +\f0\fs24 \cf0 This release of OpenAFS is targeted at MacOS 10.9 (Mavericks) and is not recommended for use with any other version.} diff --git a/src/packaging/MacOS/buildpkg.sh.in b/src/packaging/MacOS/buildpkg.sh.in index ca20c813db..56b9923582 100644 --- a/src/packaging/MacOS/buildpkg.sh.in +++ b/src/packaging/MacOS/buildpkg.sh.in @@ -43,6 +43,9 @@ fi if [ $majorvers -eq 12 ]; then RELNAME="MountainLion" fi +if [ $majorvers -eq 13 ]; then + RELNAME="Mavericks" +fi PKGROOT=$CURDIR/pkgroot PKGRES=$CURDIR/pkgres