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

Diff for /pegasus/Makefile.Release between version 1.24 and 1.36

version 1.24, 2005/04/04 05:56:07 version 1.36, 2005/05/27 17:29:01
Line 1 
Line 1 
   #//%2005////////////////////////////////////////////////////////////////////////
   #//
   #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
   #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation, The Open Group.
   #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #//
   #// Permission is hereby granted, free of charge, to any person obtaining a copy
   #// of this software and associated documentation files (the "Software"), to
   #// deal in the Software without restriction, including without limitation the
   #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   #// sell copies of the Software, and to permit persons to whom the Software is
   #// furnished to do so, subject to the following conditions:
   #//
   #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
   #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
   #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
   #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
   #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
   #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//==============================================================================
 ifndef ROOT ifndef ROOT
  ifdef PEGASUS_ROOT  ifdef PEGASUS_ROOT
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
Line 35 
Line 63 
         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusDirectories         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusDirectories
         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusFiles         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusFiles
         $(MAKE) -f $(ROOT)/mak/SDKMakefile stageSDK         $(MAKE) -f $(ROOT)/mak/SDKMakefile stageSDK
   ifdef PEGASUS_BUILD_TEST_RPM
         $(MAKE) -f $(ROOT)/Makefile.ReleaseTest stageTEST         $(MAKE) -f $(ROOT)/Makefile.ReleaseTest stageTEST
   endif
  
 preinstall: FORCE preinstall: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release prestage_verifyInstallEnabled         $(MAKE) -f $(ROOT)/Makefile.Release prestage_verifyInstallEnabled
Line 122 
Line 152 
    cimserver \    cimserver \
    cimuser \    cimuser \
    cimprovagt \    cimprovagt \
    cimservera     cimservera \
      repupgrade
  
 PEGASUS_USER_CMDS = \ PEGASUS_USER_CMDS = \
    cimmof \    cimmof \
Line 148 
Line 179 
    cimconfig.8 \    cimconfig.8 \
    cimserver.8    cimserver.8
  
   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 = \ CIM28_MOF_FILES = \
    Application28_AppRuntime.mof \    Application28_AppRuntime.mof \
    Application28_BIOS.mof \    Application28_BIOS.mof \
Line 564 
Line 711 
         @$(MAKE) -f $(ROOT)/Makefile.Release _append_preSectionToSpecFile         @$(MAKE) -f $(ROOT)/Makefile.Release _append_preSectionToSpecFile
         @$(MAKE) -f $(ROOT)/Makefile.Release _append_postSectionToSpecFile         @$(MAKE) -f $(ROOT)/Makefile.Release _append_postSectionToSpecFile
         @$(MAKE) -f $(ROOT)/Makefile.Release _append_preunSectionToSpecFile         @$(MAKE) -f $(ROOT)/Makefile.Release _append_preunSectionToSpecFile
           @$(MAKE) -f $(ROOT)/mak/SDKMakefile PEGASUS_RPM_SPEC_FILE_PATH=$(PEGASUS_RPM_SPEC_FILE_PATH) _append_preunSectionToSpecFile
           @$(MAKE) -f $(ROOT)/Makefile.ReleaseTest PEGASUS_RPM_SPEC_FILE_PATH=$(PEGASUS_RPM_SPEC_FILE_PATH) _append_preunSectionToSpecFile
         @$(MAKE) -f $(ROOT)/Makefile.Release _append_postunSectionToSpecFile         @$(MAKE) -f $(ROOT)/Makefile.Release _append_postunSectionToSpecFile
         @$(MAKE) -f $(ROOT)/Makefile.Release _append_filesSectionToSpecFile         @$(MAKE) -f $(ROOT)/Makefile.Release _append_filesSectionToSpecFile
         @$(MAKE) -f $(ROOT)/mak/SDKMakefile PEGASUS_RPM_SPEC_FILE_PATH=$(PEGASUS_RPM_SPEC_FILE_PATH) _append_filesSectionToSpecFile         @$(MAKE) -f $(ROOT)/mak/SDKMakefile PEGASUS_RPM_SPEC_FILE_PATH=$(PEGASUS_RPM_SPEC_FILE_PATH) _append_filesSectionToSpecFile
Line 584 
Line 733 
         @$(ECHO-E) "%define srcRelease 1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%define srcRelease 1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "Version: $(PEGASUS_PRODUCT_VERSION)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "Version: $(PEGASUS_PRODUCT_VERSION)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "Release: 1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "Release: 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)
         @$(ECHO-E) "# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.spec >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.spec >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 619 
Line 769 
         @$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log" >> \         @$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%ifarch ia64 x86_64" >> \          @$(ECHO-E) "%ifarch ia64" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU" >> \         @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%else" >> \         @$(ECHO-E) "%else" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%ifarch x86_64" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_GNU" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%else" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%ifarch ppc" >> \         @$(ECHO-E) "%ifarch ppc" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU" >> \         @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%else" >> \         @$(ECHO-E) "%else" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%ifarch ppc64" >> \          @$(ECHO-E) "%ifarch ppc64 pseries" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_PPC64_GNU" >> \         @$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_PPC64_GNU" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 662 
Line 818 
         @$(ECHO-E) "%endif" >> \         @$(ECHO-E) "%endif" >> \
                     $(PEGASUS_RPM_SPEC_FILE_PATH)                     $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%endif" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_PackagesToSpecFile: FORCE _append_PackagesToSpecFile: FORCE
         @$(ECHO-E) "# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-packages.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-packages.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 684 
Line 843 
 _append_buildSectionToSpecFile: FORCE _append_buildSectionToSpecFile: FORCE
         @$(ECHO-E) "%build" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%build" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%ifarch s390 s390x zseries" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "export PEGASUS_EXTRA_C_FLAGS=\"\044PEGASUS_EXTRA_C_FLAGS -fsigned-char\"" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%endif" >> \
                       $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-build.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-build.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-build.spec >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-build.spec >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "# End of section pegasus/rpm/tog-specfiles/tog-pegasus-build.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "# End of section pegasus/rpm/tog-specfiles/tog-pegasus-build.spec" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 769 
Line 935 
                        $(PEGASUS_RPM_SPEC_FILE_PATH)                        $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   [ -f %PEGASUS_INSTALL_LOG ] && rm %PEGASUS_INSTALL_LOG;" >> \         @$(ECHO-E) "   [ -f %PEGASUS_INSTALL_LOG ] && rm %PEGASUS_INSTALL_LOG;" >> \
                        $(PEGASUS_RPM_SPEC_FILE_PATH)                        $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   [ -d $(PEGASUS_REPOSITORY_DIR) ] && rm -rf $(PEGASUS_REPOSITORY_DIR);" >> \
                          $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   [ -d $(PEGASUS_VARDATA_CACHE_DIR) ] && rm -rf $(PEGASUS_VARDATA_CACHE_DIR);" >> \
                          $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   rm -f $(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH);" >> \
                          $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   rm -f $(PEGASUS_CIMSERVER_START_FILE)" >> \
                          $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   # Delete the Link to the rc.* Startup Directories" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   # Delete the Link to the rc.* Startup Directories" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   /usr/lib/lsb/remove_initd /etc/init.d/tog-pegasus;"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   /usr/lib/lsb/remove_initd /etc/init.d/tog-pegasus;"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "fi"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "fi"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 806 
Line 980 
         @$(foreach i, $(PEGASUS_UNIX_MAN_ADMIN_PAGES), \         @$(foreach i, $(PEGASUS_UNIX_MAN_ADMIN_PAGES), \
                    $(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_MANADMIN_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)                    $(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_MANADMIN_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(CIM28_MOF_FILES), \          @$(foreach i, $($(PEGASUS_CIM_SCHEMA)_MOF_FILES), \
                    $(ECHO-E) "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)                    $(ECHO-E) "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(INTERNAL_MOF_FILES), \         @$(foreach i, $(INTERNAL_MOF_FILES), \

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