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

Diff for /pegasus/Makefile.Release between version 1.98 and 1.101

version 1.98, 2009/07/28 14:10:24 version 1.101, 2010/05/19 09:51:35
Line 135 
Line 135 
    JMPIImpl    JMPIImpl
 endif endif
  
   ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)
   PEGASUS_LIBRARIES += \
      libInteropProvider
   endif
   
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
    PEGASUS_LIBRARIES += \    PEGASUS_LIBRARIES += \
       libsnmpIndicationHandler       libsnmpIndicationHandler
 endif endif
  
   ifeq ($(PEGASUS_ENABLE_PROTOCOL_WSMAN),true)
   PEGASUS_LIBRARIES += \
       libpegwsmserver
   endif
   
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
 PEGASUS_LIBRARIES += \ PEGASUS_LIBRARIES += \
    libNTPProviderSecurity    libNTPProviderSecurity
Line 245 
Line 255 
    PG_InterOpSchema20.mof \    PG_InterOpSchema20.mof \
    PG_ProviderModule20.mof    PG_ProviderModule20.mof
  
   ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)
      INTEROP_MOF_FILES += \
         PG_CIMXMLCommunicationMechanism20.mof \
         PG_Namespace20.mof\
         PG_ServerProfile20.mof
   endif
   
 MANAGEDSYSTEM_MOF_FILES = \ MANAGEDSYSTEM_MOF_FILES = \
    PG_ComputerSystem20.mof \    PG_ComputerSystem20.mof \
    PG_ComputerSystem20R.mof \    PG_ComputerSystem20R.mof \
Line 279 
Line 296 
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_DIR)         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_DIR)
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)
           $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)
           $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)
  
 stage_PegasusSocketDirectory: FORCE stage_PegasusSocketDirectory: FORCE
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)
Line 445 
Line 464 
 ifeq ($(OS),linux) ifeq ($(OS),linux)
 ifdef PEGASUS_PAM_AUTHENTICATION ifdef PEGASUS_PAM_AUTHENTICATION
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)
         $(COPY) $(ROOT)/rpm/wbem $(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/wbem          $(COPY) $(ROOT)/rpm/wbem $(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/$(PAM_CONFIG_FILE)
         $(COPY) $(ROOT)/rpm/access.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/access.conf         $(COPY) $(ROOT)/rpm/access.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/access.conf
 endif endif
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)/etc/init.d         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)/etc/init.d
         $(COPY) $(ROOT)/rpm/preamble-tog-pegasus.rc $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus          $(COPY) $(ROOT)/rpm/preamble-tog-pegasus.rc $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         @$(ECHO-E) "CIMSERVER_BIN=$(PEGASUS_SBIN_DIR)/cimserver" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus          @$(ECHO-E) "CIMSERVER_BIN=$(PEGASUS_SBIN_DIR)/cimserver" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         @$(ECHO-E) "PEGASUS_SCRIPT_DIR=$(PEGASUS_SCRIPT_DIR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus          @$(ECHO-E) "PEGASUS_SCRIPT_DIR=$(PEGASUS_SCRIPT_DIR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         @$(ECHO-E) "PEGASUS_SSL_CONF_FILE=$(PEGASUS_PEM_DIR)/ssl.cnf" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus          @$(ECHO-E) "PEGASUS_SSL_CONF_FILE=$(PEGASUS_PEM_DIR)/ssl.cnf" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         @$(ECHO-E) "PEGASUS_SSL_CERT_FILE=$(PEGASUS_SSL_CERT_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus          @$(ECHO-E) "PEGASUS_SSL_CERT_FILE=$(PEGASUS_SSL_CERT_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         @$(ECHO-E) "PEGASUS_SSL_KEY_FILE=$(PEGASUS_SSL_KEY_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus          @$(ECHO-E) "PEGASUS_SSL_KEY_FILE=$(PEGASUS_SSL_KEY_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         @$(ECHO-E) "PEGASUS_SSL_TRUSTSTORE=$(PEGASUS_SSL_CLIENT_TRUSTSTORE)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus          @$(ECHO-E) "PEGASUS_SSL_TRUSTSTORE=$(PEGASUS_SSL_CLIENT_TRUSTSTORE)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus          @$(ECHO-E) "PEGASUS_FLAVOR=$(PEGASUS_FLAVOR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
           $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
 endif endif
  
 setpermissions_PegasusSystemFiles: FORCE setpermissions_PegasusSystemFiles: FORCE
 ifeq ($(OS),linux) ifeq ($(OS),linux)
 ifdef PEGASUS_PAM_AUTHENTICATION ifdef PEGASUS_PAM_AUTHENTICATION
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/wbem          $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/$(PAM_CONFIG_FILE)
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prw_______)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/access.conf         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prw_______)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/access.conf
 endif endif
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)etc/init.d/tog-pegasus          $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)etc/init.d/$(PEGASUS_FLAVOR)-pegasus
 endif endif
  
 stage_PegasusEmptyFiles: FORCE stage_PegasusEmptyFiles: FORCE
Line 548 
Line 568 
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
 endif endif
  
   
 create_ConfigProductDirectoriesInclude: FORCE create_ConfigProductDirectoriesInclude: FORCE
 ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
         @$(ECHO-E) "#ifndef Config_Product_Directory_Structure_h" \         @$(ECHO-E) "#ifndef Config_Product_Directory_Structure_h" \
Line 691 
Line 710 
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PAM_CONFIG_DIR)" \         @$(ECHO-E) "ls -ld $(PAM_CONFIG_DIR)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -l $(PAM_CONFIG_DIR)/wbem" \          @$(ECHO-E) "ls -l $(PAM_CONFIG_DIR)/$(PAM_CONFIG_FILE)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS TRACE FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS TRACE FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
Line 743 
Line 762 
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_PreambleToSpecFile: FORCE _append_PreambleToSpecFile: FORCE
           @$(ECHO-E) "%define Flavor  $(PEGASUS_FLAVOR)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%define packageVersion $(PEGASUS_PACKAGE_VERSION)" \         @$(ECHO-E) "%define packageVersion $(PEGASUS_PACKAGE_VERSION)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "Version: $(PEGASUS_PRODUCT_VERSION)" \         @$(ECHO-E) "Version: $(PEGASUS_PRODUCT_VERSION)" \
Line 888 
Line 909 
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "    /usr/sbin/groupadd $(CIMSERVERMAIN_GRP) > /dev/null" \         @$(ECHO-E) "    /usr/sbin/groupadd $(CIMSERVERMAIN_GRP) > /dev/null" \
             "2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)             "2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "    /usr/sbin/useradd -c \"tog-pegasus OpenPegasus"\          @$(ECHO-E) "    /usr/sbin/useradd -c \"$(PEGASUS_FLAVOR)-pegasus OpenPegasus"\
             "WBEM/CIM services\" \\" >> $(PEGASUS_RPM_SPEC_FILE_PATH)             "WBEM/CIM services\" \\" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "        -g $(CIMSERVERMAIN_GRP) -s /sbin/nologin -r -d" \         @$(ECHO-E) "        -g $(CIMSERVERMAIN_GRP) -s /sbin/nologin -r -d" \
             "%PEGASUS_VARDATA_DIR $(CIMSERVERMAIN_USR) \\" >> $(PEGASUS_RPM_SPEC_FILE_PATH)             "%PEGASUS_VARDATA_DIR $(CIMSERVERMAIN_USR) \\" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 918 
Line 939 
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   if [ \"\044isRunning\" ]; then" \         @$(ECHO-E) "   if [ \"\044isRunning\" ]; then" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "       /etc/init.d/tog-pegasus stop" \          @$(ECHO-E) "       /etc/init.d/$(PEGASUS_FLAVOR)-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" \         @$(ECHO-E) "   if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then" \
Line 946 
Line 967 
 endif endif
         @$(ECHO-E) "   if [ \"\044isRunning\" ]; then" \         @$(ECHO-E) "   if [ \"\044isRunning\" ]; then" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "       /etc/init.d/tog-pegasus start" \          @$(ECHO-E) "       /etc/init.d/$(PEGASUS_FLAVOR)-pegasus start" \
             >> $(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) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1071 
Line 1092 
              "$(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) "%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/$(PEGASUS_FLAVOR)-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%config(noreplace)" \         @$(ECHO-E) "%config(noreplace)" \
             "%attr($(Prw_r__r__),$(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" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%config(noreplace) $(PAM_CONFIG_DIR)/wbem" \          @$(ECHO-E) "%config(noreplace) $(PAM_CONFIG_DIR)/$(PAM_CONFIG_FILE)" \
             >> $(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) "%ghost %config(noreplace)" \         @$(ECHO-E) "%ghost %config(noreplace)" \

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