summaryrefslogtreecommitdiffstats
path: root/Makefile.Release
diff options
context:
space:
mode:
authordenise.eckstein <denise.eckstein>2005-03-24 07:41:48 +0000
committerdenise.eckstein <denise.eckstein>2005-03-24 07:41:48 +0000
commit277d5458014929885f6e85dc2fc4d32729db0d77 (patch)
tree159133726c9e8507e940b594b4cd05d7a948f64b /Makefile.Release
parent616df6c8339dfc1417c5af1247af48828bf77e57 (diff)
downloadtog-pegasus-277d5458014929885f6e85dc2fc4d32729db0d77.zip
tog-pegasus-277d5458014929885f6e85dc2fc4d32729db0d77.tar.gz
tog-pegasus-277d5458014929885f6e85dc2fc4d32729db0d77.tar.xz
BUG#: 3086
TITLE: Need automated mechanism to generate tog-pegasus.spec DESCRIPTION: Added additional uninstall file cleanup.
Diffstat (limited to 'Makefile.Release')
-rw-r--r--Makefile.Release24
1 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.Release b/Makefile.Release
index dcdc3fd..4887452 100644
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -412,7 +412,6 @@ setpermissions_PegasusMOFDirectoryFiles: FORCE
stage_PegasusVarDataDirectoryFiles: FORCE
$(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
- $(TOUCH) $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
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)
@@ -577,7 +576,7 @@ _append_OpenPegasusLicenseToSpecFile: FORCE
@$(ECHO-E) "# WARNING: This file is automatically generated by executing " >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "# make -f pegasus/Makefile.Release create_OpenPegasusRPMSpecFile" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "# Any changes made directly to this file will be lost the next " >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) "# this file is generated." >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "# time this file is generated." >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -615,6 +614,9 @@ _append_PreambleToSpecFile: FORCE
$(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%global PEGASUS_RPM_HOME \044RPM_BUILD_ROOT/build/tog-pegasus" >> \
$(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "%global PEGASUS_INSTALL_LOG \044PEGASUS_LOG_DIR/install.log" >> \
+ $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%ifarch ia64 x86_64" >> \
$(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU" >> \
@@ -743,8 +745,7 @@ _append_postSectionToSpecFile_createSymbolicLinks: FORCE
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
_append_postSectionToSpecFile_createLog: FORCE
- @$(ECHO-E) " %define INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) " echo \`date\` > %INSTALL_LOG 2>&1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) " echo \`date\` > %PEGASUS_INSTALL_LOG 2>&1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " %define PEGASUS_CONFIG_DIR $(PEGASUS_CONFIG_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " %define PEGASUS_PEM_DIR $(PEGASUS_PEM_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " %define PEGASUS_SSL_CERT_FILE $(PEGASUS_SSL_CERT_FILE)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -761,6 +762,11 @@ _append_preunSectionToSpecFile: FORCE
@$(ECHO-E) " if [ \"\044isRunning\" ]; then" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " $(PEGASUS_SBIN_DIR)/cimserver -s" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) " [ -f $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE) ] && \
+ rm $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE);" >> \
+ $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) " [ -f %PEGASUS_INSTALL_LOG ] && rm %PEGASUS_INSTALL_LOG;" >> \
+ $(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) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -769,12 +775,6 @@ _append_preunSectionToSpecFile: FORCE
_append_postunSectionToSpecFile: FORCE
@$(ECHO-E) "%postun" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "if [ \044\061 -eq 0 ]; then" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) " [ \"\044PEGASUS_VARDATA_DIR\" != \"/\" ] && [ -d \044PEGASUS_VARDATA_DIR ] && rm -rf \044PEGASUS_VARDATA_DIR;" >> \
- $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) " [ \"\044PEGASUS_PROD_DIR\" != \"/\" ] && [ -d \044PEGASUS_PROD_DIR ] && rm -rf \044PEGASUS_PROD_DIR;" >> \
- $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) " [ \"\044PEGASUS_CONFIG_DIR\" != \"/\" ] && [ -d \044PEGASUS_CONFIG_DIR ] && rm -rf \044PEGASUS_CONFIG_DIR;" >> \
- $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " export LC_ALL=C">> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -807,8 +807,8 @@ _append_filesSectionToSpecFile: FORCE
@$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), \
$(ECHO-E) "%attr($(Pr__r__r__),root,root) $(PEGASUS_MOF_DIR)/Pegasus/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) "%config %attr($(Prw_r__r__),root,root) $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) "%config(missingok) %attr($(Prw_r__r__),root,root) $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "%config(noreplace) %attr($(Prw_r__r__),root,root) \
+ $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%config %attr($(Pr_x______),root,root) /etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%config %attr(-,root,root) %PAM_CONFIG_DIR/wbem" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)