summaryrefslogtreecommitdiffstats
path: root/Makefile.Release
diff options
context:
space:
mode:
authordenise.eckstein <denise.eckstein>2008-05-06 19:12:00 +0000
committerdenise.eckstein <denise.eckstein>2008-05-06 19:12:00 +0000
commitfe86178df2221bfc0d340c952f195b287c470996 (patch)
tree303174299c92c7147bce1de149bcc110a4023a04 /Makefile.Release
parent52e48dd0b9d4d833c851a2ba6b0b8efc6ca58382 (diff)
downloadtog-pegasus-fe86178df2221bfc0d340c952f195b287c470996.zip
tog-pegasus-fe86178df2221bfc0d340c952f195b287c470996.tar.gz
tog-pegasus-fe86178df2221bfc0d340c952f195b287c470996.tar.xz
BUG#: 7638
TITLE: RPM Build Failure - File not found - /var/tmp/tog-pegasus-2.8.0-1.el5-root/usr/lib64/libCMPIProviderManager.so DESCRIPTION: Added support for libCMPIProviderManager to RPM.
Diffstat (limited to 'Makefile.Release')
-rw-r--r--Makefile.Release32
1 files changed, 21 insertions, 11 deletions
diff --git a/Makefile.Release b/Makefile.Release
index c1c5117..372b5f7 100644
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -123,7 +123,7 @@ ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
PEGASUS_LIBRARIES += \
libcmpiCppImpl
PEGASUS_PROVIDER_MANAGERS += \
- libCMPIProviderManager
+ libCMPIProviderManager
endif
@@ -144,14 +144,6 @@ PEGASUS_LIBRARY_LINKS = \
libDefaultProviderManager \
libCIMxmlIndicationHandler
-ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
-PEGASUS_PROVIDER_MANAGER_LINKS += \
- libCMPIProviderManager
-endif
-
-
-
-
ifdef PEGASUS_USE_NET_SNMP
PEGASUS_LIBRARY_LINKS += \
libsnmpIndicationHandler
@@ -314,7 +306,7 @@ setpermissions_PegasusProviderLibraryDirectoryFiles: FORCE
stage_PegasusProviderManagerLibraryDirectoryFiles: FORCE
$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX);)
- $(foreach i, $(PEGASUS_PROVIDER_MANAGER_LINKS), $(MAKE) --directory=${ROOT} -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)
+ $(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(MAKE) --directory=${ROOT} -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)
setpermissions_PegasusProviderManagerLibraryDirectoryFiles: FORCE
$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(MAKE) --directory=${ROOT} -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX);)
@@ -632,10 +624,12 @@ create_ProductInstallationVerificationScript: FORCE
@$(foreach i, $(PEGASUS_LIBRARY_LINKS), $(ECHO-E) \
"ls -l $(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
>> $(PEGASUS_HOME)/PegasusVerifyInstall;)
+ @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PACKAGED PROVIDER MANAGER FILES\"" \
+ >> $(PEGASUS_HOME)/PegasusVerifyInstall
@$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \
"ls -l $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_SUFFIX)" \
>> $(PEGASUS_HOME)/PegasusVerifyInstall;)
- @$(foreach i, $(PEGASUS_PROVIDER_MANAGER_LINKS), $(ECHO-E) \
+ @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \
"ls -l $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
>> $(PEGASUS_HOME)/PegasusVerifyInstall;)
@$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PACKAGED PROVIDER FILES\"" \
@@ -972,6 +966,14 @@ _append_postSectionToSpecFile_createSymbolicLinks: FORCE
$(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) " # Create Symbolic Links for Packaged Provider Managers"\
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) " #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), $(ECHO-E) \
+ " ln -sf $(i)$(LIB_SUFFIX)\
+ $(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
+ @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
_append_postSectionToSpecFile_createLog: FORCE
@$(ECHO-E) " echo \`date\` > %PEGASUS_INSTALL_LOG 2>&1" \
@@ -1051,6 +1053,8 @@ _append_filesSectionToSpecFile: FORCE
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2) " \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%dir %attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))"\
"$(PEGASUS_CONFIG_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -1099,6 +1103,9 @@ _append_filesSectionToSpecFile: FORCE
@$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
"$(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_SUFFIX)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
+ "$(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/*$(LIB_SUFFIX)" \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \
"$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%attr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
@@ -1115,6 +1122,9 @@ _append_filesSectionToSpecFile: FORCE
@$(foreach i, $(PEGASUS_PROVIDERS), \
$(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH);)
+ @$(foreach i, $(PEGASUS_PROVIDER_MANAGERS), \
+ $(ECHO-E) "$(PEGASUS_PROVIDER_MANAGER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
include $(ROOT)/mak/commands.mak