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

Diff for /pegasus/Makefile.Release between version 1.76 and 1.81

version 1.76, 2007/09/14 17:57:28 version 1.81, 2008/03/12 20:05:22
Line 59 
Line 59 
         @$(ECHO) "build completed successfully"         @$(ECHO) "build completed successfully"
  
 repository: FORCE repository: FORCE
           $(CHMOD) $(Prwxrwxrwx) $(PEGASUS_HOME)
         $(MAKE) "-SC" Schemas/Pegasus repository         $(MAKE) "-SC" Schemas/Pegasus repository
  
 stage: FORCE stage: FORCE
Line 189 
Line 190 
 PEGASUS_GENERATED_SCRIPTS = \ PEGASUS_GENERATED_SCRIPTS = \
    genOpenPegasusSSLCerts    genOpenPegasusSSLCerts
  
 ifeq ($(OS),linux)  #############################################################################
    PEGASUS_CVS_SCRIPTS += \  ## If needed, you can use the PEGASUS_CVS_SCRIPTS variable to include
       settogpath  ## one or more script files in an OpenPegasus release.  Scripts should be
 endif  ## placed in the CVS directory pegasus/installs/scripts.
   #############################################################################
  
 PEGASUS_SCRIPT_FILES = \ PEGASUS_SCRIPT_FILES = \
    $(PEGASUS_GENERATED_SCRIPTS) \    $(PEGASUS_GENERATED_SCRIPTS) \
    $(PEGASUS_CVS_SCRIPTS)    $(PEGASUS_CVS_SCRIPTS)
  
   
 PEGASUS_REPOSITORY_DIRS = \ PEGASUS_REPOSITORY_DIRS = \
    root\    root\
    root\#PG_Internal \    root\#PG_Internal \
Line 369 
Line 370 
         $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)         $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
  
 setpermissions_PegasusVarDataDirectoryFiles: FORCE setpermissions_PegasusVarDataDirectoryFiles: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
  
 stage_genOpenPegasusSSLCertsFile: FORCE stage_genOpenPegasusSSLCertsFile: FORCE
         @$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts         @$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
Line 884 
Line 885 
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "elif [ \044\061 -gt 1 ]; then" \         @$(ECHO-E) "elif [ \044\061 -gt 1 ]; then" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then" \  
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "     # Running Repository Upgrade utility" \  
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "     %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG" \  
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "   # Check if the cimserver is running" \         @$(ECHO-E) "   # Check if the cimserver is running" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   isRunning=\`ps -el | grep cimserver | grep -v" \         @$(ECHO-E) "   isRunning=\`ps -el | grep cimserver | grep -v" \
Line 901 
Line 895 
         @$(ECHO-E) "       /etc/init.d/tog-pegasus stop" \         @$(ECHO-E) "       /etc/init.d/tog-pegasus stop" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then" \
                      >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "       # The old repository was moved to" \
                      "/var/lib/Pegasus/prev_repository. It should now be" \
                      "upgraded to the new repository /var/lib/Pegasus/repository." \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "       %PEGASUS_SBIN_DIR/repupgrade >> %PEGASUS_INSTALL_LOG 2>&1" \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
           @$(ECHO-E) "       chown -R $(CIMSERVERMAIN_USR) %PEGASUS_REPOSITORY_DIR" \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "       chgrp -R $(CIMSERVERMAIN_GRP) %PEGASUS_REPOSITORY_DIR" \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
           @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
         @$(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)
Line 990 
Line 999 
  
 _append_filesSectionToSpecFile: FORCE _append_filesSectionToSpecFile: FORCE
         @$(ECHO-E) "%files" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%files" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%defattr($(Prw_______), $(CIMSERVERMAIN_USR),"\          @$(ECHO-E) "%defattr($(Prw_______),$(CIMSERVERMAIN_USR),$(CIMSERVERMAIN_GRP),$(Prwx______))" \
              "$(CIMSERVERMAIN_GRP), $(Prwx______))" \  
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "$(PEGASUS_REPOSITORY_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "$(PEGASUS_REPOSITORY_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%defattr($(Prw_______), $(INSTALL_USR),"\          @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
              "$(INSTALL_GRP), $(Prwxr_xr_x))" \          @$(ECHO-E) "%defattr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP),$(Prwxr_xr_x))"\
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "$(PEGASUS_MOF_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%defattr($(Prw_______),$(INSTALL_USR),$(INSTALL_GRP),$(Prwxr_xr_x))" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), \         @$(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), \
              if [ $(i) != $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR) ]; then \              if [ $(i) != $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR) ]; then \
Line 1003 
Line 1015 
              if [ $(i) != $(PEGASUS_TRACE_DIR) ]; then \              if [ $(i) != $(PEGASUS_TRACE_DIR) ]; then \
              if [ $(i) != $(PEGASUS_CONFIG_DIR) ]; then \              if [ $(i) != $(PEGASUS_CONFIG_DIR) ]; then \
              if [ $(i) != $(PEGASUS_VARRUN_DIR) ]; then \              if [ $(i) != $(PEGASUS_VARRUN_DIR) ]; then \
                if [ $(i) != $(PEGASUS_MOF_DIR) ]; then \
                    $(ECHO-E) "%dir $(i)" >> \                    $(ECHO-E) "%dir $(i)" >> \
              $(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi; fi; fi; fi;)               $(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi; fi; fi; fi;fi;)
         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_DIR_2) " \         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_DIR_2) " \
               >> $(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) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Prwxr_xr_x), $(CIMSERVER_USR)," \          @$(ECHO-E) "%dir %attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))"\
              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \                "$(PEGASUS_CONFIG_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "%dir" \
         @$(ECHO-E) "%dir %attr($(Prwxr_xr_x), $(CIMSERVERMAIN_USR)," \                "%attr($(Prwxr_xr_x),$(CIMSERVERMAIN_USR),$(CIMSERVERMAIN_GRP))"\
              "$(CIMSERVERMAIN_GRP)) $(PEGASUS_VARRUN_DIR)" \                "$(PEGASUS_VARRUN_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%dir %attr(1755,$(CIMSERVERMAIN_USR),$(CIMSERVERMAIN_GRP))" \         @$(ECHO-E) "%dir %attr(1755,$(CIMSERVERMAIN_USR),$(CIMSERVERMAIN_GRP))" \
              "$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \              "$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Prwxrwxrwt),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%dir %attr($(Prwxrwxrwt),$(INSTALL_USR),$(INSTALL_GRP))" \
              "$(PEGASUS_TRACE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)              "$(PEGASUS_TRACE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "$(PEGASUS_MOF_DIR)/Pegasus/*" \  
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\         @$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\
             "/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)             "/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%config(noreplace) %attr($(Prw_r__r__), " \          @$(ECHO-E) "%config(noreplace)" \
             "$(CIMSERVER_USR), $(CIMSERVER_GRP))" \              "%attr($(Prw_r__r__),$(CIMSERVER_USR),$(CIMSERVER_GRP))" \
             "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \             "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \         @$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \

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