pool/pcp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 287414 from home:kwk:branches:Base:System

Browse Source 
- 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
  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

OBS-URL: https://build.opensuse.org/request/show/287414
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=37
This commit is contained in:
David Disseldorp 2015-02-24 09:27:55 +00:00 committed by Git OBS Bridge
parent 4e5f192445
commit c6102bc9d9
18 changed files with 1606 additions and 783 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0001-Fix-XEN-build.patch Normal file
View File

@ -0,0 +1,24 @@
From 58127dca98f11270491383946d2714fd9d983d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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

174
static_lib_perms.diff → 0002-Install-libraries-without-exec-permission.patch
View File

@ -1,7 +1,7 @@
From bcd50d9e0a84c54c2e5d909f2567312c9af0335e Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Mon, 19 Nov 2012 17:15:07 +0100
Subject: [PATCH] Install libraries without exec permission
From 865c920542f1cc499500c97217bfb36b70541765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 12 Dec 2014 15:43:00 +0100
Subject: [PATCH 2/6] Install libraries without exec permission
---
src/genpmda/genpmda | 4 ++--
@ -17,15 +17,13 @@ Subject: [PATCH] Install libraries without exec permission
src/pmdas/linux/GNUmakefile | 3 ++-
src/pmdas/linux_proc/GNUmakefile | 3 ++-
src/pmdas/lustrecomm/GNUmakefile | 2 +-
src/pmdas/mmv/GNUmakefile | 3 ++-
src/pmdas/pmcd/src/GNUmakefile | 2 +-
src/pmdas/sample/src/GNUmakefile | 3 ++-
src/pmdas/sendmail/GNUmakefile | 2 +-
src/pmdas/solaris/GNUmakefile | 3 ++-
18 files changed, 33 insertions(+), 25 deletions(-)
16 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/genpmda/genpmda b/src/genpmda/genpmda
index 4650315..1bd2cba 100755
index 46503150c1a5..1bd2cbae3497 100755
--- a/src/genpmda/genpmda
+++ b/src/genpmda/genpmda
@@ -909,7 +909,7 @@ install: default
@ -47,140 +45,140 @@ index 4650315..1bd2cba 100755
\$(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 18adb88..6a7627d 100644
index 5e9cc76c6027..4c5ced38813c 100644
--- a/src/libpcp/src/GNUmakefile
+++ b/src/libpcp/src/GNUmakefile
@@ -103,7 +103,7 @@ endif
@@ -128,7 +128,7 @@ endif
install : default
ifneq "$(LIBTARGET)" ""
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq "$(SYMTARGET)" ""
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -111,7 +111,7 @@ ifneq "$(SYMTARGET)" ""
@@ -136,7 +136,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq "$(STATICLIBTARGET)" ""
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 6d636e0..d8fe1e7 100644
index 91589f7448b2..ea44eaec99d1 100644
--- a/src/libpcp_gui/src/GNUmakefile
+++ b/src/libpcp_gui/src/GNUmakefile
@@ -53,7 +53,7 @@ include $(BUILDRULES)
@@ -57,7 +57,7 @@ include $(BUILDRULES)
install: default
ifneq "$(LIBTARGET)" ""
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq "$(SYMTARGET)" ""
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -61,7 +61,7 @@ ifneq "$(SYMTARGET)" ""
@@ -65,7 +65,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq "$(STATICLIBTARGET)" ""
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 1cdf529..f1c7d1d 100644
index 6c3c2aa75489..178eb8197059 100644
--- a/src/libpcp_import/src/GNUmakefile
+++ b/src/libpcp_import/src/GNUmakefile
@@ -50,7 +50,7 @@ include $(BUILDRULES)
@@ -53,7 +53,7 @@ include $(BUILDRULES)
install: default
ifneq "$(LIBTARGET)" ""
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq "$(SYMTARGET)" ""
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -58,7 +58,7 @@ ifneq "$(SYMTARGET)" ""
@@ -61,7 +61,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq "$(STATICLIBTARGET)" ""
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 e2395f3..9619df5 100644
index a60029c09ece..a7cf0647ba9d 100644
--- a/src/libpcp_mmv/src/GNUmakefile
+++ b/src/libpcp_mmv/src/GNUmakefile
@@ -45,7 +45,7 @@ include $(BUILDRULES)
@@ -48,7 +48,7 @@ include $(BUILDRULES)
install: default
ifneq "$(LIBTARGET)" ""
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq "$(SYMTARGET)" ""
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -53,7 +53,7 @@ ifneq "$(SYMTARGET)" ""
@@ -56,7 +56,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq "$(STATICLIBTARGET)" ""
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 23a1b10..182d68d 100644
index 583be8109ddd..cc577eaf2023 100644
--- a/src/libpcp_pmda/src/GNUmakefile
+++ b/src/libpcp_pmda/src/GNUmakefile
@@ -79,7 +79,7 @@ include $(BUILDRULES)
@@ -81,7 +81,7 @@ include $(BUILDRULES)
install : default
ifneq "$(LIBTARGET)" ""
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq "$(LIBTARGET_V1)" ""
ifneq ($(LIBTARGET_V1),)
$(INSTALL) -S $(LIBTARGET_V3) $(PCP_LIB_DIR)/$(LIBTARGET_V1)
@@ -88,7 +88,7 @@ ifneq "$(LIBTARGET_V2)" ""
@@ -90,7 +90,7 @@ ifneq ($(LIBTARGET_V2),)
$(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET_V2)
endif
ifneq "$(STATICLIBTARGET)" ""
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 d3ea55d..034195a 100644
index a99c493986b8..c1d5ab7aa0cc 100644
--- a/src/libpcp_trace/src/GNUmakefile
+++ b/src/libpcp_trace/src/GNUmakefile
@@ -51,13 +51,13 @@ include $(BUILDRULES)
@@ -56,13 +56,13 @@ include $(BUILDRULES)
install : default
ifneq "$(LIBTARGET)" ""
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq "$(SYMTARGET)" ""
ifneq ($(SYMTARGET),)
$(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(SYMTARGET)
endif
ifneq "$(STATICLIBTARGET)" ""
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 9282d76..46336a7 100644
index e4796b9994fa..77ded85a9874 100644
--- a/src/pmdas/aix/GNUmakefile
+++ b/src/pmdas/aix/GNUmakefile
@@ -41,7 +41,8 @@ build-me: common.h root_aix domain.h $(CMDTARGET) $(LIBTARGET) help.dir help.pag
@@ -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)
@ -191,10 +189,10 @@ index 9282d76..46336a7 100644
else
build-me:
diff --git a/src/pmdas/darwin/GNUmakefile b/src/pmdas/darwin/GNUmakefile
index a2fd3a7..081cc98 100644
index 60af8940d436..8b8a1e2963cb 100644
--- a/src/pmdas/darwin/GNUmakefile
+++ b/src/pmdas/darwin/GNUmakefile
@@ -45,7 +45,8 @@ build-me: root_darwin domain.h $(LIBTARGET) $(CMDTARGET) help.dir help.pag
@@ -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)
@ -205,10 +203,10 @@ index a2fd3a7..081cc98 100644
else
build-me:
diff --git a/src/pmdas/freebsd/GNUmakefile b/src/pmdas/freebsd/GNUmakefile
index 217fcd8..00b2dcd 100644
index 3689e2ad06b9..12c70dd140a3 100644
--- a/src/pmdas/freebsd/GNUmakefile
+++ b/src/pmdas/freebsd/GNUmakefile
@@ -46,7 +46,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTARGET) help.dir help.pag
@@ -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)
@ -219,38 +217,38 @@ index 217fcd8..00b2dcd 100644
else
build-me:
diff --git a/src/pmdas/linux/GNUmakefile b/src/pmdas/linux/GNUmakefile
index 087e53a..bc81973 100644
index 4d645d77561d..49399a0efb8a 100644
--- a/src/pmdas/linux/GNUmakefile
+++ b/src/pmdas/linux/GNUmakefile
@@ -67,7 +67,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTARGET) help.dir help.pag
@@ -75,7 +75,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help help.dir help.pag $(PMDADIR)
$(INSTALL) -m 644 domain.h help $(HELPTARGETS) $(PMDADIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(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
build-me:
diff --git a/src/pmdas/linux_proc/GNUmakefile b/src/pmdas/linux_proc/GNUmakefile
index 7d8961a..89aa43f 100644
index e015425eff14..6345a97a9afe 100644
--- a/src/pmdas/linux_proc/GNUmakefile
+++ b/src/pmdas/linux_proc/GNUmakefile
@@ -48,7 +48,8 @@ install: default
@@ -66,7 +66,8 @@ build-me: domain.h root_proc $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 755 Install Remove $(PMDADIR)
$(INSTALL) -m 644 domain.h pmns pmns.cgroup root help $(PMDADIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(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 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 linux_proc_migrate.conf $(PCP_VAR_DIR)/config/pmlogrewrite/linux_proc_migrate.conf
else
build-me:
$(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 bd0aadc..153fe83 100644
index 1f9e031ab5ce..2abbfaa92f5f 100644
--- a/src/pmdas/lustrecomm/GNUmakefile
+++ b/src/pmdas/lustrecomm/GNUmakefile
@@ -47,7 +47,7 @@ build-me: domain.h $(TARGETS)
@@ -50,7 +50,7 @@ build-me: domain.h $(TARGETS)
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
@ -258,26 +256,12 @@ index bd0aadc..153fe83 100644
+ #$(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 755 Install Remove $(PMDADIR)
$(INSTALL) -m 644 $(DFILES) root pmns domain.h help $(PMDADIR)
else
diff --git a/src/pmdas/mmv/GNUmakefile b/src/pmdas/mmv/GNUmakefile
index 302c212..7c6d1cd 100644
--- a/src/pmdas/mmv/GNUmakefile
+++ b/src/pmdas/mmv/GNUmakefile
@@ -44,7 +44,8 @@ include $(BUILDRULES)
install_pcp install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h $(PMDADIR)/domain.h
- $(INSTALL) -m 755 $(TARGETS) Install Remove $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) mmvdump$(EXECSUFFIX) Install Remove $(PMDADIR)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 pmns $(PMDADIR)/root_mmv
$(INSTALL) -m 644 root_mmv $(PCP_VAR_DIR)/pmns/root_mmv
$(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/mmv
@$(INSTALL_MAN)
diff --git a/src/pmdas/pmcd/src/GNUmakefile b/src/pmdas/pmcd/src/GNUmakefile
index 00e1e9c..34bbeb7 100644
index a688d73767d3..851066aa10d7 100644
--- a/src/pmdas/pmcd/src/GNUmakefile
+++ b/src/pmdas/pmcd/src/GNUmakefile
@@ -47,7 +47,7 @@ default: $(LIBTARGET)
@@ -54,7 +54,7 @@ default: $(LIBTARGET) domain.h
install: default
$(INSTALL) -m 755 -d $(PCP_PMDAS_DIR)/pmcd
@ -286,25 +270,11 @@ index 00e1e9c..34bbeb7 100644
include $(BUILDRULES)
diff --git a/src/pmdas/sample/src/GNUmakefile b/src/pmdas/sample/src/GNUmakefile
index 57b61be..57b9a17 100644
--- a/src/pmdas/sample/src/GNUmakefile
+++ b/src/pmdas/sample/src/GNUmakefile
@@ -43,7 +43,8 @@ sample.o events.o: events.h
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
- $(INSTALL) -m 755 $(CMDTARGET) $(LIBTARGET) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
include $(BUILDRULES)
diff --git a/src/pmdas/sendmail/GNUmakefile b/src/pmdas/sendmail/GNUmakefile
index e551ad2..0c81c0a 100644
index 171c7c06106e..5911c175c74f 100644
--- a/src/pmdas/sendmail/GNUmakefile
+++ b/src/pmdas/sendmail/GNUmakefile
@@ -36,7 +36,7 @@ include $(BUILDRULES)
@@ -39,7 +39,7 @@ include $(BUILDRULES)
install install_pcp: default
$(INSTALL) -m 755 -d $(PMDADIR)
@ -314,13 +284,13 @@ index e551ad2..0c81c0a 100644
$(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 0d81837..5a4f0d8 100644
index 818ba9a08e49..0a9370adb929 100644
--- a/src/pmdas/solaris/GNUmakefile
+++ b/src/pmdas/solaris/GNUmakefile
@@ -45,7 +45,8 @@ build-me: root_solaris domain.h $(LIBTARGET) $(CMDTARGET) help.dir help.pag
@@ -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 help.dir help.pag $(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)
@ -328,5 +298,5 @@ index 0d81837..5a4f0d8 100644
else
build-me:
--
1.7.10.4
2.1.2

20
pcp_legacy_init_lsb.patch → 0003-pcp-legacy-init-lsb.patch
View File

@ -1,7 +1,16 @@
Index: src/pmcd/rc_pcp
===================================================================
--- src/pmcd/rc_pcp.orig
+++ src/pmcd/rc_pcp
From 18efe6b86936d454773a437cf50ab6a90c6506f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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
@ -30,3 +39,6 @@ Index: src/pmcd/rc_pcp
case "$1" in
'start'|'restart'|'condrestart'|'reload'|'force-reload')
--
2.1.2

56
remove_cpan_rpaths.patch → 0004-Remove-CPAN-rpaths.patch
View File

@ -1,20 +1,18 @@
Index: pcp-3.6.10/src/perl/PMDA/Makefile.PL
===================================================================
--- pcp-3.6.10.orig/src/perl/PMDA/Makefile.PL
+++ pcp-3.6.10/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
Index: pcp-3.6.10/src/perl/LogImport/Makefile.PL
===================================================================
--- pcp-3.6.10.orig/src/perl/LogImport/Makefile.PL
+++ pcp-3.6.10/src/perl/LogImport/Makefile.PL
From a5e63d1f241a9b574c30093a71e41ab7c9f64dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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",
@ -24,10 +22,10 @@ Index: pcp-3.6.10/src/perl/LogImport/Makefile.PL
}
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
Index: pcp-3.6.10/src/perl/MMV/Makefile.PL
===================================================================
--- pcp-3.6.10.orig/src/perl/MMV/Makefile.PL
+++ pcp-3.6.10/src/perl/MMV/Makefile.PL
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";
@ -37,3 +35,19 @@ Index: pcp-3.6.10/src/perl/MMV/Makefile.PL
}
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

64
rm_init_script_runlevel_4.patch → 0005-Remove-runlevel-4-from-init-scripts.patch
View File

@ -1,7 +1,20 @@
Index: pcp-3.6.4/src/pmcd/rc_pcp
===================================================================
--- pcp-3.6.4.orig/src/pmcd/rc_pcp
+++ pcp-3.6.4/src/pmcd/rc_pcp
From 7b1eb0b00132d57ed184ab397e76ab1450aba773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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
@ -11,11 +24,11 @@ Index: pcp-3.6.4/src/pmcd/rc_pcp
# Default-Stop: 0 1 6
# Short-Description: Legacy control for PCP daemons
# Description: Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons
Index: pcp-3.6.4/src/pmcd/rc_pmcd
===================================================================
--- pcp-3.6.4.orig/src/pmcd/rc_pmcd
+++ pcp-3.6.4/src/pmcd/rc_pmcd
@@ -30,7 +30,7 @@
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
@ -24,11 +37,11 @@ Index: pcp-3.6.4/src/pmcd/rc_pmcd
# 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)
Index: pcp-3.6.4/src/pmie/rc_pmie
===================================================================
--- pcp-3.6.4.orig/src/pmie/rc_pmie
+++ pcp-3.6.4/src/pmie/rc_pmie
@@ -24,7 +24,7 @@
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
@ -37,11 +50,11 @@ Index: pcp-3.6.4/src/pmie/rc_pmie
# 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)
Index: pcp-3.6.4/src/pmlogger/rc_pmlogger
===================================================================
--- pcp-3.6.4.orig/src/pmlogger/rc_pmlogger
+++ pcp-3.6.4/src/pmlogger/rc_pmlogger
@@ -30,7 +30,7 @@
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
@ -50,11 +63,11 @@ Index: pcp-3.6.4/src/pmlogger/rc_pmlogger
# 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)
Index: pcp-3.6.4/src/pmproxy/rc_pmproxy
===================================================================
--- pcp-3.6.4.orig/src/pmproxy/rc_pmproxy
+++ pcp-3.6.4/src/pmproxy/rc_pmproxy
@@ -30,7 +30,7 @@
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
@ -63,3 +76,6 @@ Index: pcp-3.6.4/src/pmproxy/rc_pmproxy
# 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

39
0006-create-pmlogger-and-pmie-logdirs-during-install.patch Normal file
View File

@ -0,0 +1,39 @@
From 0037ea80c895b72fffeb146c8a4eeb458001e2f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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

83
0007-Honor-CFLAGS-in-qmake.patch Normal file
View File

@ -0,0 +1,83 @@
From 4f195b3a280a2ced27028a210ae88724f6fe56d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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

34
0008-SUSE-fy-pmsnap-control-path.patch Normal file
View File

@ -0,0 +1,34 @@
From e47109751682efd28989b6a4012cdbd032e0c9fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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

24
0009-pmsnap-control-var-www-srv-www.patch Normal file
View File

@ -0,0 +1,24 @@
From a778bc20b4a82ed7b72717880bff8bd91def7bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
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

37
create-pmlogger-and-pmie-logdirs-during-install.patch
View File

@ -1,37 +0,0 @@
From 05c112bd44b4a5dbb432e9d13e1e51816bd0acf8 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Wed, 21 Nov 2012 12:53:25 +0100
Subject: [PATCH] create pmlogger and pmie logdirs during install
---
src/pmie/GNUmakefile | 1 +
src/pmlogger/GNUmakefile | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile
index c62b869..e0ec1cd 100644
--- a/src/pmie/GNUmakefile
+++ b/src/pmie/GNUmakefile
@@ -46,6 +46,7 @@ install:: default
$(INSTALL) -m 755 pmie_daily.sh $(PCP_BINADM_DIR)/pmie_daily
$(INSTALL) -m 755 pmie2col $(PCP_BIN_DIR)/pmie2col
$(INSTALL) -m 755 rc_pmie $(PCP_RC_DIR)/pmie
+ $(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmie
$(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmie
include $(BUILDRULES)
diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile
index 23c810c..b045bdb 100644
--- a/src/pmlogger/GNUmakefile
+++ b/src/pmlogger/GNUmakefile
@@ -37,6 +37,7 @@ include $(BUILDRULES)
install: $(CMDTARGET) $(OTHERS)
$(INSTALL) -m 755 $(CMDTARGET) $(PCP_BINADM_DIR)/$(CMDTARGET)
$(INSTALL) -m 755 rc_pmlogger $(PCP_RC_DIR)/pmlogger
+ $(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmlogger
$(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmlogger
YFLAGS += -v
--
1.7.10.4

325
fix_pmie_pmlogger_startup_races.patch
View File

@ -1,325 +0,0 @@
From 26129ab3fc91a77aefa3c2807c2b49dec4631036 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Wed, 28 Nov 2012 14:30:31 +1100
Subject: [PATCH] Fix race conditions in pmie and pmlogger startup scripts
Recent changes to tempfile handling has regressed the pmie and
pmlogger startup scripts. Errors of the form:
/etc/rc.d/init.d/pmlogger: line 100: /var/tmp/pcp.5vfQsSHKo/pmcheck: No such file or directory
are now produced.
Because sections of these two scripts are run in parallel with
the original script, we are open to race conditions where the
main script exits and removes the temporary directory before the
co-process has an opportunity to create its temporary file. We
can resolve this using separate temporary dirs and trap handling
which thus no longer race.
Worse still, QA failed to detect the problem. At least one test
that should have found the problem trivially (575) failed to, as
a result of aggressively discarding stderr and stdout instead of
using filtering. This has been rectified and common pmie filter
routines abstracted (from tests 115, 504 and 575) to simplify the
task for all current and future tests.
---
qa/115 | 18 ------------------
qa/115.out | 2 ++
qa/504 | 14 --------------
qa/575 | 18 ++++++++++++------
qa/575.out | 1 +
qa/common.filter | 26 ++++++++++++++++++++++++++
src/pmie/rc_pmie | 30 +++++++++++++++++++++---------
src/pmlogger/rc_pmlogger | 26 +++++++++++++++++---------
8 files changed, 79 insertions(+), 56 deletions(-)
diff --git a/qa/115 b/qa/115
index 8a3f675..4be3323 100755
--- a/qa/115
+++ b/qa/115
@@ -54,24 +54,6 @@ _filter()
-e "s;/private/tmp;/tmp;g"
}
-_filter_pmie_start()
-{
- sed \
- -e '/^Waiting for pmie process(es) to terminate/d' \
- -e "s;$PCP_RC_DIR/pmie:;RC_SCRIPT;" \
- -e '/RC_SCRIPT/d' \
- -e '/(pmie) is disabled/d' \
- -e '/To enable/d' \
- -e '/\/sbin\/chkconfig pmie on/d' \
- -e '/\/usr\/sbin\/sysv-rc-conf pmie on/d' \
- -e '/update-rc.d -f pmie defaults/d' \
- -e '/ln -sf \.\.\/init.d\/pmie \/etc\/rc\.d\//d' \
- -e "s;$PCP_PMIECONTROL_PATH;\$PCP_PMIECONTROL_PATH;" \
- -e '/^\.\.*done$/d' \
- -e '/^\.\.*failed$/d' \
- -e "s;/private/tmp;/tmp;g"
-}
-
_count_pmies()
{
count=0
diff --git a/qa/115.out b/qa/115.out
index 0b8cfe6..7229a9e 100644
--- a/qa/115.out
+++ b/qa/115.out
@@ -5,6 +5,7 @@ pmie count at start of QA testing: 0
pmie count after chkconfig pmie off: 0
=== check for missing control file ===
+$PCP_RC_DIR/pmie:
Error: PCP inference engine control file $PCP_PMIECONTROL_PATH
is missing! Cannot start any Performance Co-Pilot inference engine(s).
pmie count after attempt without control file: 0
@@ -34,3 +35,4 @@ No current pmie process exists for:
Restarting pmie for host "LOCALHOST" ...
+ pmie -b -h LOCALHOST -l /tmp/PID.log0 /tmp/PID.conf
+$PCP_RC_DIR/pmie: PMIE not running
diff --git a/qa/504 b/qa/504
index c65df90..047b859 100755
--- a/qa/504
+++ b/qa/504
@@ -62,20 +62,6 @@ _filter()
-e "s/$lhost/LOCALHOST/g"
}
-
-_filter_pmie_start()
-{
- $PCP_AWK_PROG '
-/^Waiting for pmie process\(es\) to terminate/ { next }
-/^Waiting for PMIE process\(es\) to terminate/ { next }
-/^\/etc.*\/init\.d\/pmie:/ { next }
-/\(pmie\) is disabled/ { next }
-/To enable/ { next }
-/\/sbin\/chkconfig pmie on/ { next }
-
-{ print }'
-}
-
_count_pmies()
{
count=0
diff --git a/qa/575 b/qa/575
index 785c034..41a6266 100755
--- a/qa/575
+++ b/qa/575
@@ -1,7 +1,7 @@
#! /bin/sh
# PCP QA Test No. 575
-# exercise fix for bug #692244
#
+# Copyright (c) 2012 Red Hat.
# Copyright (c) 1995-2002 Silicon Graphics, Inc. All Rights Reserved.
#
@@ -13,18 +13,24 @@ echo "QA output created by $seq"
. ./common.filter
. ./common.check
+_cleanup()
+{
+ _change_config pmie off
+ rm -f $tmp.*
+}
+
signal=$PCP_BINADM_DIR/pmsignal
status=1 # failure is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "_cleanup; exit \$status" 0 1 2 3 15
# real QA test starts here
$sudo $signal -a pmie >/dev/null 2>&1
$sudo rm -fr $PCP_TMP_DIR/pmie
-$sudo $PCP_RC_DIR/pmie stop \
-| _filter_pcp_stop \
-| sed -e "s;$PCP_RC_DIR;\$PCP_RC_DIR;g"
-$sudo $PCP_RC_DIR/pmie start >/dev/null 2>&1
+_change_config pmie on
+$sudo $PCP_RC_DIR/pmie stop | _filter_pmie_stop
+$sudo $PCP_RC_DIR/pmie start | _filter_pmie_start
+
# success, all done
status=0
exit
diff --git a/qa/575.out b/qa/575.out
index 2842d31..3077d2a 100644
--- a/qa/575.out
+++ b/qa/575.out
@@ -1,2 +1,3 @@
QA output created by 575
$PCP_RC_DIR/pmie: PMIE not running
+Performance Co-Pilot starting inference engine(s) ...
diff --git a/qa/common.filter b/qa/common.filter
index fbbdbfd..648e115 100644
--- a/qa/common.filter
+++ b/qa/common.filter
@@ -412,6 +412,32 @@ s/PMCD/pmcd/
| _filter_init_distro
}
+_filter_pmie_start()
+{
+ sed \
+ -e '/^Waiting for pmie process(es) to terminate/d' \
+ -e "s;$PCP_RC_DIR/pmie;\$PCP_RC_DIR/pmie;g" \
+ -e '/(pmie) is disabled/d' \
+ -e '/To enable/d' \
+ -e '/\/sbin\/chkconfig pmie on/d' \
+ -e '/\/usr\/sbin\/sysv-rc-conf pmie on/d' \
+ -e '/update-rc.d -f pmie defaults/d' \
+ -e '/ln -sf \.\.\/init.d\/pmie \/etc\/rc\.d\//d' \
+ -e "s;$PCP_PMIECONTROL_PATH;\$PCP_PMIECONTROL_PATH;" \
+ -e '/^\.\.*done$/d' \
+ -e "s;/private/tmp;/tmp;g" \
+ | _filter_init_distro
+}
+
+_filter_pmie_stop()
+{
+ sed \
+ -e "s;$PCP_RC_DIR/pmie;\$PCP_RC_DIR/pmie;g" \
+ -e '/^Waiting for pmie/s/\.\.\.[. ]*done/.../' \
+ -e '/^Waiting for pmie/s/\.\.\. *$/.../' \
+ | _filter_init_distro
+}
+
_filterall_pcp_start()
{
_filter_pcp_start \
diff --git a/src/pmie/rc_pmie b/src/pmie/rc_pmie
index bcb0ba7..698c45a 100644
--- a/src/pmie/rc_pmie
+++ b/src/pmie/rc_pmie
@@ -1,5 +1,6 @@
#!/bin/sh
#
+# Copyright (c) 2012 Red Hat.
# Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
#
# This program is free software; you can redistribute it and/or modify it
@@ -109,37 +110,48 @@ _reboot_setup()
[ ! -d "$LOGDIR" ] && mkdir -p "$LOGDIR" && chown pcp:pcp "$LOGDIR"
}
+# Note: _start_pmie is running in the background, in parallel with
+# the rest of the script. It might complete well after the caller
+# so tmpfile handling is especially problematic. Goal is to speed
+# bootup by starting potentially slow (remote monitoring) processes
+# in the background.
+#
_start_pmie()
{
+ bgstatus=0
+ bgtmp=`mktemp -d /var/tmp/pcp.XXXXXXXXX` || exit 1
+ trap "rm -rf $bgtmp; exit \$bgstatus" 0 1 2 3 15
+
wait_option=''
[ ! -z "$PMCD_WAIT_TIMEOUT" ] && wait_option="-t $PMCD_WAIT_TIMEOUT"
if pmcd_wait $wait_option
then
- pmie_check >$tmp/pmie 2>&1
- if [ -s $tmp/pmie ]
+ pmie_check >$bgtmp/pmie 2>&1
+ bgstatus=$?
+ if [ -s $bgtmp/pmie ]
then
pmpost "pmie_check start failed in $prog, mailing output to root"
if [ ! -z "$MAIL" ]
then
- $MAIL -s "pmie_check start failed in $prog" root <$tmp/pmie >/dev/null 2>&1
+ $MAIL -s "pmie_check start failed in $prog" root <$bgtmp/pmie >/dev/null 2>&1
else
echo "$prog: pmie_check start failed ..."
- cat $tmp/pmie
+ cat $bgtmp/pmie
fi
fi
- rm -f $tmp/pmie
else
- status=$?
- pmpost "pmcd_wait failed in $prog: exit status: $status"
+ bgstatus=$?
+ pmpost "pmcd_wait failed in $prog: exit status: $bgstatus"
if [ ! -z "$MAIL" ]
then
- echo "pmcd_wait: exit status: $status" | $MAIL -s "pmcd_wait failed in $prog" root
+ echo "pmcd_wait: exit status: $bgstatus" | $MAIL -s "pmcd_wait failed in $prog" root
else
echo "$prog: pmcd_wait failed ..."
- echo "pmcd_wait: exit status: $status"
+ echo "pmcd_wait: exit status: $bgstatus"
fi
fi
+ exit $bgstatus # co-process is now complete
}
_shutdown()
diff --git a/src/pmlogger/rc_pmlogger b/src/pmlogger/rc_pmlogger
index 6f9949f..84f3382 100644
--- a/src/pmlogger/rc_pmlogger
+++ b/src/pmlogger/rc_pmlogger
@@ -1,5 +1,6 @@
#!/bin/sh
#
+# Copyright (c) 2012 Red Hat.
# Copyright (c) 2000-2008 Silicon Graphics, Inc. All Rights Reserved.
#
# This program is free software; you can redistribute it and/or modify it
@@ -12,10 +13,6 @@
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
# Start or Stop the Performance Co-Pilot pmlogger processes.
#
# The following is for chkconfig on RedHat based systems
@@ -95,21 +92,32 @@ in
;;
esac
+# Note: _start_pmcheck() runs in the background, in parallel with
+# the rest of the script. It might complete well after the caller
+# so tmpfile handling is especially problematic. Goal is to speed
+# bootup by starting potentially slow (remote monitoring) pmlogger
+# processes in the background.
+#
_start_pmcheck()
{
- pmlogger_check $VFLAG >$tmp/pmcheck 2>&1
- if [ -s $tmp/pmcheck ]
+ bgstatus=0
+ bgtmp=`mktemp -d /var/tmp/pcp.XXXXXXXXX` || exit 1
+ trap "rm -rf $bgtmp; exit \$bgstatus" 0 1 2 3 15
+
+ pmlogger_check $VFLAG >$bgtmp/pmcheck 2>&1
+ bgstatus=$?
+ if [ -s $bgtmp/pmcheck ]
then
pmpost "pmlogger_check failed in $prog, mailing output to root"
if [ ! -z "$MAIL" ]
then
- $MAIL -s "pmlogger_check failed in $prog" root <$tmp/pmcheck
+ $MAIL -s "pmlogger_check failed in $prog" root <$bgtmp/pmcheck
else
echo "$prog: pmlogger_check failed ..."
- cat $tmp/pmcheck
+ cat $bgtmp/pmcheck
fi
fi
- rm -f $tmp/pmcheck
+ exit $bgstatus # co-process is now complete
}
_start_pmlogger()
--
1.7.10.4

3
pcp-3.10.2.src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c641c26a476f1743c17590a39c1b19edb9fc4becc16a910d92c72a4c3eeda01a
size 14111630

26
pcp-3.6.10-gcc5-reservedword.patch
View File

@ -1,26 +0,0 @@
Index: src/pmdas/bash/event.c
===================================================================
--- src/pmdas/bash/event.c.orig 2012-10-14 00:50:38.000000000 +0200
+++ src/pmdas/bash/event.c 2015-02-23 16:08:13.039795393 +0100
@@ -168,7 +168,7 @@ process_alloc(const char *bashname, bash
bashful->queueid = queueid;
bashful->exited = 0;
bashful->finished = 0;
- bashful->restrict = 0;
+ bashful->restricted = 0;
bashful->version = init->version;
bashful->padding = 0;
Index: src/pmdas/bash/event.h
===================================================================
--- src/pmdas/bash/event.h.orig 2012-10-08 07:16:37.000000000 +0200
+++ src/pmdas/bash/event.h 2015-02-23 16:08:03.822057504 +0100
@@ -29,7 +29,7 @@ typedef struct bash_process {
int exited : 1; /* flag: process running? */
int finished: 1; /* flag: exit event sent? */
- int restrict: 1; /* flag: store-to-access? */
+ int restricted: 1; /* flag: store-to-access? */
int version : 8; /* pmda <-> bash xtrace version */
int padding : 21; /* filler */

3
pcp-3.6.10.src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d3b5d38536b48b5a21fc139a294e3177af96e9ac22a7cc89cef9457589bb46b
size 4687066

3
pcp-webjs.src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df470158fb5a075e5b4a260b8fc52dcda6f8b93baf3e3bc8cd31edd9ee846135
size 3874320

12
pcp-xenbuild.patch
View File

@ -1,12 +0,0 @@
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -545,6 +545,7 @@ NR == 1 { if ($1 != "UID" && $1 != "US
# 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

33
pcp.changes
View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Mon Feb 23 20:21:40 UTC 2015 - kkaempf@suse.com
- 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
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 - boris@steki.net

1375
pcp.spec
View File

File diff suppressed because it is too large Load Diff