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

Diff for /pegasus/Makefile.Release between version 1.73 and 1.82

version 1.73, 2007/09/11 19:03:57 version 1.82, 2008/03/24 16:11:15
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 110 
Line 111 
    libpegquerycommon \    libpegquerycommon \
    libpegservice    libpegservice
  
 ifndef PEGASUS_DISABLE_CQL  ifeq ($(PEGASUS_ENABLE_CQL),true)
    PEGASUS_LIBRARIES += \    PEGASUS_LIBRARIES += \
       libpegcql \       libpegcql \
       libCIMQueryCapabilitiesProvider       libCIMQueryCapabilitiesProvider
Line 187 
Line 188 
    wbemexec    wbemexec
  
 PEGASUS_GENERATED_SCRIPTS = \ PEGASUS_GENERATED_SCRIPTS = \
    genOpenPegasusSSLCerts \     genOpenPegasusSSLCerts
    init_repository  
  
 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 225 
Line 225 
    PegasusSSLGuidelines.htm \    PegasusSSLGuidelines.htm \
    license.txt    license.txt
  
 CIM29_MOF_FILES = \  
    Application_AppRuntime.mof \  
    Application_BIOS.mof \  
    Application_CheckAction.mof \  
    Application_DeploymentModel.mof \  
    Application_InstalledProduct.mof \  
    Application_J2eeAppServer.mof \  
    Application_J2eeAppServerStats.mof \  
    Application_SystemSoftware.mof \  
    CIM_Application.mof \  
    CIM_Core.mof \  
    CIM_Database.mof \  
    CIM_Device.mof \  
    CIM_Event.mof \  
    CIM_IPsecPolicy.mof \  
    CIM_Interop.mof \  
    CIM_Metrics.mof \  
    CIM_Network.mof \  
    CIM_Physical.mof \  
    CIM_Policy.mof \  
    CIM_Schema.mof \  
    CIM_Support.mof \  
    CIM_System.mof \  
    CIM_User.mof \  
    Core_Capabilities.mof \  
    Core_Collection.mof \  
    Core_CoreElements.mof \  
    Core_Device.mof \  
    Core_MethodParms.mof \  
    Core_Physical.mof \  
    Core_PowerMgmt.mof \  
    Core_ProductFRU.mof \  
    Core_Qualifiers.mof \  
    Core_Redundancy.mof \  
    Core_Service.mof \  
    Core_Settings.mof \  
    Core_Software.mof \  
    Core_Statistics.mof \  
    Core_StorageExtent.mof \  
    Database_Statistics.mof \  
    Database_Storage.mof \  
    Database_System.mof \  
    Device_Controller.mof \  
    Device_CoolingAndPower.mof \  
    Device_DeviceElements.mof \  
    Device_DiskGroup.mof \  
    Device_FC.mof \  
    Device_IB.mof \  
    Device_Memory.mof \  
    Device_Modems.mof \  
    Device_NetworkAdapter.mof \  
    Device_Ports.mof \  
    Device_Printing.mof \  
    Device_Processor.mof \  
    Device_ProtocolController.mof \  
    Device_SccExtents.mof \  
    Device_Sensors.mof \  
    Device_StorageDevices.mof \  
    Device_StorageExtents.mof \  
    Device_StorageLib.mof \  
    Device_StorageServices.mof \  
    Device_USB.mof \  
    Device_UserDevices.mof \  
    Metrics_BaseMetric.mof \  
    Metrics_UnitOfWork.mof \  
    Network_BGP.mof \  
    Network_Buffers.mof \  
    Network_Collections.mof \  
    Network_Filtering.mof \  
    Network_IPsec.mof \  
    Network_OSPF.mof \  
    Network_Pipes.mof \  
    Network_ProtocolEndpoints.mof \  
    Network_QoS.mof \  
    Network_Routes.mof \  
    Network_RoutingForwarding.mof \  
    Network_SNMP.mof \  
    Network_SwitchingBridging.mof \  
    Network_Systems.mof \  
    Network_VLAN.mof \  
    Physical_Component.mof \  
    Physical_Connector.mof \  
    Physical_Link.mof \  
    Physical_Misc.mof \  
    Physical_Package.mof \  
    Physical_PhysicalMedia.mof \  
    Physical_StoragePackage.mof \  
    System_Boot.mof \  
    System_Diagnostics.mof \  
    System_FileElements.mof \  
    System_Help.mof \  
    System_Logs.mof \  
    System_OperatingSystem.mof \  
    System_Processing.mof \  
    System_SystemElements.mof \  
    System_SystemResources.mof \  
    System_Time.mof \  
    System_Unix.mof \  
    User_AccessControl.mof \  
    User_Account.mof \  
    User_AuthenticationReqmt.mof \  
    User_Credential.mof \  
    User_Group.mof \  
    User_Identity.mof \  
    User_Kerberos.mof \  
    User_Org.mof \  
    User_Privilege.mof \  
    User_PrivilegeManagementService.mof \  
    User_PublicKey.mof \  
    User_Role.mof \  
    User_SecurityLevel.mof \  
    User_SecurityServices.mof \  
    User_SharedSecret.mof \  
    User_StorageHardwareID.mof \  
    User_UsersAccess.mof  
   
 CIM28_MOF_FILES = \  
    Application28_AppRuntime.mof \  
    Application28_BIOS.mof \  
    Application28_CheckAction.mof \  
    Application28_DeploymentModel.mof \  
    Application28_InstalledProduct.mof \  
    Application28_J2eeAppServer.mof \  
    Application28_J2eeAppServerStats.mof \  
    Application28_SystemSoftware.mof \  
    CIM_Application28.mof \  
    CIM_Core28.mof \  
    CIM_Database28.mof \  
    CIM_Device28.mof \  
    CIM_Event28.mof \  
    CIM_Interop28.mof \  
    CIM_IPsecPolicy28.mof \  
    CIM_Metrics28.mof \  
    CIM_Network28.mof \  
    CIM_Physical28.mof \  
    CIM_Policy28.mof \  
    CIM_Schema28.mof \  
    CIM_Support28.mof \  
    CIM_System28.mof \  
    CIM_User28.mof \  
    Core28_Capabilities.mof \  
    Core28_Collection.mof \  
    Core28_CoreElements.mof \  
    Core28_Device.mof \  
    Core28_MethodParms.mof \  
    Core28_Physical.mof \  
    Core28_PowerMgmt.mof \  
    Core28_ProductFRU.mof \  
    Core28_Qualifiers.mof \  
    Core28_Redundancy.mof \  
    Core28_Service.mof \  
    Core28_Settings.mof \  
    Core28_Software.mof \  
    Core28_Statistics.mof \  
    Core28_StorageExtent.mof \  
    Database28_Statistics.mof \  
    Database28_Storage.mof \  
    Database28_System.mof \  
    Device28_Controller.mof \  
    Device28_CoolingAndPower.mof \  
    Device28_DeviceElements.mof \  
    Device28_DiskGroup.mof \  
    Device28_FC.mof \  
    Device28_IB.mof \  
    Device28_Memory.mof \  
    Device28_Modems.mof \  
    Device28_NetworkAdapter.mof \  
    Device28_Ports.mof \  
    Device28_Printing.mof \  
    Device28_Processor.mof \  
    Device28_ProtocolController.mof \  
    Device28_SccExtents.mof \  
    Device28_Sensors.mof \  
    Device28_StorageDevices.mof \  
    Device28_StorageExtents.mof \  
    Device28_StorageLib.mof \  
    Device28_StorageServices.mof \  
    Device28_USB.mof \  
    Device28_UserDevices.mof \  
    Metrics28_BaseMetric.mof \  
    Metrics28_UnitOfWork.mof \  
    Network28_BGP.mof \  
    Network28_Buffers.mof \  
    Network28_Collections.mof \  
    Network28_Filtering.mof \  
    Network28_IPsec.mof \  
    Network28_OSPF.mof \  
    Network28_Pipes.mof \  
    Network28_ProtocolEndpoints.mof \  
    Network28_QoS.mof \  
    Network28_Routes.mof \  
    Network28_RoutingForwarding.mof \  
    Network28_SNMP.mof \  
    Network28_SwitchingBridging.mof \  
    Network28_Systems.mof \  
    Network28_VLAN.mof \  
    Physical28_Component.mof \  
    Physical28_Connector.mof \  
    Physical28_Link.mof \  
    Physical28_Misc.mof \  
    Physical28_Package.mof \  
    Physical28_PhysicalMedia.mof \  
    Physical28_StoragePackage.mof \  
    System28_Boot.mof \  
    System28_Diagnostics.mof \  
    System28_FileElements.mof \  
    System28_Logs.mof \  
    System28_OperatingSystem.mof \  
    System28_Processing.mof \  
    System28_SystemElements.mof \  
    System28_SystemResources.mof \  
    System28_Time.mof \  
    System28_Unix.mof \  
    User28_AccessControl.mof \  
    User28_Account.mof \  
    User28_AuthenticationReqmt.mof \  
    User28_Credential.mof \  
    User28_Group.mof \  
    User28_Identity.mof \  
    User28_Kerberos.mof \  
    User28_Org.mof \  
    User28_PrivilegeManagementService.mof \  
    User28_Privilege.mof \  
    User28_PublicKey.mof \  
    User28_Role.mof \  
    User28_SecurityLevel.mof \  
    User28_SecurityServices.mof \  
    User28_SharedSecret.mof \  
    User28_StorageHardwareID.mof \  
    User28_UsersAccess.mof  
   
 INTERNAL_MOF_FILES = \ INTERNAL_MOF_FILES = \
    PG_Authorization20.mof \    PG_Authorization20.mof \
    PG_ConfigSetting20.mof \    PG_ConfigSetting20.mof \
Line 537 
Line 306 
 stage_PegasusAdminCmdsDirectoryFiles: FORCE stage_PegasusAdminCmdsDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_ADMIN_CMDS), $(COPY) $(PEGASUS_HOME)/bin/$(i)$(EXE) $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/$(i)$(EXE);)         $(foreach i, $(PEGASUS_ADMIN_CMDS), $(COPY) $(PEGASUS_HOME)/bin/$(i)$(EXE) $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/$(i)$(EXE);)
         $(foreach i, $(PEGASUS_CVS_SCRIPTS), $(COPY) $(PEGASUS_ROOT)/installs/scripts/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/$(i);)         $(foreach i, $(PEGASUS_CVS_SCRIPTS), $(COPY) $(PEGASUS_ROOT)/installs/scripts/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/$(i);)
         @$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/init_repository  
         @$(ECHO-E) "PEGASUS_MOF_DIR=$(PEGASUS_MOF_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/init_repository  
         @$(ECHO-E) "PEGASUS_CIMXX_MOF_DIR=$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/init_repository  
         @$(ECHO-E) "PEGASUS_REPOSITORY_DIR=$(PEGASUS_REPOSITORY_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/init_repository  
         @$(ECHO-E) "PEGASUS_BIN_DIR=$(PEGASUS_BIN_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/init_repository  
         @$(ECHO-E) "PEGASUS_CIM_SCHEMA=$(PEGASUS_CIM_SCHEMA_VERSION)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/init_repository  
         @$(CAT) $(PEGASUS_ROOT)/installs/scripts/init_repository >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/init_repository  
  
 setpermissions_PegasusAdminCmdsDirectoryFiles: FORCE setpermissions_PegasusAdminCmdsDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_ADMIN_CMDS), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/$(i)$(EXE);)         $(foreach i, $(PEGASUS_ADMIN_CMDS), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/$(i)$(EXE);)
         $(foreach i, $(PEGASUS_SCRIPT_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/$(i);)         $(foreach i, $(PEGASUS_SCRIPT_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/$(i);)
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)/init_repository  
  
 stage_PegasusUserCmdsDirectoryFiles: FORCE stage_PegasusUserCmdsDirectoryFiles: FORCE
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)
Line 593 
Line 354 
 setpermissions_PegasusDocFiles: FORCE setpermissions_PegasusDocFiles: FORCE
         $(foreach i, $(PEGASUS_DOC_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)         $(foreach i, $(PEGASUS_DOC_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)
  
 copyCIMSchemaFiles: FORCE  
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)  
         $(foreach i, $($(PEGASUS_CIM_SCHEMA)_MOF_FILES), $(COPY) $(ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)/$(i);)  
   
 setpermissions_CIMSchemaFiles: FORCE  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)  
         $(foreach i, $($(PEGASUS_CIM_SCHEMA)_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)/$(i);)  
   
 stage_PegasusMOFDirectoryFiles: FORCE stage_PegasusMOFDirectoryFiles: FORCE
         $(MAKE) --directory=$(ROOT)/Schemas -f $(ROOT)/Makefile.Release copyCIMSchemaFiles  
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus
         $(foreach i, $(INTERNAL_MOF_FILES), $(COPY) $(ROOT)/Schemas/Pegasus/Internal/VER20/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)         $(foreach i, $(INTERNAL_MOF_FILES), $(COPY) $(ROOT)/Schemas/Pegasus/Internal/VER20/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
         $(foreach i, $(INTEROP_MOF_FILES), $(COPY) $(ROOT)/Schemas/Pegasus/InterOp/VER20/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)         $(foreach i, $(INTEROP_MOF_FILES), $(COPY) $(ROOT)/Schemas/Pegasus/InterOp/VER20/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
         $(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(COPY) $(ROOT)/Schemas/Pegasus/ManagedSystem/VER20/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)         $(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(COPY) $(ROOT)/Schemas/Pegasus/ManagedSystem/VER20/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
  
 setpermissions_PegasusMOFDirectoryFiles: FORCE setpermissions_PegasusMOFDirectoryFiles: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions_CIMSchemaFiles  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus
         $(foreach i, $(INTERNAL_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)         $(foreach i, $(INTERNAL_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
         $(foreach i, $(INTEROP_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)         $(foreach i, $(INTEROP_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
Line 619 
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 642 
Line 393 
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec >> \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec >> \
              $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts              $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
  
 stage_SSLRandomSeedFiles: FORCE  
         $(MAKE) -f $(ROOT)/Makefile.Release createrandomseed FILENAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_CIMSERVER_RANDOMFILE)  
         $(MAKE) -f $(ROOT)/Makefile.Release createrandomseed FILENAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_WBEMEXEC_RANDOMFILE)  
   
 setpermissions_SSLRandomSeedFiles: FORCE  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_CIMSERVER_RANDOMFILE)  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_WBEMEXEC_RANDOMFILE)  
   
 stage_ServerCertificateFiles: FORCE  
 ifdef PEGASUS_SSL_RANDOMFILE  
         $(OPENSSL_COMMAND) req -x509 -days 3650 -newkey rsa:2048 -rand $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_CIMSERVER_RANDOMFILE) -nodes -config $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/ssl.cnf -keyout $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_KEY_FILE) -out $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_CERT_FILE)  
 else  
         $(OPENSSL_COMMAND) req -x509 -days 3650 -newkey rsa:2048 -nodes -config $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/ssl.cnf -keyout $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_KEY_FILE) -out $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_CERT_FILE)  
 endif  
   
 setpermissions_ServerCertificateFiles: FORCE  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_KEY_FILE)  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_CERT_FILE)  
   
 stage_ClientCertificateFiles: FORCE  
         $(COPY) $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_CERT_FILE) $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_TRUSTSTORE)  
   
 setpermissions_ClientCertificateFiles: FORCE  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_TRUSTSTORE)  
   
 stage_PegasusDirectories: FORCE stage_PegasusDirectories: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusProductDirectories         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusProductDirectories
         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusSocketDirectory         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusSocketDirectory
Line 991 
Line 717 
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_PreambleToSpecFile: FORCE _append_PreambleToSpecFile: FORCE
           @$(ECHO-E) "%define packageVersion $(PEGASUS_PACKAGE_VERSION)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "Version: $(PEGASUS_PRODUCT_VERSION)" \         @$(ECHO-E) "Version: $(PEGASUS_PRODUCT_VERSION)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}" \          @$(ECHO-E) "Release:"\
               "%{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "Epoch:   1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "Epoch:   1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1156 
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 1173 
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 1262 
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 1275 
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_CIM_SCHEMA)/*" \  
             >> $(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.73  
changed lines
  Added in v.1.82
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2