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

Diff for /pegasus/Makefile.Release between version 1.53 and 1.78

version 1.53, 2006/01/25 21:51:24 version 1.78, 2007/10/17 23:46:17
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 57 
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 94 
Line 97 
    libpeghandlerservice \    libpeghandlerservice \
    libpegindicationservice \    libpegindicationservice \
    libpeglistener \    libpeglistener \
      libpegpmservice \
    libpegprm \    libpegprm \
    libpegprovider \    libpegprovider \
    libpegprovidermanager \    libpegprovidermanager \
Line 105 
Line 109 
    libCertificateProvider \    libCertificateProvider \
    libpegqueryexpression \    libpegqueryexpression \
    libpegquerycommon \    libpegquerycommon \
    libInteropProvider \  
    libCIMOMStatDataProvider \  
    libpegservice    libpegservice
  
 ifndef PEGASUS_DISABLE_CQL ifndef PEGASUS_DISABLE_CQL
Line 121 
Line 123 
    libcmpiCppImpl    libcmpiCppImpl
 endif endif
  
   ifdef PEGASUS_USE_NET_SNMP
      PEGASUS_LIBRARIES += \
         libsnmpIndicationHandler
   endif
   
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
 PEGASUS_LIBRARIES += \ PEGASUS_LIBRARIES += \
    libNTPProviderSecurity    libNTPProviderSecurity
Line 138 
Line 145 
    libCMPIProviderManager    libCMPIProviderManager
 endif endif
  
   ifdef PEGASUS_USE_NET_SNMP
   PEGASUS_LIBRARY_LINKS += \
      libsnmpIndicationHandler
   endif
   
 PEGASUS_PROVIDERS = \ PEGASUS_PROVIDERS = \
    libComputerSystemProvider \    libComputerSystemProvider \
    libOSProvider \    libOSProvider \
Line 155 
Line 167 
    cimauth \    cimauth \
    cimconfig \    cimconfig \
    cimserver \    cimserver \
    cimuser \  
    cimprovagt \    cimprovagt \
    cimservera \    cimservera \
      cimreparchive \
      cimtrust \
    repupgrade    repupgrade
  
   ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
      PEGASUS_ADMIN_CMDS += \
         cimservermain \
         cimshutdown
   endif
   
 PEGASUS_USER_CMDS = \ PEGASUS_USER_CMDS = \
    cimmof \    cimmof \
    cimmofl \    cimmofl \
    cimprovider \    cimprovider \
      cimsub \
    osinfo \    osinfo \
    wbemexec    wbemexec
  
 PEGASUS_GENERATED_SCRIPTS = \ PEGASUS_GENERATED_SCRIPTS = \
    genOpenPegasusSSLCerts \     genOpenPegasusSSLCerts
    init_repository  
  
 ifeq ($(OS),linux) ifeq ($(OS),linux)
    PEGASUS_CVS_SCRIPTS += \    PEGASUS_CVS_SCRIPTS += \
Line 190 
Line 209 
 PEGASUS_UNIX_MAN_USER_PAGES = \ PEGASUS_UNIX_MAN_USER_PAGES = \
    cimmof.1 \    cimmof.1 \
    cimprovider.1 \    cimprovider.1 \
      cimsub.1 \
    osinfo.1 \    osinfo.1 \
    wbemexec.1    wbemexec.1
  
 PEGASUS_UNIX_MAN_ADMIN_PAGES = \ PEGASUS_UNIX_MAN_ADMIN_PAGES = \
    cimauth.8 \    cimauth.8 \
    cimconfig.8 \    cimconfig.8 \
      cimreparchive.8 \
      cimtrust.8 \
    cimserver.8    cimserver.8
  
 PEGASUS_DOC_FILES = \ PEGASUS_DOC_FILES = \
Line 203 
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 485 
Line 276 
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)
  
 setpermissions_PegasusSocketDirectory: FORCE setpermissions_PegasusSocketDirectory: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)
   
   stage_PegasusVarRunDirectory: FORCE
           $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_VARRUN_DIR)
   
   setpermissions_PegasusVarRunDirectory: FORCE
           $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARRUN_DIR)
  
 stage_PegasusLocalAuthDirectory: FORCE stage_PegasusLocalAuthDirectory: FORCE
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR)         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR)
Line 509 
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 534 
Line 323 
         $(CPDIRHIER) $(NAMESPACE_DIR_NAME) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)         $(CPDIRHIER) $(NAMESPACE_DIR_NAME) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)
  
 setpermissions_RepositoryNamespaceDirectory: FORCE setpermissions_RepositoryNamespaceDirectory: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes          $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes
         $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes          $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances
         $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances          $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/qualifiers          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/qualifiers
         $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/qualifiers          $(MAKE) -f $(ROOT)/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 stage_PegasusRepositoryDirectories: FORCE
         $(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)         $(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)
Line 548 
Line 337 
         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) --directory=$(PEGASUS_HOME)/repository -f $(ROOT)/Makefile.Release stage_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) --directory=$(PEGASUS_HOME)/repository -f $(ROOT)/Makefile.Release stage_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)
  
 setpermissions_PegasusRepositoryDirectories: FORCE setpermissions_PegasusRepositoryDirectories: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)          $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)
         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)
  
 stage_PegasusUnixManPageDirectoryFiles: FORCE stage_PegasusUnixManPageDirectoryFiles: FORCE
Line 565 
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 591 
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="$(Pr________)" 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="$(INSTALL_USR)" GROUP="$(INSTALL_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 614 
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 683 
Line 437 
         $(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/tog-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/tog-pegasus
           @$(ECHO-E) "PEGASUS_SCRIPT_DIR=$(PEGASUS_SCRIPT_DIR)" >> $(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/tog-pegasus
           @$(ECHO-E) "PEGASUS_SSL_CERT_FILE=$(PEGASUS_SSL_CERT_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/tog-pegasus
           @$(ECHO-E) "PEGASUS_SSL_TRUSTSTORE=$(PEGASUS_SSL_CLIENT_TRUSTSTORE)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
         $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus         $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
 endif endif
  
 setpermissions_PegasusSystemFiles: FORCE setpermissions_PegasusSystemFiles: FORCE
 ifeq ($(OS),linux) ifeq ($(OS),linux)
 ifdef PEGASUS_PAM_AUTHENTICATION ifdef PEGASUS_PAM_AUTHENTICATION
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/wbem          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/wbem
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_______)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/access.conf          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_______)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/access.conf
 endif endif
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)etc/init.d/tog-pegasus          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)etc/init.d/tog-pegasus
 endif endif
  
 stage_PegasusEmptyFiles: FORCE stage_PegasusEmptyFiles: FORCE
Line 730 
Line 489 
              >>  $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >>  $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) " " \         @$(ECHO-E) " " \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSLCLIENT_CERTIFICATEFILE" \          @$(ECHO-E) "# define PEGASUS_CIMSERVER_START_FILE"  \
                "\""$(PEGASUS_CIMSERVER_START_FILE)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_CIMSERVER_START_LOCK_FILE"  \
                "\""$(PEGASUS_CIMSERVER_START_LOCK_FILE)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_REPOSITORY_DIR"  \
                "\""$(PEGASUS_REPOSITORY_DIR)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_CURRENT_CONFIG_FILE_PATH"  \
                "\""$(PEGASUS_CURRENT_CONFIG_FILE_PATH)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_PLANNED_CONFIG_FILE_PATH"  \
                "\""$(PEGASUS_PLANNED_CONFIG_FILE_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# define PEGASUS_SSLCLIENT_CERTIFICATEFILE"  \         @$(ECHO-E) "# define PEGASUS_SSLCLIENT_CERTIFICATEFILE"  \
              "\""$(PEGASUS_SSL_CLIENT_TRUSTSTORE)"\"" \              "\""$(PEGASUS_SSL_CLIENT_TRUSTSTORE)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSLCLIENT_RANDOMFILE" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSLCLIENT_RANDOMFILE"  \         @$(ECHO-E) "# define PEGASUS_SSLCLIENT_RANDOMFILE"  \
              "\""$(PEGASUS_VARDATA_DIR)/ssl.rnd"\"" \              "\""$(PEGASUS_VARDATA_DIR)/ssl.rnd"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_LOCAL_AUTH_DIR" \          @$(ECHO-E) "# define PEGASUS_SSLSERVER_RANDOMFILE"  \
                "\""$(PEGASUS_VARDATA_DIR)/cimserver.rnd"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# define PEGASUS_LOCAL_AUTH_DIR"  \         @$(ECHO-E) "# define PEGASUS_LOCAL_AUTH_DIR"  \
              "\""$(PEGASUS_LOCAL_AUTH_DIR)"\"" \              "\""$(PEGASUS_LOCAL_AUTH_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH"  \         @$(ECHO-E) "# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH"  \
              "\""$(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH)"\"" \              "\""$(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_CORE_DIR" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_CORE_DIR"  \         @$(ECHO-E) "# define PEGASUS_CORE_DIR"  \
              "\""$(PEGASUS_VARDATA_CACHE_DIR)"\"" \              "\""$(PEGASUS_VARDATA_CACHE_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_PAM_STANDALONE_PROC_NAME" \  
              >> $(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"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_PROVIDER_AGENT_PROC_NAME" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_PROVIDER_AGENT_PROC_NAME"  \         @$(ECHO-E) "# define PEGASUS_PROVIDER_AGENT_PROC_NAME"  \
              "\""$(PEGASUS_SBIN_DIR)/cimprovagt"\"" \              "\""$(PEGASUS_SBIN_DIR)/cimprovagt"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef CIMSERVER_LOCK_FILE" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define CIMSERVER_LOCK_FILE"  \  
              "\""$(CIMSERVER_LOCK_FILE)"\"" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) " " \         @$(ECHO-E) " " \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "#endif /* Common_Product_Directory_Structure_h */ " \         @$(ECHO-E) "#endif /* Common_Product_Directory_Structure_h */ " \
Line 785 
Line 543 
              >>  $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >>  $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) " " \         @$(ECHO-E) " " \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_PLANNED_CONFIG_FILE_PATH" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_PLANNED_CONFIG_FILE_PATH"  \  
              "\""$(PEGASUS_PLANNED_CONFIG_FILE_PATH)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# undef PEGASUS_CURRENT_CONFIG_FILE_PATH" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_CURRENT_CONFIG_FILE_PATH"  \  
              "\""$(PEGASUS_CURRENT_CONFIG_FILE_PATH)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# undef PEGASUS_CIMSERVER_START_FILE" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_CIMSERVER_START_FILE"  \  
              "\""$(PEGASUS_CIMSERVER_START_FILE)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# undef PEGASUS_LOG_DIR" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_LOG_DIR"  \         @$(ECHO-E) "# define PEGASUS_LOG_DIR"  \
              "\""$(PEGASUS_LOG_DIR)"\"" \              "\""$(PEGASUS_LOG_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_TRACE_FILE_PATH" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_TRACE_FILE_PATH"  \         @$(ECHO-E) "# define PEGASUS_TRACE_FILE_PATH"  \
              "\""$(PEGASUS_TRACE_FILE_PATH)"\"" \              "\""$(PEGASUS_TRACE_FILE_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_CONFIG_DIR" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_CONFIG_DIR"  \         @$(ECHO-E) "# define PEGASUS_CONFIG_DIR"  \
              "\""$(PEGASUS_CONFIG_DIR)"\"" \              "\""$(PEGASUS_CONFIG_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSL_CERT_FILE_PATH" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSL_CERT_FILE_PATH"  \         @$(ECHO-E) "# define PEGASUS_SSL_CERT_FILE_PATH"  \
              "\""$(PEGASUS_SSL_CERT_FILE_PATH)"\"" \              "\""$(PEGASUS_SSL_CERT_FILE_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSL_KEY_FILE_PATH" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSL_KEY_FILE_PATH"  \         @$(ECHO-E) "# define PEGASUS_SSL_KEY_FILE_PATH"  \
              "\""$(PEGASUS_SSL_KEY_FILE_PATH)"\"" \              "\""$(PEGASUS_SSL_KEY_FILE_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSL_SERVER_TRUSTSTORE" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSL_SERVER_TRUSTSTORE"  \         @$(ECHO-E) "# define PEGASUS_SSL_SERVER_TRUSTSTORE"  \
              "\""$(PEGASUS_SSL_SERVER_TRUSTSTORE)"\"" \              "\""$(PEGASUS_SSL_SERVER_TRUSTSTORE)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSL_EXPORT_TRUSTSTORE" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSL_EXPORT_TRUSTSTORE"  \  
              "\""$(PEGASUS_SSL_EXPORT_TRUSTSTORE)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# undef PEGASUS_SSL_SERVER_CRL" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSL_SERVER_CRL"  \         @$(ECHO-E) "# define PEGASUS_SSL_SERVER_CRL"  \
              "\""$(PEGASUS_SSL_SERVER_CRL)"\"" \              "\""$(PEGASUS_SSL_SERVER_CRL)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_REPOSITORY_DIR" \          @$(ECHO-E) "# define PEGASUS_PREV_REPOSITORY_DIR"  \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h               "\""$(PEGASUS_PREV_REPOSITORY_DIR)"\"" \
         @$(ECHO-E) "# define PEGASUS_REPOSITORY_DIR"  \  
              "\""$(PEGASUS_REPOSITORY_DIR)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# undef PEGASUS_PROVIDER_LIB_DIR" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# define PEGASUS_PROVIDER_LIB_DIR"  \         @$(ECHO-E) "# define PEGASUS_PROVIDER_LIB_DIR"  \
              "\""$(PEGASUS_PROVIDER_LIB_DIR)"\"" \              "\""$(PEGASUS_PROVIDER_LIB_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_MESSAGE_DIR" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_MESSAGE_DIR"  \  
              "\""$(PEGASUS_MESSAGE_DIR)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) " " \         @$(ECHO-E) " " \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "#endif /* Config_Product_Directory_Structure_h */ " \         @$(ECHO-E) "#endif /* Config_Product_Directory_Structure_h */ " \
Line 940 
Line 655 
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_SSL_SERVER_TRUSTSTORE)" \         @$(ECHO-E) "ls -ld $(PEGASUS_SSL_SERVER_TRUSTSTORE)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_SSL_EXPORT_TRUSTSTORE)" \  
              >> $(PEGASUS_HOME)/PegasusVerifyInstall  
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS CONF FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS CONF FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_CONFIG_DIR)/ssl.cnf*" \         @$(ECHO-E) "ls -ld $(PEGASUS_CONFIG_DIR)/ssl.cnf*" \
Line 1004 
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)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.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)
           @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-buildRequires.spec \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   ifdef PEGASUS_USE_NET_SNMP
           @$(ECHO-E) "BuildRequires:      net-snmp-devel" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
           @$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# End of section " \
               "pegasus/rpm/tog-specfiles/tog-pegasus-buildRequires.spec" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-requires.spec \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   ifdef PEGASUS_USE_NET_SNMP
           @$(ECHO-E) "Requires:           net-snmp" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
           @$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# End of section " \
               "pegasus/rpm/tog-specfiles/tog-pegasus-requires.spec" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-desc.spec \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.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)
Line 1045 
Line 786 
         @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_FILE" \         @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_FILE" \
              "$(PEGASUS_CIMSERVER_START_FILE)"  \              "$(PEGASUS_CIMSERVER_START_FILE)"  \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global CIMSERVER_LOCK_FILE" \          @$(ECHO-E) "%global PEGASUS_TRACE_FILE_PATH" \
              "$(CIMSERVER_LOCK_FILE)"  \               "$(PEGASUS_TRACE_FILE_PATH)"  \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_LOCK_FILE" \
                "$(PEGASUS_CIMSERVER_START_LOCK_FILE)"  \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_REPOSITORY_DIR $(PEGASUS_REPOSITORY_DIR)" \         @$(ECHO-E) "%global PEGASUS_REPOSITORY_DIR $(PEGASUS_REPOSITORY_DIR)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1068 
Line 812 
              "\044RPM_BUILD_DIR/\044RPM_PACKAGE_NAME-\044RPM_PACKAGE_VERSION"\              "\044RPM_BUILD_DIR/\044RPM_PACKAGE_NAME-\044RPM_PACKAGE_VERSION"\
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) \         @$(ECHO-E) \
              "%global PEGASUS_RPM_HOME \044RPM_BUILD_ROOT/build/tog-pegasus"\               "%global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build"\
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(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)
Line 1108 
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
           @$(ECHO-E) "# When Privilege Separation is enabled, create the" \
               "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \
               "as the context of the cimservermain process" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "if [ \044\061 -gt 0 ]; then" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "    /usr/sbin/groupadd $(CIMSERVERMAIN_GRP) > /dev/null" \
               "2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "    /usr/sbin/useradd -c \"tog-pegasus OpenPegasus"\
               "WBEM/CIM services\" \\" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "        -g $(CIMSERVERMAIN_GRP) -s /sbin/nologin -r -d" \
               "%PEGASUS_VARDATA_DIR $(CIMSERVERMAIN_USR) \\" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "        > /dev/null 2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
  
 _append_postSectionToSpecFile: FORCE _append_postSectionToSpecFile: FORCE
         @$(ECHO-E) "%post" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%post" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1123 
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) "   # Check if the cimserver is running" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   isRunning=\`ps -el | grep cimserver | grep -v" \
               "\"grep cimserver\"\`" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   if [ \"\044isRunning\" ]; then" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "       /etc/init.d/tog-pegasus stop" \
               >> $(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" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "     # Running Repository Upgrade utility" \          @$(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)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "     %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG" \          @$(ECHO-E) "       chgrp -R $(CIMSERVERMAIN_GRP) %PEGASUS_REPOSITORY_DIR" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   /etc/init.d/tog-pegasus condrestart" \  ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
           @$(ECHO-E) "   if [ -f %PEGASUS_TRACE_FILE_PATH ]; then" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "     /bin/mv %PEGASUS_TRACE_FILE_PATH" \
            "%PEGASUS_TRACE_FILE_PATH-\`date '+%Y-%m-%d-%R'\`" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
           @$(ECHO-E) "   if [ \"\044isRunning\" ]; then" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "       /etc/init.d/tog-pegasus start" \
               >> $(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) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
Line 1185 
Line 975 
         @$(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
           @$(ECHO-E) "# When Privilege Separation is enabled, delete the" \
               "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \
               "as the context of the cimservermain process" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "if [ \044\061 -eq 0 ]; then" \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "    /usr/sbin/userdel $(CIMSERVERMAIN_USR) > /dev/null" \
               "2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "    /usr/sbin/groupdel $(CIMSERVERMAIN_GRP) > /dev/null" \
               "2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "fi"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
  
 # %defattr(file permissions, owner, group, directory permissions) # %defattr(file permissions, owner, group, directory permissions)
 # The %ghost directive instructs RPM not to install the specified file(s). # The %ghost directive instructs RPM not to install the specified file(s).
Line 1194 
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),"\
                "$(CIMSERVERMAIN_GRP), $(Prwx______))" \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "$(PEGASUS_REPOSITORY_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%defattr($(Prw_______), $(INSTALL_USR),"\         @$(ECHO-E) "%defattr($(Prw_______), $(INSTALL_USR),"\
              "$(INSTALL_GRP), $(Prwxr_xr_x))" \              "$(INSTALL_GRP), $(Prwxr_xr_x))" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1202 
Line 1011 
              if [ $(i) != $(PEGASUS_REPOSITORY_DIR) ]; then \              if [ $(i) != $(PEGASUS_REPOSITORY_DIR) ]; then \
              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 \
                    $(ECHO-E) "%dir $(i)" >> \                    $(ECHO-E) "%dir $(i)" >> \
              $(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi; fi; fi;)               $(PEGASUS_RPM_SPEC_FILE_PATH); 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_x___), $(CIMSERVER_USR)," \          @$(ECHO-E) "%dir %attr($(Prwxr_xr_x), $(CIMSERVER_USR)," \
              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr(1555,$(CIMSERVER_USR),$(CIMSERVER_GRP))" \          @$(ECHO-E) "%dir %attr($(Prwxr_xr_x), $(CIMSERVERMAIN_USR)," \
                "$(CIMSERVERMAIN_GRP)) $(PEGASUS_VARRUN_DIR)" \
                 >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(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) "%dir %attr($(Prwxr_x___), $(CIMSERVER_USR)," \  
              "$(CIMSERVER_GRP)) $(PEGASUS_REPOSITORY_DIR)" \  
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "$(PEGASUS_REPOSITORY_DIR)/*" \  
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)/*" \  
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "$(PEGASUS_MOF_DIR)/Pegasus/*" \         @$(ECHO-E) "$(PEGASUS_MOF_DIR)/Pegasus/*" \
             >> $(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) "%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)" \          @$(ECHO-E) "%config(noreplace) %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" \
Line 1253 
Line 1060 
         @$(ECHO-E) "%ghost $(PEGASUS_INSTALL_LOG)" \         @$(ECHO-E) "%ghost $(PEGASUS_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) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \          @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_SBIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_SBIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_BIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_BIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1267 
Line 1074 
            "$(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))" \
            "$(PEGASUS_MANUSER_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_MANUSER_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prw_r_____),$(INSTALL_USR),$(INSTALL_GRP))" \          @$(ECHO-E) "%attr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_MANADMIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_MANADMIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(PEGASUS_DOC_FILES), \         @$(foreach i, $(PEGASUS_DOC_FILES), \

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