From 74ed54fcf41580c4e35e2d4176c5b07f3c25a044 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 7 Oct 2005 00:38:13 +0000 Subject: [PATCH] STABLE14-macos-cleanup-20051006 minor cleanup to get things working from the merge ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== remaining bits to make this build ==================== add missing installer files --- acinclude.m4 | 2 +- src/afs/afs_osi.h | 5 +++-- src/afs/afs_vcache.c | 2 ++ src/libafs/MakefileProto.DARWIN.in | 12 +++--------- src/packaging/MacOS/InstallationCheck | 10 ++++++++++ src/packaging/MacOS/InstallationCheck.strings | 1 + 6 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 src/packaging/MacOS/InstallationCheck create mode 100644 src/packaging/MacOS/InstallationCheck.strings diff --git a/acinclude.m4 b/acinclude.m4 index ed2884a07..12ec5d141 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -774,7 +774,7 @@ case $AFS_SYSNAME in DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist dnl the test below fails on darwin, even if the CPPFLAGS below - dnl are added. the headers from Kernel.Framework must be used + dnl are added. the headers from Kernel.framework must be used dnl when KERNEL is defined. dnl really, such a thing isn't guaranteed to work on any diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h index 1c9932d54..af2c03d01 100644 --- a/src/afs/afs_osi.h +++ b/src/afs/afs_osi.h @@ -130,7 +130,8 @@ struct afs_osi_WaitHandle { extern int afs_vfs_typenum; #define SetAfsVnode(vn) /* nothing; done in getnewvnode() */ #define IsAfsVnode(v) (vfs_typenum(vnode_mount((v))) == afs_vfs_typenum) -#elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_LINUX22_ENV) +#else +#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_LINUX22_ENV) #define vSetVfsp(vc, vfsp) AFSTOV(vc)->v_mount = (vfsp) #define vSetType(vc, type) AFSTOV(vc)->v_type = (type) #define vType(vc) AFSTOV(vc)->v_type @@ -139,7 +140,6 @@ extern int afs_vfs_typenum; #define vSetType(vc,type) (vc)->v.v_type = (type) #define vSetVfsp(vc,vfsp) (vc)->v.v_vfsp = (vfsp) #endif - #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) extern int (**afs_vnodeop_p) (); #define IsAfsVnode(v) ((v)->v_op == afs_vnodeop_p) @@ -149,6 +149,7 @@ extern struct vnodeops *afs_ops; #define IsAfsVnode(v) ((v)->v_op == afs_ops) #define SetAfsVnode(v) (v)->v_op = afs_ops #endif +#endif #ifdef AFS_SGI65_ENV #define gop_lookupname(fnamep,segflg,followlink,compvpp) \ diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index d9c9723d3..ac14f7290 100644 --- a/src/afs/afs_vcache.c +++ b/src/afs/afs_vcache.c @@ -880,7 +880,9 @@ restart: tvc->fid = *afid; tvc->asynchrony = -1; tvc->vc_error = 0; +#ifndef UKERNEL afs_symhint_inval(tvc); +#endif #ifdef AFS_TEXT_ENV tvc->flushDV.low = tvc->flushDV.high = AFS_MAXDV; #endif diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in index b528d47ce..86603586e 100644 --- a/src/libafs/MakefileProto.DARWIN.in +++ b/src/libafs/MakefileProto.DARWIN.in @@ -46,7 +46,7 @@ KOPTS=-no-cpp-precomp -static -fno-common -finline -fno-keep-inline-functions -f KOPTS=-no-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} ${OPTMZ} -KINCLUDES=-I${KROOT}/System/Library/Frameworks/Kernel.Framework/Headers +KINCLUDES=-I${KROOT}/System/Library/Frameworks/Kernel.framework/Headers # Name of directory to hold object files and libraries. @@ -65,15 +65,9 @@ setup: ln -fs ../Makefile $(KOBJ)/Makefile ln -fs ../Makefile.common $(KOBJ)/Makefile.common ln -fs ../config $(KOBJ)/config - -$(RM) -f h net netinet rpc ufs nfs machine sys vm mach kern - -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/net net - -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/machine machine - -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/netinet netinet - -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/nfs nfs - -ln -fs /usr/include/rpc rpc - -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/sys sys - -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/ufs ufs + -$(RM) -f h rpc -ln -fs $(KROOT)/System/Library/Frameworks/Kernel.framework/Headers/sys h + -ln -fs /usr/include/rpc rpc # Below this line are targets when in the COMMON directory: diff --git a/src/packaging/MacOS/InstallationCheck b/src/packaging/MacOS/InstallationCheck new file mode 100644 index 000000000..5f33391ad --- /dev/null +++ b/src/packaging/MacOS/InstallationCheck @@ -0,0 +1,10 @@ +#!/bin/sh +majorvers=`uname -r | sed 's/\..*//'` +echo "InstallationCheck: os release is $majorvers" +if [ $majorvers -ne 8 ]; then +echo "InstallationCheck: not ok" + exit 112 +fi + +echo "InstallationCheck: ok" +exit 0 diff --git a/src/packaging/MacOS/InstallationCheck.strings b/src/packaging/MacOS/InstallationCheck.strings new file mode 100644 index 000000000..62d12c1bc --- /dev/null +++ b/src/packaging/MacOS/InstallationCheck.strings @@ -0,0 +1 @@ +"16" = "This OpenAFS release requires Tiger (10.4)" -- 2.39.5