(file) Return to Makefile.Release CVS log (file) (dir) Up to [Pegasus] / pegasus

Diff for /pegasus/Makefile.Release between version 1.85 and 1.89

version 1.85, 2008/05/02 21:05:28 version 1.89, 2008/11/05 00:43:35
Line 119 
Line 119 
       libCIMQueryCapabilitiesProvider       libCIMQueryCapabilitiesProvider
 endif endif
  
 ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER  ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
 PEGASUS_LIBRARIES += \ PEGASUS_LIBRARIES += \
    libcmpiCppImpl    libcmpiCppImpl
 PEGASUS_PROVIDER_MANAGERS += \ PEGASUS_PROVIDER_MANAGERS += \
Line 144 
Line 144 
    libDefaultProviderManager \    libDefaultProviderManager \
    libCIMxmlIndicationHandler    libCIMxmlIndicationHandler
  
 ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER  
 PEGASUS_PROVIDER_MANAGER_LINKS += \  
    libCMPIProviderManager  
 endif  
   
   
   
   
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
 PEGASUS_LIBRARY_LINKS += \ PEGASUS_LIBRARY_LINKS += \
    libsnmpIndicationHandler    libsnmpIndicationHandler
Line 180 
Line 172 
    cimtrust \    cimtrust \
    repupgrade    repupgrade
  
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
    PEGASUS_ADMIN_CMDS += \    PEGASUS_ADMIN_CMDS += \
       cimservermain \       cimservermain \
       cimshutdown       cimshutdown
Line 207 
Line 199 
    $(PEGASUS_GENERATED_SCRIPTS) \    $(PEGASUS_GENERATED_SCRIPTS) \
    $(PEGASUS_CVS_SCRIPTS)    $(PEGASUS_CVS_SCRIPTS)
  
 PEGASUS_REPOSITORY_DIRS = \  
    root\  
    root\#PG_Internal \  
    root\#PG_InterOp \  
    root\#cimv2  
   
 PEGASUS_UNIX_MAN_USER_PAGES = \ PEGASUS_UNIX_MAN_USER_PAGES = \
    cimmof.1 \    cimmof.1 \
    cimprovider.1 \    cimprovider.1 \
Line 314 
Line 300 
  
 stage_PegasusProviderManagerLibraryDirectoryFiles: FORCE stage_PegasusProviderManagerLibraryDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX);)         $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX);)
         $(foreach i, $(PEGASUS_PROVIDER_MANAGER_LINKS), $(MAKE) --directory=${ROOT} -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)          $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(MAKE) --directory=${ROOT} -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)
  
 setpermissions_PegasusProviderManagerLibraryDirectoryFiles: FORCE setpermissions_PegasusProviderManagerLibraryDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(MAKE) --directory=${ROOT} -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX);)         $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(MAKE) --directory=${ROOT} -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX);)
Line 335 
Line 321 
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)
         $(foreach i, $(PEGASUS_USER_CMDS), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)/$(i)$(EXE);)         $(foreach i, $(PEGASUS_USER_CMDS), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)/$(i)$(EXE);)
  
 stage_RepositoryNamespaceDirectory: FORCE  stage_PegasusRepository: FORCE
         $(CPDIRHIER) $(NAMESPACE_DIR_NAME) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)  
   
 setpermissions_RepositoryNamespaceDirectory: FORCE  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/qualifiers  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/qualifiers  
   
 stage_PegasusRepositoryDirectories: FORCE  
         $(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)         $(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)          $(CPDIRHIER) $(PEGASUS_HOME)/repository $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_PARENT_DIR)
         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) --directory=$(PEGASUS_HOME)/repository -f $(ROOT)/Makefile.Release stage_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)  
  
 setpermissions_PegasusRepositoryDirectories: FORCE  setpermissions_PegasusRepository: FORCE
         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)
         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)  
  
 stage_PegasusUnixManPageDirectoryFiles: FORCE stage_PegasusUnixManPageDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_UNIX_MAN_USER_PAGES), $(COPY) $(ROOT)/rpm/manLinux/man1.Z/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MANUSER_DIR)/$(i);)         $(foreach i, $(PEGASUS_UNIX_MAN_USER_PAGES), $(COPY) $(ROOT)/rpm/manLinux/man1.Z/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MANUSER_DIR)/$(i);)
Line 426 
Line 398 
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusAdminCmdsDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusAdminCmdsDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusUserCmdsDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusUserCmdsDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusVarDataDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusVarDataDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusRepositoryDirectories          $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusRepository
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusUnixManPageDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusUnixManPageDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusDocFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusDocFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusMOFDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusMOFDirectoryFiles
Line 439 
Line 411 
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusAdminCmdsDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusAdminCmdsDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusUserCmdsDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusUserCmdsDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusVarDataDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusVarDataDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusRepositoryDirectories          $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusRepository
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusUnixManPageDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusUnixManPageDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusDocFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusDocFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusMOFDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusMOFDirectoryFiles
Line 538 
Line 510 
              "\""$(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH)"\"" \              "\""$(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# define PEGASUS_CORE_DIR"  \         @$(ECHO-E) "# define PEGASUS_CORE_DIR"  \
              "\""$(PEGASUS_VARDATA_CACHE_DIR)"\"" \               "\""$(PEGASUS_TRACE_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# define PEGASUS_PAM_STANDALONE_PROC_NAME"  \         @$(ECHO-E) "# define PEGASUS_PAM_STANDALONE_PROC_NAME"  \
              "\""$(PEGASUS_SBIN_DIR)/cimservera"\"" \              "\""$(PEGASUS_SBIN_DIR)/cimservera"\"" \
Line 615 
Line 587 
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)" \         @$(ECHO-E) "ls -ld $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_REPOSITORY_DIR)" \  
              >> $(PEGASUS_HOME)/PegasusVerifyInstall  
         @$(ECHO-E) "ls -ld $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \         @$(ECHO-E) "ls -ld $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS DOCUMENT FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS DOCUMENT FILES\"" \
Line 632 
Line 602 
         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), $(ECHO-E) \         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), $(ECHO-E) \
              "ls -l $(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \              "ls -l $(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PACKAGED PROVIDER MANAGER FILES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \         @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \
              "ls -l $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX)" \              "ls -l $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
         @$(foreach i, $(PEGASUS_PROVIDER_MANAGER_LINKS), $(ECHO-E) \          @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \
              "ls -l $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \              "ls -l $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PACKAGED PROVIDER FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PACKAGED PROVIDER FILES\"" \
Line 663 
Line 635 
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS REPOSITORY FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS REPOSITORY FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(ECHO-E) \          @$(ECHO-E) "ls -lR $(PEGASUS_REPOSITORY_DIR)" \
              "ls -ld $(PEGASUS_REPOSITORY_DIR)/$(i)" \               >> $(PEGASUS_HOME)/PegasusVerifyInstall
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)  
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS MAN FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS MAN FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_UNIX_MAN_ADMIN_PAGES), $(ECHO-E) \         @$(foreach i, $(PEGASUS_UNIX_MAN_ADMIN_PAGES), $(ECHO-E) \
Line 881 
Line 852 
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-pre.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-pre.spec \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
         @$(ECHO-E) "# When Privilege Separation is enabled, create the" \         @$(ECHO-E) "# When Privilege Separation is enabled, create the" \
             "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)             "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \         @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \
Line 932 
Line 903 
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "       %PEGASUS_SBIN_DIR/repupgrade >> %PEGASUS_INSTALL_LOG 2>&1" \         @$(ECHO-E) "       %PEGASUS_SBIN_DIR/repupgrade >> %PEGASUS_INSTALL_LOG 2>&1" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
         @$(ECHO-E) "       chown -R $(CIMSERVERMAIN_USR) %PEGASUS_REPOSITORY_DIR" \         @$(ECHO-E) "       chown -R $(CIMSERVERMAIN_USR) %PEGASUS_REPOSITORY_DIR" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "       chgrp -R $(CIMSERVERMAIN_GRP) %PEGASUS_REPOSITORY_DIR" \         @$(ECHO-E) "       chgrp -R $(CIMSERVERMAIN_GRP) %PEGASUS_REPOSITORY_DIR" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 endif endif
         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
         @$(ECHO-E) "   if [ -f %PEGASUS_TRACE_FILE_PATH ]; then" \         @$(ECHO-E) "   if [ -f %PEGASUS_TRACE_FILE_PATH ]; then" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "     /bin/mv %PEGASUS_TRACE_FILE_PATH" \         @$(ECHO-E) "     /bin/mv %PEGASUS_TRACE_FILE_PATH" \
Line 972 
Line 943 
             $(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \             $(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   # Create Symbolic Links for Packaged Provider Managers"\
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \
               "   ln -sf $(i)$(LIB_SUFFIX)\
               $(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_postSectionToSpecFile_createLog: FORCE _append_postSectionToSpecFile_createLog: FORCE
         @$(ECHO-E) "   echo \`date\` > %PEGASUS_INSTALL_LOG 2>&1" \         @$(ECHO-E) "   echo \`date\` > %PEGASUS_INSTALL_LOG 2>&1" \
Line 1004 
Line 983 
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-postun.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-postun.spec \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
         @$(ECHO-E) "# When Privilege Separation is enabled, delete the" \         @$(ECHO-E) "# When Privilege Separation is enabled, delete the" \
             "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)             "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \         @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \
Line 1051 
Line 1030 
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2) " \
                 >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))"\         @$(ECHO-E) "%dir %attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))"\
               "$(PEGASUS_CONFIG_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)               "$(PEGASUS_CONFIG_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1099 
Line 1080 
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_SUFFIX)" \            "$(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_SUFFIX)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
              "$(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/*$(LIB_SUFFIX)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
Line 1115 
Line 1099 
         @$(foreach i, $(PEGASUS_PROVIDERS), \         @$(foreach i, $(PEGASUS_PROVIDERS), \
             $(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \             $(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
           @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), \
               $(ECHO-E) "$(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 include $(ROOT)/mak/commands.mak include $(ROOT)/mak/commands.mak

Legend:
Removed from v.1.85  
changed lines
  Added in v.1.89
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2