Hello community, here is the log from the commit of package pcp for openSUSE:Factory checked in at 2015-03-03 11:11:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcp (Old) and /work/SRC/openSUSE:Factory/.pcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcp" Changes: -------- --- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2014-11-13 09:19:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pcp.new/pcp.changes 2015-03-03 11:11:59.000000000 +0100 @@ -1,0 +2,56 @@ +Fri Feb 27 13:18:15 UTC 2015 - [email protected] + +- Fix perl-PCP-LogImport requires version for pcp-import-sar2pcp. + +------------------------------------------------------------------- +Wed Feb 25 00:14:12 UTC 2015 - [email protected] + +- Require pcp-conf with libpcp3 on [open]SUSE platforms. + +------------------------------------------------------------------- +Mon Feb 23 20:21:40 UTC 2015 - [email protected] + +- Update to 3.10.2 + See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=HEAD + for details + +- new patches + 0007-Honor-CFLAGS-in-qmake.patch + 0008-SUSE-fy-pmsnap-control-path.patch + 0009-pmsnap-control-var-www-srv-www.patch + +- renamed patches + + pcp-xenbuild.patch to 0001-Fix-XEN-build.patch + + static_lib_perms.diff to + 0002-Install-libraries-without-exec-permission.patch + + pcp_legacy_init_lsb.patch to 0003-pcp-legacy-init-lsb.patch + + remove_cpan_rpaths.patch to 0004-Remove-CPAN-rpaths.patch + + rm_init_script_runlevel_4.patch to + 0005-Remove-runlevel-4-from-init-scripts.patch + + create-pmlogger-and-pmie-logdirs-during-install.patch + to 0006-create-pmlogger-and-pmie-logdirs-during-install.patch + +- Update to 3.10.1 + See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=HEAD + for details + +- new sub-packages + * pcp-doc + * pcp-gui + * python3-pcp + * python-pcp + * pmda-infiniband + * pmda-perfevent + * pmda-papi + * import-collectl2pcp + +- drop fix_pmie_pmlogger_startup_races.patch, upstream + drop pcp-3.6.10-gcc5-reservedword.patch, obsolete + +------------------------------------------------------------------- +Mon Feb 23 16:28:50 UTC 2015 - [email protected] + +- fix gcc5 C99 reserved issue problems with patch + pcp-3.6.10-gcc5-reservedword.patch + +------------------------------------------------------------------- Old: ---- create-pmlogger-and-pmie-logdirs-during-install.patch fix_pmie_pmlogger_startup_races.patch pcp-3.6.10.src.tar.gz pcp-xenbuild.patch pcp_legacy_init_lsb.patch remove_cpan_rpaths.patch rm_init_script_runlevel_4.patch static_lib_perms.diff New: ---- 0001-Fix-XEN-build.patch 0002-Install-libraries-without-exec-permission.patch 0003-pcp-legacy-init-lsb.patch 0004-Remove-CPAN-rpaths.patch 0005-Remove-runlevel-4-from-init-scripts.patch 0006-create-pmlogger-and-pmie-logdirs-during-install.patch 0007-Honor-CFLAGS-in-qmake.patch 0008-SUSE-fy-pmsnap-control-path.patch 0009-pmsnap-control-var-www-srv-www.patch pcp-3.10.2.src.tar.gz pcp-webjs.src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp.spec ++++++ ++++ 1651 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/pcp/pcp.spec ++++ and /work/SRC/openSUSE:Factory/.pcp.new/pcp.spec ++++++ 0001-Fix-XEN-build.patch ++++++ >From 58127dca98f11270491383946d2714fd9d983d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Fri, 12 Dec 2014 15:42:25 +0100 Subject: [PATCH 1/6] Fix XEN build --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 98d325e2bfdc..648c511dcd72 100644 --- a/configure.ac +++ b/configure.ac @@ -1079,6 +1079,7 @@ NR == 1 { if ($1 != "UID" && $1 != "USER") exit # Unix variants $2 == 1 && / init/ { print "OK"; exit } $2 == 1 && / \/etc\/init/ { print "OK"; exit } +$2 == 1 && / \/bin\/bash/ { print "OK"; exit } # Fedora 9 $2 == 1 && / \/sbin\/init/ { print "OK"; exit } # Fedora 15 -- 2.1.2 ++++++ 0002-Install-libraries-without-exec-permission.patch ++++++ >From 865c920542f1cc499500c97217bfb36b70541765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Fri, 12 Dec 2014 15:43:00 +0100 Subject: [PATCH 2/6] Install libraries without exec permission --- src/genpmda/genpmda | 4 ++-- src/libpcp/src/GNUmakefile | 4 ++-- src/libpcp_gui/src/GNUmakefile | 4 ++-- src/libpcp_import/src/GNUmakefile | 4 ++-- src/libpcp_mmv/src/GNUmakefile | 4 ++-- src/libpcp_pmda/src/GNUmakefile | 4 ++-- src/libpcp_trace/src/GNUmakefile | 4 ++-- src/pmdas/aix/GNUmakefile | 3 ++- src/pmdas/darwin/GNUmakefile | 3 ++- src/pmdas/freebsd/GNUmakefile | 3 ++- src/pmdas/linux/GNUmakefile | 3 ++- src/pmdas/linux_proc/GNUmakefile | 3 ++- src/pmdas/lustrecomm/GNUmakefile | 2 +- src/pmdas/pmcd/src/GNUmakefile | 2 +- src/pmdas/sendmail/GNUmakefile | 2 +- src/pmdas/solaris/GNUmakefile | 3 ++- 16 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/genpmda/genpmda b/src/genpmda/genpmda index 46503150c1a5..1bd2cbae3497 100755 --- a/src/genpmda/genpmda +++ b/src/genpmda/genpmda @@ -909,7 +909,7 @@ install: default \$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas \$(INSTALL) -m 755 -d \$(PMDADIR) \$(INSTALL) -m 755 \$(CMDTARGET) \$(PMDADIR)/\$(CMDTARGET) - \$(INSTALL) -m 755 \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET) + \$(INSTALL) -m 644 \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET) \$(INSTALL) -m 755 $oflag/Install \$(PMDADIR)/Install \$(INSTALL) -m 755 $oflag/Remove \$(PMDADIR)/Remove \$(INSTALL) -m 644 $oflag/Makefile.install \$(PMDADIR)/Makefile @@ -972,7 +972,7 @@ install: default \$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas \$(INSTALL) -m 755 -d \$(PMDADIR) \$(INSTALL) -m 755 -f \$(CMDTARGET) \$(PMDADIR)/\$(CMDTARGET) - \$(INSTALL) -m 755 -f \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET) + \$(INSTALL) -m 644 -f \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET) \$(INSTALL) -m 755 -f $oflag/Install \$(PMDADIR)/Install \$(INSTALL) -m 755 -f $oflag/Remove \$(PMDADIR)/Remove \$(INSTALL) -m 644 -f $oflag/Makefile.install \$(PMDADIR)/Makefile diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile index 5e9cc76c6027..4c5ced38813c 100644 --- a/src/libpcp/src/GNUmakefile +++ b/src/libpcp/src/GNUmakefile @@ -128,7 +128,7 @@ endif install : default ifneq ($(LIBTARGET),) - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ @@ -136,7 +136,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp : default diff --git a/src/libpcp_gui/src/GNUmakefile b/src/libpcp_gui/src/GNUmakefile index 91589f7448b2..ea44eaec99d1 100644 --- a/src/libpcp_gui/src/GNUmakefile +++ b/src/libpcp_gui/src/GNUmakefile @@ -57,7 +57,7 @@ include $(BUILDRULES) install: default ifneq ($(LIBTARGET),) - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ @@ -65,7 +65,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp: default diff --git a/src/libpcp_import/src/GNUmakefile b/src/libpcp_import/src/GNUmakefile index 6c3c2aa75489..178eb8197059 100644 --- a/src/libpcp_import/src/GNUmakefile +++ b/src/libpcp_import/src/GNUmakefile @@ -53,7 +53,7 @@ include $(BUILDRULES) install: default ifneq ($(LIBTARGET),) - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ @@ -61,7 +61,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp: default diff --git a/src/libpcp_mmv/src/GNUmakefile b/src/libpcp_mmv/src/GNUmakefile index a60029c09ece..a7cf0647ba9d 100644 --- a/src/libpcp_mmv/src/GNUmakefile +++ b/src/libpcp_mmv/src/GNUmakefile @@ -48,7 +48,7 @@ include $(BUILDRULES) install: default ifneq ($(LIBTARGET),) - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ @@ -56,7 +56,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp: default diff --git a/src/libpcp_pmda/src/GNUmakefile b/src/libpcp_pmda/src/GNUmakefile index 583be8109ddd..cc577eaf2023 100644 --- a/src/libpcp_pmda/src/GNUmakefile +++ b/src/libpcp_pmda/src/GNUmakefile @@ -81,7 +81,7 @@ include $(BUILDRULES) install : default ifneq ($(LIBTARGET),) - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) endif ifneq ($(LIBTARGET_V1),) $(INSTALL) -S $(LIBTARGET_V3) $(PCP_LIB_DIR)/$(LIBTARGET_V1) @@ -90,7 +90,7 @@ ifneq ($(LIBTARGET_V2),) $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET_V2) endif ifneq ($(STATICLIBTARGET),) - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp : default diff --git a/src/libpcp_trace/src/GNUmakefile b/src/libpcp_trace/src/GNUmakefile index a99c493986b8..c1d5ab7aa0cc 100644 --- a/src/libpcp_trace/src/GNUmakefile +++ b/src/libpcp_trace/src/GNUmakefile @@ -56,13 +56,13 @@ include $(BUILDRULES) install : default ifneq ($(LIBTARGET),) - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) endif ifneq ($(SYMTARGET),) $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(SYMTARGET) endif ifneq ($(STATICLIBTARGET),) - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp : default diff --git a/src/pmdas/aix/GNUmakefile b/src/pmdas/aix/GNUmakefile index e4796b9994fa..77ded85a9874 100644 --- a/src/pmdas/aix/GNUmakefile +++ b/src/pmdas/aix/GNUmakefile @@ -43,7 +43,8 @@ build-me: common.h root_aix domain.h $(CMDTARGET) $(LIBTARGET) help.dir help.pag install: build-me $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) + $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 644 root_aix $(PCP_VAR_DIR)/pmns/root_aix else build-me: diff --git a/src/pmdas/darwin/GNUmakefile b/src/pmdas/darwin/GNUmakefile index 60af8940d436..8b8a1e2963cb 100644 --- a/src/pmdas/darwin/GNUmakefile +++ b/src/pmdas/darwin/GNUmakefile @@ -47,7 +47,8 @@ build-me: root_darwin domain.h $(LIBTARGET) $(CMDTARGET) help.dir help.pag install: build-me $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) + $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 644 root_darwin $(PCP_VAR_DIR)/pmns/root_darwin else build-me: diff --git a/src/pmdas/freebsd/GNUmakefile b/src/pmdas/freebsd/GNUmakefile index 3689e2ad06b9..12c70dd140a3 100644 --- a/src/pmdas/freebsd/GNUmakefile +++ b/src/pmdas/freebsd/GNUmakefile @@ -48,7 +48,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTARGET) help.dir help.pag install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help help.dir help.pag $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) + $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 644 root_freebsd $(PCP_VAR_DIR)/pmns/root_freebsd else build-me: diff --git a/src/pmdas/linux/GNUmakefile b/src/pmdas/linux/GNUmakefile index 4d645d77561d..49399a0efb8a 100644 --- a/src/pmdas/linux/GNUmakefile +++ b/src/pmdas/linux/GNUmakefile @@ -75,7 +75,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help $(HELPTARGETS) $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) + $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) $(INSTALL) -m 644 root_linux $(PCP_VAR_DIR)/pmns/root_linux $(INSTALL) -m 644 proc_net_snmp_migrate.conf $(LOGREWRITEDIR)/linux_proc_net_snmp_migrate.conf else diff --git a/src/pmdas/linux_proc/GNUmakefile b/src/pmdas/linux_proc/GNUmakefile index e015425eff14..6345a97a9afe 100644 --- a/src/pmdas/linux_proc/GNUmakefile +++ b/src/pmdas/linux_proc/GNUmakefile @@ -66,7 +66,8 @@ build-me: domain.h root_proc $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help help.dir help.pag root root_proc samplehotproc.conf $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDADIR) + $(INSTALL) -m 644 $(LIBTARGET) $(SCRIPTS) $(PMDADIR) + $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) $(INSTALL) -m 644 root_proc $(PCP_VAR_DIR)/pmns/root_proc $(INSTALL) -m 644 $(LOGREWRITERS) $(PCP_VAR_DIR)/config/pmlogrewrite @$(INSTALL_MAN) diff --git a/src/pmdas/lustrecomm/GNUmakefile b/src/pmdas/lustrecomm/GNUmakefile index 1f9e031ab5ce..2abbfaa92f5f 100644 --- a/src/pmdas/lustrecomm/GNUmakefile +++ b/src/pmdas/lustrecomm/GNUmakefile @@ -50,7 +50,7 @@ build-me: domain.h $(TARGETS) install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) - #$(INSTALL) -m 755 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) + #$(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 755 Install Remove $(PMDADIR) $(INSTALL) -m 644 $(DFILES) root pmns domain.h help $(PMDADIR) @$(INSTALL_MAN) diff --git a/src/pmdas/pmcd/src/GNUmakefile b/src/pmdas/pmcd/src/GNUmakefile index a688d73767d3..851066aa10d7 100644 --- a/src/pmdas/pmcd/src/GNUmakefile +++ b/src/pmdas/pmcd/src/GNUmakefile @@ -54,7 +54,7 @@ default: $(LIBTARGET) domain.h install: default $(INSTALL) -m 755 -d $(PCP_PMDAS_DIR)/pmcd - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_PMDAS_DIR)/pmcd/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_PMDAS_DIR)/pmcd/$(LIBTARGET) include $(BUILDRULES) diff --git a/src/pmdas/sendmail/GNUmakefile b/src/pmdas/sendmail/GNUmakefile index 171c7c06106e..5911c175c74f 100644 --- a/src/pmdas/sendmail/GNUmakefile +++ b/src/pmdas/sendmail/GNUmakefile @@ -39,7 +39,7 @@ include $(BUILDRULES) install install_pcp: default $(INSTALL) -m 755 -d $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/pmda$(IAM)$(EXECSUFFIX) $(INSTALL) -m 755 $(SCRIPTS) $(PMDADIR) $(INSTALL) -m 644 $(DFILES) pmns help root domain.h $(PMDADIR) diff --git a/src/pmdas/solaris/GNUmakefile b/src/pmdas/solaris/GNUmakefile index 818ba9a08e49..0a9370adb929 100644 --- a/src/pmdas/solaris/GNUmakefile +++ b/src/pmdas/solaris/GNUmakefile @@ -53,7 +53,8 @@ build-me: root_solaris domain.h $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) $(VERSI install: build-me $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h $(HELPTARGETS) $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) + $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 644 root_solaris $(PCP_VAR_DIR)/pmns/root_solaris else build-me: -- 2.1.2 ++++++ 0003-pcp-legacy-init-lsb.patch ++++++ >From 18efe6b86936d454773a437cf50ab6a90c6506f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Fri, 12 Dec 2014 15:44:44 +0100 Subject: [PATCH 3/6] pcp legacy init lsb --- src/pmcd/rc_pcp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pmcd/rc_pcp b/src/pmcd/rc_pcp index 974ca06c2f4a..8d6872cfad9c 100644 --- a/src/pmcd/rc_pcp +++ b/src/pmcd/rc_pcp @@ -31,12 +31,12 @@ # e.g. SuSE, where chkconfig is a perl script. ### BEGIN INIT INFO # Provides: pcp -# Required-Start: -# Should-Start: -# Required-Stop: -# Should-Stop: -# Default-Start: -# Default-Stop: +# Required-Start: $local_fs +# Should-Start: $network $remote_fs $syslog $time +# Required-Stop: $local_fs +# Should-Stop: $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 # Short-Description: Legacy control for PCP daemons # Description: Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons ### END INIT INFO @@ -53,6 +53,8 @@ _usage() echo "Usage: $pmprog [-v] {start|restart|condrestart|stop|status|reload|force-reload}" } +echo "The pcp init script is depricated, pmcd and pmlogger should be used instead" + case "$1" in 'start'|'restart'|'condrestart'|'reload'|'force-reload') -- 2.1.2 ++++++ 0004-Remove-CPAN-rpaths.patch ++++++ >From a5e63d1f241a9b574c30093a71e41ab7c9f64dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Fri, 12 Dec 2014 15:45:33 +0100 Subject: [PATCH 4/6] Remove CPAN rpaths --- src/perl/LogImport/Makefile.PL | 2 +- src/perl/MMV/Makefile.PL | 2 +- src/perl/PMDA/Makefile.PL | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/perl/LogImport/Makefile.PL b/src/perl/LogImport/Makefile.PL index 20b716dbea6f..89d5f61e67dc 100644 --- a/src/perl/LogImport/Makefile.PL +++ b/src/perl/LogImport/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "LogImport.o", $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; - $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp/src -L$ENV{PCP_TOPDIR}/src/libpcp_import/src -lpcp_import -lpcp"]; + $libs = ["-lpcp_import -lpcp"]; } if ($ENV{TARGET_OS} eq "darwin") { # standard ones, minus -arch ppc diff --git a/src/perl/MMV/Makefile.PL b/src/perl/MMV/Makefile.PL index 6a85129842fb..3921421ad80c 100644 --- a/src/perl/MMV/Makefile.PL +++ b/src/perl/MMV/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "MMV.o"; $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; - $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_mmv/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_mmv -lpcp"]; + $libs = ["-lpcp_mmv -lpcp"]; } if ($ENV{TARGET_OS} eq "darwin") { # standard ones, minus -arch ppc diff --git a/src/perl/PMDA/Makefile.PL b/src/perl/PMDA/Makefile.PL index 1191a025fedf..7b1155685ae2 100644 --- a/src/perl/PMDA/Makefile.PL +++ b/src/perl/PMDA/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "local.o PMDA.o"; $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; - $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_pmda/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_pmda -lpcp"]; + $libs = ["-lpcp_pmda -lpcp"]; } if ($ENV{TARGET_OS} eq "darwin") { # standard ones, minus -arch ppc -- 2.1.2 ++++++ 0005-Remove-runlevel-4-from-init-scripts.patch ++++++ >From 7b1eb0b00132d57ed184ab397e76ab1450aba773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Fri, 12 Dec 2014 15:46:15 +0100 Subject: [PATCH 5/6] Remove runlevel 4 from init scripts --- src/pmcd/rc_pcp | 2 +- src/pmcd/rc_pmcd | 2 +- src/pmie/rc_pmie | 2 +- src/pmlogger/rc_pmlogger | 2 +- src/pmproxy/rc_pmproxy | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pmcd/rc_pcp b/src/pmcd/rc_pcp index 8d6872cfad9c..0fcb4eded076 100644 --- a/src/pmcd/rc_pcp +++ b/src/pmcd/rc_pcp @@ -35,7 +35,7 @@ # Should-Start: $network $remote_fs $syslog $time # Required-Stop: $local_fs # Should-Stop: $network $remote_fs $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Legacy control for PCP daemons # Description: Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons diff --git a/src/pmcd/rc_pmcd b/src/pmcd/rc_pmcd index 1f5deef9f16a..e1bb4f7c2929 100644 --- a/src/pmcd/rc_pmcd +++ b/src/pmcd/rc_pmcd @@ -27,7 +27,7 @@ # Should-Start: $network $remote_fs $syslog $time # Required-Stop: $local_fs # Should-Stop: $network $remote_fs $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmcd (the collection daemon for PCP) # Description: Configure and control pmcd (the collection daemon for the Performance Co-Pilot) diff --git a/src/pmie/rc_pmie b/src/pmie/rc_pmie index 685b52ab2897..51c7389aeefa 100644 --- a/src/pmie/rc_pmie +++ b/src/pmie/rc_pmie @@ -25,7 +25,7 @@ # Should-Start: $local_fs $network $syslog $time $pmcd # Required-Stop: $remote_fs # Should-Stop: $local_fs $network $syslog $pmcd -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmie (performance inference engine for PCP) # Description: Configure and control pmie (the performance inference engine for the Performance Co-Pilot) diff --git a/src/pmlogger/rc_pmlogger b/src/pmlogger/rc_pmlogger index f28c084e097e..bdd4e72b877f 100644 --- a/src/pmlogger/rc_pmlogger +++ b/src/pmlogger/rc_pmlogger @@ -27,7 +27,7 @@ # Should-Start: $network $remote_fs $syslog $time $pmcd # Required-Stop: $local_fs # Should-Stop: $network $remote_fs $syslog $pmcd -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmlogger (the performance metrics logger for PCP) # Description: Configure and control pmlogger (the performance metrics logger for the Performance Co-Pilot) diff --git a/src/pmproxy/rc_pmproxy b/src/pmproxy/rc_pmproxy index 5e776086cd31..c3e049483ec9 100644 --- a/src/pmproxy/rc_pmproxy +++ b/src/pmproxy/rc_pmproxy @@ -27,7 +27,7 @@ # Should-Start: $local_fs $network $syslog $time $pmcd # Required-Stop: $remote_fs # Should-Stop: $local_fs $network $syslog $pmcd -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmproxy (the pmcd proxy daemon for PCP) # Description: Configure and control pmproxy (the pmcd proxy daemon for the Performance Co-Pilot) -- 2.1.2 ++++++ 0006-create-pmlogger-and-pmie-logdirs-during-install.patch ++++++ >From 0037ea80c895b72fffeb146c8a4eeb458001e2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Fri, 12 Dec 2014 15:46:47 +0100 Subject: [PATCH 6/6] create pmlogger and pmie logdirs during install --- src/pmie/GNUmakefile | 2 ++ src/pmlogger/GNUmakefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile index 4c8e971d519b..9c6d09445dbd 100644 --- a/src/pmie/GNUmakefile +++ b/src/pmie/GNUmakefile @@ -55,6 +55,8 @@ endif $(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR)/pmie ifeq ($(TARGET_OS),linux) $(INSTALL) -m 755 -d `dirname $(CRONTAB_PATH)` + $(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmie + $(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmie endif $(INSTALL) -m 644 crontab $(CRONTAB_PATH) diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile index ae728faff2af..483087dbd39f 100644 --- a/src/pmlogger/GNUmakefile +++ b/src/pmlogger/GNUmakefile @@ -56,6 +56,8 @@ endif $(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR)/pmlogger ifeq ($(TARGET_OS),linux) $(INSTALL) -m 755 -d `dirname $(CRONTAB_PATH)` + $(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmlogger + $(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmlogger endif $(INSTALL) -m 644 crontab $(CRONTAB_PATH) -- 2.1.2 ++++++ 0007-Honor-CFLAGS-in-qmake.patch ++++++ >From 4f195b3a280a2ced27028a210ae88724f6fe56d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 3 Feb 2015 14:15:10 +0100 Subject: [PATCH 7/7] Honor CFLAGS in qmake rpm complained about files not compile with RPM_OPT_FLAGS http://stackoverflow.com/questions/17578150/add-cflags-to-qmake-project-without-hard-coding-them-in-the-pro-file --- src/libpcp_qed/src/libpcp_qed.pro | 1 + src/libpcp_qmc/src/libpcp_qmc.pro | 1 + src/libpcp_qwt/src/libpcp_qwt.pro | 1 + src/pmdumptext/pmdumptext.pro | 1 + src/pmquery/pmquery.pro | 1 + src/pmtime/pmtime.pro | 1 + 6 files changed, 6 insertions(+) diff --git a/src/libpcp_qed/src/libpcp_qed.pro b/src/libpcp_qed/src/libpcp_qed.pro index 6a3c872a4b87..c67f1d63290d 100644 --- a/src/libpcp_qed/src/libpcp_qed.pro +++ b/src/libpcp_qed/src/libpcp_qed.pro @@ -6,6 +6,7 @@ INCLUDEPATH += ../../include ../../libpcp_qmc/src release:DESTDIR = build/debug debug:DESTDIR = build/release QT = core gui network svg +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) HEADERS = qed.h \ qed_actionlist.h \ diff --git a/src/libpcp_qmc/src/libpcp_qmc.pro b/src/libpcp_qmc/src/libpcp_qmc.pro index 39671ab2dceb..b59ffa4e6bb9 100644 --- a/src/libpcp_qmc/src/libpcp_qmc.pro +++ b/src/libpcp_qmc/src/libpcp_qmc.pro @@ -5,6 +5,7 @@ CONFIG += qt staticlib warn_on INCLUDEPATH += ../../include release:DESTDIR = build/debug debug:DESTDIR = build/release +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) HEADERS = qmc_context.h qmc_desc.h qmc_group.h \ qmc_indom.h qmc_metric.h qmc_source.h \ diff --git a/src/libpcp_qwt/src/libpcp_qwt.pro b/src/libpcp_qwt/src/libpcp_qwt.pro index 1a7b1d8b736c..6badfc328605 100644 --- a/src/libpcp_qwt/src/libpcp_qwt.pro +++ b/src/libpcp_qwt/src/libpcp_qwt.pro @@ -5,6 +5,7 @@ CONFIG += qt staticlib warn_on release:DESTDIR = build/debug debug:DESTDIR = build/release QT = core gui network svg +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) HEADERS += \ qwt.h \ diff --git a/src/pmdumptext/pmdumptext.pro b/src/pmdumptext/pmdumptext.pro index d521e2f40cb7..f9048bb1a037 100644 --- a/src/pmdumptext/pmdumptext.pro +++ b/src/pmdumptext/pmdumptext.pro @@ -9,3 +9,4 @@ LIBS += -L../libpcp/src LIBS += -L../libpcp_qmc/src -L../libpcp_qmc/src/$$DESTDIR LIBS += -lpcp_qmc -lpcp QT -= gui +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) diff --git a/src/pmquery/pmquery.pro b/src/pmquery/pmquery.pro index 6a4293fb7a23..d9392931888c 100644 --- a/src/pmquery/pmquery.pro +++ b/src/pmquery/pmquery.pro @@ -7,3 +7,4 @@ RESOURCES = pmquery.qrc CONFIG += qt warn_on release:DESTDIR = build/debug debug:DESTDIR = build/release +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) diff --git a/src/pmtime/pmtime.pro b/src/pmtime/pmtime.pro index ad3e1932e7b1..4605765cab79 100644 --- a/src/pmtime/pmtime.pro +++ b/src/pmtime/pmtime.pro @@ -22,3 +22,4 @@ LIBS += -lpcp_qwt -lpcp_qmc -lpcp win32:LIBS += -lwsock32 QT += network QMAKE_INFO_PLIST = pmtime.info +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) -- 2.1.2 ++++++ 0008-SUSE-fy-pmsnap-control-path.patch ++++++ >From e47109751682efd28989b6a4012cdbd032e0c9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Mon, 23 Feb 2015 16:52:38 +0100 Subject: [PATCH 8/9] SUSE-fy pmsnap control path --- src/pmsnap/pmsnap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pmsnap/pmsnap.sh b/src/pmsnap/pmsnap.sh index 87434a5fbfb9..92be253313ea 100755 --- a/src/pmsnap/pmsnap.sh +++ b/src/pmsnap/pmsnap.sh @@ -26,7 +26,7 @@ prog=`basename $0` LOCALHOST=`pmhostname` CONFIGDIR=$PCP_VAR_DIR/config/pmsnap -CONTROL=$CONFIGDIR/control +CONTROL=/etc/pcp/pmsnap/control [ -z "$PCP_PMSNAPCONTROL_PATH" ] || CONTROL="$PCP_PMSNAPCONTROL_PATH" _usage() @@ -179,7 +179,7 @@ then fi commonargs="$commonargs $@" -CONTROL=$CONFIGDIR/control +CONTROL=/etc/pcp/pmsnap/control if [ ! -f "$CONTROL" ] then echo "$prog: Error: cannot find control file \"$CONTROL\"" -- 2.1.4 ++++++ 0009-pmsnap-control-var-www-srv-www.patch ++++++ >From a778bc20b4a82ed7b72717880bff8bd91def7bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Mon, 23 Feb 2015 16:54:20 +0100 Subject: [PATCH 9/9] pmsnap/control: /var/www -> /srv/www --- src/pmsnap/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pmsnap/control b/src/pmsnap/control index 54440b51bb1c..6cb13206fb1f 100644 --- a/src/pmsnap/control +++ b/src/pmsnap/control @@ -67,5 +67,5 @@ $commonargs='' # === pmsnap Control Specifications === # # Name (Output Image) Folio|Archive Config Arguments -/var/www/pcp/LOCALHOSTNAME.1hour.summary LOCALHOSTNAME/Latest Snap -O-0 -A 10min -t 2min -v 30 -/var/www/pcp/LOCALHOSTNAME.12hour.summary LOCALHOSTNAME/Latest Snap -O-0 -A 1hour -t 30min -v 30 +/srv/www/pcp/LOCALHOSTNAME.1hour.summary LOCALHOSTNAME/Latest Snap -O-0 -A 10min -t 2min -v 30 +/srv/www/pcp/LOCALHOSTNAME.12hour.summary LOCALHOSTNAME/Latest Snap -O-0 -A 1hour -t 30min -v 30 -- 2.1.4 ++++++ pcp-3.6.10.src.tar.gz -> pcp-3.10.2.src.tar.gz ++++++ /work/SRC/openSUSE:Factory/pcp/pcp-3.6.10.src.tar.gz /work/SRC/openSUSE:Factory/.pcp.new/pcp-3.10.2.src.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
