From 0c412784f1ea6db4a19804421c959e28b31d74af Mon Sep 17 00:00:00 2001 From: Chaskiel M Grundman Date: Wed, 12 Sep 2001 06:00:46 +0000 Subject: [PATCH] darwin-update-plist-building-20010912 update how plist files are constructed so subsconfigure for libafs can work --- Makefile.in | 3 +- configure-libafs.in | 12 ++++--- configure.in | 12 ++++--- src/afsd/Makefile.in | 2 -- src/afsd/afs.ppc_darwin_13.plist.in | 11 ------ ...darwin_12.plist.in => afs.rc.darwin.plist} | 0 src/libafs/MakefileProto.DARWIN.in | 36 +++++++++---------- src/libafs/afs.ppc_darwin_12.plist.in | 31 ++++++++++++++++ src/libafs/afs.ppc_darwin_13.plist.in | 31 ++++++++++++++++ src/libafs/afs.ppc_darwin_14.plist.in | 31 ++++++++++++++++ 10 files changed, 129 insertions(+), 40 deletions(-) delete mode 100644 src/afsd/afs.ppc_darwin_13.plist.in rename src/afsd/{afs.ppc_darwin_12.plist.in => afs.rc.darwin.plist} (100%) create mode 100644 src/libafs/afs.ppc_darwin_12.plist.in create mode 100644 src/libafs/afs.ppc_darwin_13.plist.in create mode 100644 src/libafs/afs.ppc_darwin_14.plist.in diff --git a/Makefile.in b/Makefile.in index 4f74f1b97..d9e69e24d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -30,6 +30,7 @@ MKAFS_OSTYPE=@MKAFS_OSTYPE@ # Systype-specific items LINUX_KERNEL_PATH=@LINUX_KERNEL_PATH@ LINUX_VERSION=@LINUX_VERSION@ +DARWIN_INFOFILE=@DARWIN_INFOFILE@ # Other items LIB_AFSDB=@LIB_AFSDB@ @@ -354,7 +355,7 @@ libafs_tree: libafs_setup ${KERNELDIR} [ -d libafs_tree/$$d ] || mkdir -p libafs_tree/$$d; \ done for f in `cd src/libafs; find . -name '*.[ch]'` \ - Makefile.common Makefile.extradefs \ + Makefile.common Makefile.extradefs ${DARWIN_INFOFILE} \ afs.shutdown afs.startup redhat.sh sgi_master sgi_system \ ; do \ ${INSTALL} -c -f src/libafs/$$f libafs_tree/$$f; \ diff --git a/configure-libafs.in b/configure-libafs.in index 80e15cb28..a1182e3bd 100644 --- a/configure-libafs.in +++ b/configure-libafs.in @@ -1,7 +1,7 @@ AC_INIT(Makefile.common) AM_INIT_AUTOMAKE(openafs-libafs,devel) AC_CANONICAL_HOST -AC_CONFIG_HEADER(src/config/afsconfig.h) +AC_CONFIG_HEADER(config/afsconfig.h) #BOZO_SAVE_CORES BOS_RESTRICTED_MODE BOS_NEW_CONFIG pam sia AC_ARG_WITH(afs-sysname, @@ -210,15 +210,18 @@ else ;; powerpc-apple-darwin1.2*) AFS_SYSNAME="ppc_darwin_12" - DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist + DARWIN_PLIST=afs.${AFS_SYSNAME}.plist + DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist ;; powerpc-apple-darwin1.3*) AFS_SYSNAME="ppc_darwin_13" - DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist + DARWIN_PLIST=afs.${AFS_SYSNAME}.plist + DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist ;; powerpc-apple-darwin1.4*) AFS_SYSNAME="ppc_darwin_14" - DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist + DARWIN_PLIST=afs.${AFS_SYSNAME}.plist + DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist ;; sparc-sun-solaris2.5*) AFS_SYSNAME="sun4x_55" @@ -461,6 +464,7 @@ AC_SUBST(TOP_LIBDIR) AC_SUBST(DEST) AC_SUBST(WITH_OBSOLETE) AC_SUBST(WITH_INSECURE) +AC_SUBST(DARWIN_INFOFILE) AC_OUTPUT( \ Makefile \ diff --git a/configure.in b/configure.in index 3f6433001..224f166e8 100644 --- a/configure.in +++ b/configure.in @@ -210,15 +210,18 @@ else ;; powerpc-apple-darwin1.2*) AFS_SYSNAME="ppc_darwin_12" - DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist + DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist + DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist ;; powerpc-apple-darwin1.3*) AFS_SYSNAME="ppc_darwin_13" - DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist + DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist + DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist ;; powerpc-apple-darwin1.4*) AFS_SYSNAME="ppc_darwin_14" - DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist + DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist + DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist ;; sparc-sun-solaris2.5*) AFS_SYSNAME="sun4x_55" @@ -461,12 +464,12 @@ AC_SUBST(TOP_LIBDIR) AC_SUBST(DEST) AC_SUBST(WITH_OBSOLETE) AC_SUBST(WITH_INSECURE) +AC_SUBST(DARWIN_INFOFILE) AC_OUTPUT( \ Makefile \ src/afs/Makefile \ src/afsd/Makefile \ -${DARWIN_PLIST} \ src/afsmonitor/Makefile \ src/afsweb/Makefile \ src/audit/Makefile \ @@ -516,6 +519,7 @@ src/libadmin/samples/Makefile \ src/libadmin/test/Makefile \ src/libadmin/vos/Makefile \ src/libafs/MakefileProto.${MKAFS_OSTYPE} \ +${DARWIN_PLIST} \ src/libafsauthent/Makefile \ src/libafsrpc/Makefile \ src/libuafs/MakefileProto.${MKAFS_OSTYPE} \ diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 77e253219..cc5b65b98 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -118,8 +118,6 @@ dest: ${DEST}/root.client/usr/vice/etc/afsd ${DEST}/etc/vsys ${INSTALLex} -f afs.rc.linux ${DEST}/root.client/usr/vice/etc/afs.rc; \ ${INSTALL} -f afs.conf.linux ${DEST}/root.client/usr/vice/etc/afs.conf ;; \ ppc_darwin*) \ - mkdir -p ${DEST}/root.client/usr/vice/etc/afs.kext/Contents/MacOS ;\ - ${INSTALL} -f afs.${SYS_NAME}.plist ${DEST}/root.client/usr/vice/etc/afs.kext/Contents/Info.plist ; \ ${INSTALLex} -f afs.rc.darwin ${DEST}/root.client/usr/vice/etc/afs.rc ; \ ${INSTALL} -f afs.rc.darwin.plist ${DEST}/root.client/usr/vice/etc/StartupParameters.plist ;; \ *fbsd*) \ diff --git a/src/afsd/afs.ppc_darwin_13.plist.in b/src/afsd/afs.ppc_darwin_13.plist.in deleted file mode 100644 index 4c05dd1f0..000000000 --- a/src/afsd/afs.ppc_darwin_13.plist.in +++ /dev/null @@ -1,11 +0,0 @@ -{ - Description = "OpenAFS network file system"; - Provides = ("AFS"); - Requires = ("Resolver"); - OrderPreference = "None"; - Messages = - { - start = "Starting OpenAFS file system"; - stop = "Stopping OpenAFS file system"; - }; -} diff --git a/src/afsd/afs.ppc_darwin_12.plist.in b/src/afsd/afs.rc.darwin.plist similarity index 100% rename from src/afsd/afs.ppc_darwin_12.plist.in rename to src/afsd/afs.rc.darwin.plist diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in index 16b4e0d7c..2140b840c 100644 --- a/src/libafs/MakefileProto.DARWIN.in +++ b/src/libafs/MakefileProto.DARWIN.in @@ -20,6 +20,7 @@ afssrvsbindir=@afssrvsbindir@ afssrvlibexecdir=@afssrvlibexecdir@ afskerneldir=@afskerneldir@ SYS_NAME=@AFS_SYSNAME@ +DARWIN_INFOFILE=../@DARWIN_INFOFILE@ include config/Makefile.${SYS_NAME} @@ -87,29 +88,28 @@ setup: LIBAFS = libafs.o LIBAFSNONFS = libafs.nonfs.o -INST_LIBAFS = ${DESTDIR}${afskerneldir}/afs-nfs -INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/afs -DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs-nfs -DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs +INST_LIBAFS = ${DESTDIR}${afskerneldir}/afs-nfs.kext +INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/afs.kext +DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/afs-nfs.kext +DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/afs.kext libafs: $(LIBAFSNONFS) ; -install_libafs: $(INST_LIBAFSNONFS) ; -dest_libafs: $(DEST_LIBAFSNONFS) ; +install_libafs: $(LIBAFSNONFS) ; + -mkdir -p ${INST_LIBAFSNONFS} + -mkdir -p ${INST_LIBAFSNONFS}/Contents + $(INSTALL) -f ${DARWIN_INFOFILE} ${INST_LIBAFSNONFS}/Contents/Info.plist + -mkdir -p ${INST_LIBAFSNONFS}/Contents/MacOS + $(INSTALL) -f ${LIBAFSNONFS} ${INST_LIBAFSNONFS}/Contents/MacOS/afs + +dest_libafs: $(LIBAFSNONFS) ; + -mkdir -p ${DEST_LIBAFSNONFS} + -mkdir -p ${DEST_LIBAFSNONFS}/Contents + $(INSTALL) -f ${DARWIN_INFOFILE} ${DEST_LIBAFSNONFS}/Contents/Info.plist + -mkdir -p ${DEST_LIBAFSNONFS}/Contents/MacOS + $(INSTALL) -f ${LIBAFSNONFS} ${DEST_LIBAFSNONFS}/Contents/MacOS/afs -$(INST_LIBAFS): $(LIBAFS) - $(INSTALL) -f $? $@ - -$(INST_LIBAFSNONFS): $(LIBAFSNONFS) - $(INSTALL) -f $? $@ - -$(DEST_LIBAFS): $(LIBAFS) - $(INSTALL) -f $? $@ - -$(DEST_LIBAFSNONFS): $(LIBAFSNONFS) - $(INSTALL) -f $? $@ - ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS) $(LD) -r -o ${LIBAFS} ${AFSAOBJS} ${AFSNFSOBJS} diff --git a/src/libafs/afs.ppc_darwin_12.plist.in b/src/libafs/afs.ppc_darwin_12.plist.in new file mode 100644 index 000000000..50e5e72d9 --- /dev/null +++ b/src/libafs/afs.ppc_darwin_12.plist.in @@ -0,0 +1,31 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + afs + CFBundleIdentifier + org.openafs.filesystems.afs + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + afs + CFBundlePackageType + KEXT + CFBundleShortVersionString + @VERSION@ + CFBundleSignature + ???? + CFBundleVersion + @VERSION@ + OSBundleLibraries + + com.apple.kernel.bsd + 1.0.0b1 + com.apple.kernel.mach + 1.0.0b1 + + + diff --git a/src/libafs/afs.ppc_darwin_13.plist.in b/src/libafs/afs.ppc_darwin_13.plist.in new file mode 100644 index 000000000..50e5e72d9 --- /dev/null +++ b/src/libafs/afs.ppc_darwin_13.plist.in @@ -0,0 +1,31 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + afs + CFBundleIdentifier + org.openafs.filesystems.afs + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + afs + CFBundlePackageType + KEXT + CFBundleShortVersionString + @VERSION@ + CFBundleSignature + ???? + CFBundleVersion + @VERSION@ + OSBundleLibraries + + com.apple.kernel.bsd + 1.0.0b1 + com.apple.kernel.mach + 1.0.0b1 + + + diff --git a/src/libafs/afs.ppc_darwin_14.plist.in b/src/libafs/afs.ppc_darwin_14.plist.in new file mode 100644 index 000000000..a5d80a6e8 --- /dev/null +++ b/src/libafs/afs.ppc_darwin_14.plist.in @@ -0,0 +1,31 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + afs + CFBundleIdentifier + org.openafs.filesystems.afs + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + afs + CFBundlePackageType + KEXT + CFBundleShortVersionString + @VERSION@ + CFBundleSignature + ???? + CFBundleVersion + @VERSION@ + OSBundleLibraries + + com.apple.kernel.bsd + 1.1 + com.apple.kernel.mach + 1.0.0b1 + + + -- 2.39.5