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

Diff for /pegasus/Makefile.Release between version 1.28 and 1.34

version 1.28, 2005/04/16 06:37:10 version 1.34, 2005/05/06 22:36:46
Line 122 
Line 122 
    cimserver \    cimserver \
    cimuser \    cimuser \
    cimprovagt \    cimprovagt \
    cimservera     cimservera \
      repupgrade
  
 PEGASUS_USER_CMDS = \ PEGASUS_USER_CMDS = \
    cimmof \    cimmof \
Line 737 
Line 738 
         @$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log" >> \         @$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log" >> \
                     $(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) "%ifarch ia64 x86_64" >> \          @$(ECHO-E) "%ifarch ia64" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU" >> \         @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%else" >> \         @$(ECHO-E) "%else" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%ifarch x86_64" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_GNU" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%else" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%ifarch ppc" >> \         @$(ECHO-E) "%ifarch ppc" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU" >> \         @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU" >> \
Line 780 
Line 787 
         @$(ECHO-E) "%endif" >> \         @$(ECHO-E) "%endif" >> \
                     $(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) "%endif" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_PackagesToSpecFile: FORCE _append_PackagesToSpecFile: FORCE
         @$(ECHO-E) "# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-packages.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-packages.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 888 
Line 898 
                       >> $(PEGASUS_RPM_SPEC_FILE_PATH)                       >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   if [ \"\044isRunning\" ]; then"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   if [ \"\044isRunning\" ]; then"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "      $(PEGASUS_SBIN_DIR)/cimserver -s"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "      $(PEGASUS_SBIN_DIR)/cimserver -s"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   fi"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   [ -f $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE) ] && \         @$(ECHO-E) "   [ -f $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE) ] && \
                        rm $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE);" >> \                        rm $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE);" >> \
                        $(PEGASUS_RPM_SPEC_FILE_PATH)                        $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 895 
Line 906 
                        $(PEGASUS_RPM_SPEC_FILE_PATH)                        $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   [ -d $(PEGASUS_REPOSITORY_DIR) ] && rm -rf $(PEGASUS_REPOSITORY_DIR);" >> \         @$(ECHO-E) "   [ -d $(PEGASUS_REPOSITORY_DIR) ] && rm -rf $(PEGASUS_REPOSITORY_DIR);" >> \
                        $(PEGASUS_RPM_SPEC_FILE_PATH)                        $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   [ -d $(PEGASUS_VARDATA_CACHE_DIR) ] && rm -rf $(PEGASUS_VARDATA_CACHE_DIR);" >> \
                          $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   rm -f $(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH);" >> \         @$(ECHO-E) "   rm -f $(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH);" >> \
                        $(PEGASUS_RPM_SPEC_FILE_PATH)                        $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   fi"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "   rm -f $(PEGASUS_CIMSERVER_START_FILE)" >> \
                          $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   # Delete the Link to the rc.* Startup Directories" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   # Delete the Link to the rc.* Startup Directories" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   /usr/lib/lsb/remove_initd /etc/init.d/tog-pegasus;"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   /usr/lib/lsb/remove_initd /etc/init.d/tog-pegasus;"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "fi"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "fi"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)


Legend:
Removed from v.1.28  
changed lines
  Added in v.1.34

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2