85 lines
4.0 KiB
Diff
85 lines
4.0 KiB
Diff
--- pegasus/mak/config-linux.mak_old 2007-11-07 11:10:31.000000000 +0100
|
|
+++ pegasus/mak/config-linux.mak 2007-11-07 11:14:48.000000000 +0100
|
|
@@ -119,7 +119,8 @@
|
|
ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
|
|
FLAGS += -g
|
|
else
|
|
- FLAGS += -s
|
|
+# FLAGS += -s
|
|
+# ^= let rpm handle stripping
|
|
#
|
|
# The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
|
|
# appeared in the 3.0 series of compilers.
|
|
--- pegasus/Makefile.Release_old 2007-11-07 10:49:01.000000000 +0100
|
|
+++ pegasus/Makefile.Release 2007-11-07 11:08:05.000000000 +0100
|
|
@@ -366,10 +366,10 @@
|
|
$(foreach i, $(MANAGEDSYSTEM_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);)
|
|
|
|
stage_PegasusVarDataDirectoryFiles: FORCE
|
|
- $(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_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
|
|
|
|
setpermissions_PegasusVarDataDirectoryFiles: FORCE
|
|
- $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
|
|
+ $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
|
|
|
|
stage_genOpenPegasusSSLCertsFile: FORCE
|
|
@$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
|
|
@@ -1037,7 +1037,7 @@
|
|
"/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
|
|
@$(ECHO-E) "%config(noreplace) %attr($(Prw_r__r__), " \
|
|
"$(CIMSERVER_USR), $(CIMSERVER_GRP))" \
|
|
- "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
|
|
+ "$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
|
|
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
|
|
@$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
|
|
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
|
|
--- pegasus/env_var_Linux.status_old 2007-11-07 10:44:43.000000000 +0100
|
|
+++ pegasus/env_var_Linux.status 2007-11-07 10:48:47.000000000 +0100
|
|
@@ -19,7 +19,9 @@
|
|
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
|
|
endif
|
|
|
|
-PEGASUS_DISABLE_CQL=true
|
|
+PEGASUS_ENABLE_CQL=true
|
|
+PEGASUS_DEFAULT_ENABLE_OOP = false
|
|
+
|
|
PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
|
|
PEGASUS_DISABLE_PERFINST=yes
|
|
PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
|
|
@@ -28,7 +30,6 @@
|
|
PEGASUS_USE_SSL_RANDOMFILE=false
|
|
PEGASUS_NOASSERTS=yes
|
|
PEGASUS_PAM_AUTHENTICATION=true
|
|
-PEGASUS_USE_PAM_STANDALONE_PROC=true
|
|
PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
|
|
PEGASUS_USE_RELEASE_DIRS=true
|
|
PEGASUS_USE_SYSLOGS=true
|
|
@@ -67,22 +68,21 @@
|
|
PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
|
|
PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
|
|
PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
|
|
+PEGASUS_CONFIG_DIR = /etc/Pegasus
|
|
PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
|
|
PEGASUS_PLANNED_CONFIG_FILE_PATH = \
|
|
- $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
|
|
+ $(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
|
|
PEGASUS_CURRENT_CONFIG_FILE = cimserver_current.conf
|
|
PEGASUS_CURRENT_CONFIG_FILE_PATH = \
|
|
- $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
|
|
+ $(PEGASUS_CONFIG_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
|
|
|
|
PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
|
|
PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
|
|
|
|
-PEGASUS_CONFIG_DIR = /etc/Pegasus
|
|
-
|
|
PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
|
|
PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
|
|
PEGASUS_CIMSERVER_START_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
|
|
-PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
|
|
+PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)
|
|
PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = \
|
|
$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
|
|
|