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

Accepting request 505504 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/505504
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcp?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2017-06-24 06:34:15 +00:00 committed by Git OBS Bridge
commit 4e0a40b4cf
11 changed files with 2349 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
0001-Fix-XEN-build.patch
View File

@ -1,21 +0,0 @@
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(+)
Index: pcp-3.10.4/configure.ac
===================================================================
--- pcp-3.10.4.orig/configure.ac
+++ pcp-3.10.4/configure.ac
@@ -1105,6 +1105,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

271
0002-Install-libraries-without-exec-permission.patch
View File

@ -22,10 +22,10 @@ Subject: [PATCH 2/6] Install libraries without exec permission
src/pmdas/solaris/GNUmakefile | 3 ++-
16 files changed, 29 insertions(+), 23 deletions(-)
Index: pcp-3.10.4/src/genpmda/genpmda
Index: pcp-3.11.9/src/genpmda/genpmda
===================================================================
--- pcp-3.10.4.orig/src/genpmda/genpmda
+++ pcp-3.10.4/src/genpmda/genpmda
--- pcp-3.11.9.orig/src/genpmda/genpmda
+++ pcp-3.11.9/src/genpmda/genpmda
@@ -909,7 +909,7 @@ install: default
\$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas
\$(INSTALL) -m 755 -d \$(PMDADIR)
@ -44,11 +44,11 @@ Index: pcp-3.10.4/src/genpmda/genpmda
\$(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
Index: pcp-3.10.4/src/libpcp/src/GNUmakefile
Index: pcp-3.11.9/src/libpcp/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp/src/GNUmakefile
@@ -125,7 +125,7 @@ endif
--- pcp-3.11.9.orig/src/libpcp/src/GNUmakefile
+++ pcp-3.11.9/src/libpcp/src/GNUmakefile
@@ -111,7 +111,7 @@ endif
install : default
ifneq ($(LIBTARGET),)
@ -57,7 +57,7 @@ Index: pcp-3.10.4/src/libpcp/src/GNUmakefile
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -133,7 +133,7 @@ ifneq ($(SYMTARGET),)
@@ -119,7 +119,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
@ -66,10 +66,10 @@ Index: pcp-3.10.4/src/libpcp/src/GNUmakefile
endif
default_pcp : default
Index: pcp-3.10.4/src/libpcp_gui/src/GNUmakefile
Index: pcp-3.11.9/src/libpcp_gui/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp_gui/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp_gui/src/GNUmakefile
--- pcp-3.11.9.orig/src/libpcp_gui/src/GNUmakefile
+++ pcp-3.11.9/src/libpcp_gui/src/GNUmakefile
@@ -54,7 +54,7 @@ include $(BUILDRULES)
install: default
@ -88,10 +88,10 @@ Index: pcp-3.10.4/src/libpcp_gui/src/GNUmakefile
endif
default_pcp: default
Index: pcp-3.10.4/src/libpcp_import/src/GNUmakefile
Index: pcp-3.11.9/src/libpcp_import/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp_import/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp_import/src/GNUmakefile
--- pcp-3.11.9.orig/src/libpcp_import/src/GNUmakefile
+++ pcp-3.11.9/src/libpcp_import/src/GNUmakefile
@@ -53,7 +53,7 @@ include $(BUILDRULES)
install: default
@ -110,11 +110,11 @@ Index: pcp-3.10.4/src/libpcp_import/src/GNUmakefile
endif
default_pcp: default
Index: pcp-3.10.4/src/libpcp_mmv/src/GNUmakefile
Index: pcp-3.11.9/src/libpcp_mmv/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp_mmv/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp_mmv/src/GNUmakefile
@@ -48,7 +48,7 @@ include $(BUILDRULES)
--- pcp-3.11.9.orig/src/libpcp_mmv/src/GNUmakefile
+++ pcp-3.11.9/src/libpcp_mmv/src/GNUmakefile
@@ -47,7 +47,7 @@ include $(BUILDRULES)
install: default
ifneq ($(LIBTARGET),)
@ -123,7 +123,7 @@ Index: pcp-3.10.4/src/libpcp_mmv/src/GNUmakefile
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -56,7 +56,7 @@ ifneq ($(SYMTARGET),)
@@ -55,7 +55,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
@ -132,11 +132,11 @@ Index: pcp-3.10.4/src/libpcp_mmv/src/GNUmakefile
endif
default_pcp: default
Index: pcp-3.10.4/src/libpcp_pmda/src/GNUmakefile
Index: pcp-3.11.9/src/libpcp_pmda/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp_pmda/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp_pmda/src/GNUmakefile
@@ -60,7 +60,7 @@ include $(BUILDRULES)
--- pcp-3.11.9.orig/src/libpcp_pmda/src/GNUmakefile
+++ pcp-3.11.9/src/libpcp_pmda/src/GNUmakefile
@@ -61,7 +61,7 @@ include $(BUILDRULES)
install: default
ifneq ($(LIBTARGET),)
@ -145,7 +145,7 @@ Index: pcp-3.10.4/src/libpcp_pmda/src/GNUmakefile
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -68,7 +68,7 @@ ifneq ($(SYMTARGET),)
@@ -69,7 +69,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
@ -154,10 +154,10 @@ Index: pcp-3.10.4/src/libpcp_pmda/src/GNUmakefile
endif
default_pcp: default
Index: pcp-3.10.4/src/libpcp_trace/src/GNUmakefile
Index: pcp-3.11.9/src/libpcp_trace/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp_trace/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp_trace/src/GNUmakefile
--- pcp-3.11.9.orig/src/libpcp_trace/src/GNUmakefile
+++ pcp-3.11.9/src/libpcp_trace/src/GNUmakefile
@@ -56,13 +56,13 @@ include $(BUILDRULES)
install : default
@ -174,11 +174,11 @@ Index: pcp-3.10.4/src/libpcp_trace/src/GNUmakefile
endif
default_pcp : default
Index: pcp-3.10.4/src/pmdas/aix/GNUmakefile
Index: pcp-3.11.9/src/pmdas/aix/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/aix/GNUmakefile
+++ pcp-3.10.4/src/pmdas/aix/GNUmakefile
@@ -43,7 +43,8 @@ build-me: common.h root_aix domain.h $(C
--- pcp-3.11.9.orig/src/pmdas/aix/GNUmakefile
+++ pcp-3.11.9/src/pmdas/aix/GNUmakefile
@@ -44,7 +44,8 @@ build-me: common.h root_aix $(CMDTARGET)
install: build-me
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR)
@ -188,11 +188,11 @@ Index: pcp-3.10.4/src/pmdas/aix/GNUmakefile
$(INSTALL) -m 644 root_aix $(PCP_VAR_DIR)/pmns/root_aix
else
build-me:
Index: pcp-3.10.4/src/pmdas/darwin/GNUmakefile
Index: pcp-3.11.9/src/pmdas/darwin/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/darwin/GNUmakefile
+++ pcp-3.10.4/src/pmdas/darwin/GNUmakefile
@@ -47,7 +47,8 @@ build-me: root_darwin domain.h $(LIBTARG
--- pcp-3.11.9.orig/src/pmdas/darwin/GNUmakefile
+++ pcp-3.11.9/src/pmdas/darwin/GNUmakefile
@@ -48,7 +48,8 @@ build-me: root_darwin $(LIBTARGET) $(CMD
install: build-me
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR)
@ -202,11 +202,11 @@ Index: pcp-3.10.4/src/pmdas/darwin/GNUmakefile
$(INSTALL) -m 644 root_darwin $(PCP_VAR_DIR)/pmns/root_darwin
else
build-me:
Index: pcp-3.10.4/src/pmdas/freebsd/GNUmakefile
Index: pcp-3.11.9/src/pmdas/freebsd/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/freebsd/GNUmakefile
+++ pcp-3.10.4/src/pmdas/freebsd/GNUmakefile
@@ -48,7 +48,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTAR
--- pcp-3.11.9.orig/src/pmdas/freebsd/GNUmakefile
+++ pcp-3.11.9/src/pmdas/freebsd/GNUmakefile
@@ -48,7 +48,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) help
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help help.dir help.pag $(PMDADIR)
@ -216,25 +216,25 @@ Index: pcp-3.10.4/src/pmdas/freebsd/GNUmakefile
$(INSTALL) -m 644 root_freebsd $(PCP_VAR_DIR)/pmns/root_freebsd
else
build-me:
Index: pcp-3.10.4/src/pmdas/linux/GNUmakefile
Index: pcp-3.11.9/src/pmdas/linux/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/linux/GNUmakefile
+++ pcp-3.10.4/src/pmdas/linux/GNUmakefile
@@ -75,7 +75,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTAR
install: default
--- pcp-3.11.9.orig/src/pmdas/linux/GNUmakefile
+++ pcp-3.11.9/src/pmdas/linux/GNUmakefile
@@ -78,7 +78,8 @@ install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help $(HELPTARGETS) $(PMDADIR)
$(INSTALL) -m 644 bandwidth.conf $(PMDADIR)/samplebandwidth.conf
- $(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
Index: pcp-3.10.4/src/pmdas/linux_proc/GNUmakefile
$(INSTALL) -m 644 proc_net_tcp_migrate.conf $(LOGREWRITEDIR)/linux_proc_net_tcp_migrate.conf
Index: pcp-3.11.9/src/pmdas/linux_proc/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/linux_proc/GNUmakefile
+++ pcp-3.10.4/src/pmdas/linux_proc/GNUmakefile
@@ -66,7 +66,8 @@ build-me: domain.h root_proc $(LIBTARGET
--- pcp-3.11.9.orig/src/pmdas/linux_proc/GNUmakefile
+++ pcp-3.11.9/src/pmdas/linux_proc/GNUmakefile
@@ -68,7 +68,8 @@ build-me: root_proc $(LIBTARGET) $(CMDTA
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help help.dir help.pag root root_proc samplehotproc.conf $(PMDADIR)
@ -244,11 +244,11 @@ Index: pcp-3.10.4/src/pmdas/linux_proc/GNUmakefile
$(INSTALL) -m 644 root_proc $(PCP_VAR_DIR)/pmns/root_proc
$(INSTALL) -m 644 $(LOGREWRITERS) $(PCP_VAR_DIR)/config/pmlogrewrite
@$(INSTALL_MAN)
Index: pcp-3.10.4/src/pmdas/lustrecomm/GNUmakefile
Index: pcp-3.11.9/src/pmdas/lustrecomm/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/lustrecomm/GNUmakefile
+++ pcp-3.10.4/src/pmdas/lustrecomm/GNUmakefile
@@ -50,7 +50,7 @@ build-me: domain.h $(TARGETS)
--- pcp-3.11.9.orig/src/pmdas/lustrecomm/GNUmakefile
+++ pcp-3.11.9/src/pmdas/lustrecomm/GNUmakefile
@@ -51,7 +51,7 @@ build-me: $(TARGETS)
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
@ -257,11 +257,11 @@ Index: pcp-3.10.4/src/pmdas/lustrecomm/GNUmakefile
$(INSTALL) -m 755 Install Remove $(PMDADIR)
$(INSTALL) -m 644 $(DFILES) root pmns domain.h help $(PMDADIR)
@$(INSTALL_MAN)
Index: pcp-3.10.4/src/pmdas/pmcd/src/GNUmakefile
Index: pcp-3.11.9/src/pmdas/pmcd/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/pmcd/src/GNUmakefile
+++ pcp-3.10.4/src/pmdas/pmcd/src/GNUmakefile
@@ -54,7 +54,7 @@ default: $(LIBTARGET) domain.h
--- pcp-3.11.9.orig/src/pmdas/pmcd/src/GNUmakefile
+++ pcp-3.11.9/src/pmdas/pmcd/src/GNUmakefile
@@ -55,7 +55,7 @@ default: $(LIBTARGET)
install: default
$(INSTALL) -m 755 -d $(PCP_PMDAS_DIR)/pmcd
@ -270,11 +270,11 @@ Index: pcp-3.10.4/src/pmdas/pmcd/src/GNUmakefile
include $(BUILDRULES)
Index: pcp-3.10.4/src/pmdas/sendmail/GNUmakefile
Index: pcp-3.11.9/src/pmdas/sendmail/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/sendmail/GNUmakefile
+++ pcp-3.10.4/src/pmdas/sendmail/GNUmakefile
@@ -39,7 +39,7 @@ include $(BUILDRULES)
--- pcp-3.11.9.orig/src/pmdas/sendmail/GNUmakefile
+++ pcp-3.11.9/src/pmdas/sendmail/GNUmakefile
@@ -40,7 +40,7 @@ include $(BUILDRULES)
install install_pcp: default
$(INSTALL) -m 755 -d $(PMDADIR)
@ -283,11 +283,11 @@ Index: pcp-3.10.4/src/pmdas/sendmail/GNUmakefile
$(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/pmda$(IAM)$(EXECSUFFIX)
$(INSTALL) -m 755 $(SCRIPTS) $(PMDADIR)
$(INSTALL) -m 644 $(DFILES) pmns help root domain.h $(PMDADIR)
Index: pcp-3.10.4/src/pmdas/solaris/GNUmakefile
Index: pcp-3.11.9/src/pmdas/solaris/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/solaris/GNUmakefile
+++ pcp-3.10.4/src/pmdas/solaris/GNUmakefile
@@ -53,7 +53,8 @@ build-me: root_solaris domain.h $(LIBTAR
--- pcp-3.11.9.orig/src/pmdas/solaris/GNUmakefile
+++ pcp-3.11.9/src/pmdas/solaris/GNUmakefile
@@ -53,7 +53,8 @@ build-me: root_solaris $(LIBTARGET) $(CM
install: build-me
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h $(HELPTARGETS) $(PMDADIR)
@ -297,3 +297,144 @@ Index: pcp-3.10.4/src/pmdas/solaris/GNUmakefile
$(INSTALL) -m 644 root_solaris $(PCP_VAR_DIR)/pmns/root_solaris
else
build-me:
Index: pcp-3.11.9/src/libpcp_fault/src/GNUmakefile
===================================================================
--- pcp-3.11.9.orig/src/libpcp_fault/src/GNUmakefile
+++ pcp-3.11.9/src/libpcp_fault/src/GNUmakefile
@@ -132,7 +132,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 \
@@ -140,7 +140,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
$(INSTALL) -m 644 $(TOPDIR)/src/include/pcp/fault.h $(PCP_INC_DIR)/fault.h
Index: pcp-3.11.9/src/pmdas/jbd2/GNUmakefile
===================================================================
--- pcp-3.11.9.orig/src/pmdas/jbd2/GNUmakefile
+++ pcp-3.11.9/src/pmdas/jbd2/GNUmakefile
@@ -54,7 +54,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help $(HELPTARGETS) root root_jbd2 $(PMDADIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(SCRIPTS) $(PMDADIR)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 root_jbd2 $(PCP_VAR_DIR)/pmns/root_jbd2
$(INSTALL) -m 644 jbd2_kernel_ulong.conf $(LOGREWRITEDIR)/jbd2_kernel_ulong.conf
@$(INSTALL_MAN)
Index: pcp-3.11.9/src/pmdas/linux_xfs/GNUmakefile
===================================================================
--- pcp-3.11.9.orig/src/pmdas/linux_xfs/GNUmakefile
+++ pcp-3.11.9/src/pmdas/linux_xfs/GNUmakefile
@@ -55,7 +55,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help help.dir help.pag root root_xfs $(PMDADIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(SCRIPTS) $(PMDADIR)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 root_xfs $(PCP_VAR_DIR)/pmns/root_xfs
$(INSTALL) -m 644 linux_xfs_migrate.conf $(PCP_VAR_DIR)/config/pmlogrewrite/linux_xfs_migrate.conf
@$(INSTALL_MAN)
Index: pcp-3.11.9/src/pmdas/nvidia/GNUmakefile
===================================================================
--- pcp-3.11.9.orig/src/pmdas/nvidia/GNUmakefile
+++ pcp-3.11.9/src/pmdas/nvidia/GNUmakefile
@@ -37,7 +37,8 @@ include $(BUILDRULES)
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 755 Install Remove $(PMDADIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 $(DFILES) root help pmns domain.h $(PMDADIR)
$(OBJECTS): domain.h
Index: pcp-3.11.9/src/zabbix-agent/src/GNUmakefile
===================================================================
--- pcp-3.11.9.orig/src/zabbix-agent/src/GNUmakefile
+++ pcp-3.11.9/src/zabbix-agent/src/GNUmakefile
@@ -37,7 +37,7 @@ include $(BUILDRULES)
install: default
$(INSTALL) -m 755 -d $(ZABBIX_DIR)
$(INSTALL) -m 755 -d $(MODULE_DIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(MODULE_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(MODULE_DIR)/$(LIBTARGET)
@$(INSTALL_MAN)
default_pcp: default
Index: pcp-3.11.9/src/pmdas/rpm/GNUmakefile
===================================================================
--- pcp-3.11.9.orig/src/pmdas/rpm/GNUmakefile
+++ pcp-3.11.9/src/pmdas/rpm/GNUmakefile
@@ -45,7 +45,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install_pcp install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 root pmns domain.h help $(PMDADIR)
- $(INSTALL) -m 755 $(CMDTARGET) $(LIBTARGET) $(SCRIPTS) $(PMDADIR)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
+ $(INSTALL) -m 755 $(CMDTARGET) $(SCRIPTS) $(PMDADIR)
$(INSTALL) -m 644 migrate.conf $(PCP_VAR_DIR)/config/pmlogrewrite/rpm_migrate.conf
else
build-me:
Index: pcp-3.11.9/src/pmdas/docker/GNUmakefile
===================================================================
--- pcp-3.11.9.orig/src/pmdas/docker/GNUmakefile
+++ pcp-3.11.9/src/pmdas/docker/GNUmakefile
@@ -46,7 +46,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install_pcp install: default
$(INSTALL) -m 755 -d $(PMDADIR)
- $(INSTALL) -m 755 Install Remove $(CMDTARGET) $(LIBTARGET) $(PMDADIR)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
+ $(INSTALL) -m 755 Install Remove $(CMDTARGET) $(PMDADIR)
$(INSTALL) -m 644 root pmns domain.h $(DFILES) $(PMDADIR)
@$(INSTALL_MAN)
else
Index: pcp-3.11.9/src/pmdas/cifs/GNUmakefile
===================================================================
--- pcp-3.11.9.orig/src/pmdas/cifs/GNUmakefile
+++ pcp-3.11.9/src/pmdas/cifs/GNUmakefile
@@ -43,8 +43,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 root pmns domain.h help $(PMDADIR)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 755 Install Remove $(CMDTARGET) $(PMDADIR)
- $(INSTALL) -m 755 Install Remove $(LIBTARGET) $(PMDADIR)
@$(INSTALL_MAN)
else
build-me:
Index: pcp-3.11.9/src/libpcp_web/src/GNUmakefile
===================================================================
--- pcp-3.11.9.orig/src/libpcp_web/src/GNUmakefile
+++ pcp-3.11.9/src/libpcp_web/src/GNUmakefile
@@ -43,7 +43,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 \
@@ -51,7 +51,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

15
0003-pcp-legacy-init-lsb.patch
View File

@ -7,10 +7,10 @@ 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
Index: pcp-3.11.8/src/pmcd/rc_pcp
===================================================================
--- pcp-3.11.8.orig/src/pmcd/rc_pcp
+++ pcp-3.11.8/src/pmcd/rc_pcp
@@ -31,12 +31,12 @@
# e.g. SuSE, where chkconfig is a perl script.
### BEGIN INIT INFO
@ -30,8 +30,8 @@ index 974ca06c2f4a..8d6872cfad9c 100644
# 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}"
@@ -79,6 +79,8 @@ _service()
fi
}
+echo "The pcp init script is depricated, pmcd and pmlogger should be used instead"
@ -39,6 +39,3 @@ index 974ca06c2f4a..8d6872cfad9c 100644
case "$1" in
'start'|'restart'|'condrestart'|'reload'|'force-reload')
--
2.1.2

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

@ -8,32 +8,29 @@ Subject: [PATCH 6/6] create pmlogger and pmie logdirs during install
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)
Index: pcp-3.10.9/src/pmie/GNUmakefile
===================================================================
--- pcp-3.10.9.orig/src/pmie/GNUmakefile
+++ pcp-3.10.9/src/pmie/GNUmakefile
@@ -58,6 +58,8 @@ ifeq ($(TARGET_OS),linux)
# Docker version of the crontab into the hosts /etc/cron.d directory.
$(INSTALL) -m 644 crontab.docker $(PCP_VAR_DIR)/config/pmie/crontab.docker
$(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)
Index: pcp-3.10.9/src/pmlogger/GNUmakefile
===================================================================
--- pcp-3.10.9.orig/src/pmlogger/GNUmakefile
+++ pcp-3.10.9/src/pmlogger/GNUmakefile
@@ -62,6 +62,8 @@ ifeq ($(TARGET_OS),linux)
# Docker version of the crontab into the hosts cron.d directory.
$(INSTALL) -m 644 crontab.docker $(PCP_VAR_DIR)/config/pmlogger/crontab.docker
$(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
$(INSTALL) -m 644 utilproc.sh $(PCP_SHARE_DIR)/lib/utilproc.sh

75
0007-Honor-CFLAGS-in-qmake.patch
View File

@ -15,22 +15,22 @@ http://stackoverflow.com/questions/17578150/add-cflags-to-qmake-project-without-
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
Index: pcp-3.11.8/src/libpcp_qed/src/libpcp_qed.pro
===================================================================
--- pcp-3.11.8.orig/src/libpcp_qed/src/libpcp_qed.pro
+++ pcp-3.11.8/src/libpcp_qed/src/libpcp_qed.pro
@@ -6,6 +6,7 @@ INCLUDEPATH += ../../include ../../libpc
release:DESTDIR = build/debug
debug:DESTDIR = build/release
QT = core gui network svg
QT = core gui network printsupport svg widgets
+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
Index: pcp-3.11.8/src/libpcp_qmc/src/libpcp_qmc.pro
===================================================================
--- pcp-3.11.8.orig/src/libpcp_qmc/src/libpcp_qmc.pro
+++ pcp-3.11.8/src/libpcp_qmc/src/libpcp_qmc.pro
@@ -5,6 +5,7 @@ CONFIG += qt staticlib warn_on
INCLUDEPATH += ../../include
release:DESTDIR = build/debug
@ -39,45 +39,42 @@ index 39671ab2dceb..b59ffa4e6bb9 100644
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
Index: pcp-3.11.8/src/libpcp_qwt/src/libpcp_qwt.pro
===================================================================
--- pcp-3.11.8.orig/src/libpcp_qwt/src/libpcp_qwt.pro
+++ pcp-3.11.8/src/libpcp_qwt/src/libpcp_qwt.pro
@@ -8,6 +8,7 @@ QT = core gui network svg
greaterThan(QT_MAJOR_VERSION, 4) {
QT += concurrent printsupport
}
+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
Index: pcp-3.11.8/src/pmdumptext/pmdumptext.pro
===================================================================
--- pcp-3.11.8.orig/src/pmdumptext/pmdumptext.pro
+++ pcp-3.11.8/src/pmdumptext/pmdumptext.pro
@@ -10,3 +10,4 @@ LIBS += -L../libpcp_qmc/src -L../libpcp
LIBS += -lpcp_qmc -lpcp
win32:LIBS += -lwsock32 -liphlpapi
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
Index: pcp-3.11.8/src/pmquery/pmquery.pro
===================================================================
--- pcp-3.11.8.orig/src/pmquery/pmquery.pro
+++ pcp-3.11.8/src/pmquery/pmquery.pro
@@ -8,3 +8,4 @@ CONFIG += qt warn_on
QT += widgets
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
Index: pcp-3.11.8/src/pmtime/pmtime.pro
===================================================================
--- pcp-3.11.8.orig/src/pmtime/pmtime.pro
+++ pcp-3.11.8/src/pmtime/pmtime.pro
@@ -22,3 +22,4 @@ LIBS += -lpcp_qwt -lpcp_qmc -lpcp
win32:LIBS += -lwsock32
QT += network
win32:LIBS += -lwsock32 -liphlpapi
QT += network widgets
QMAKE_INFO_PLIST = pmtime.info
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
--
2.1.2

17
_service Normal file
View File

@ -0,0 +1,17 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/performancecopilot/pcp.git</param>
<param name="filename">pcp</param>
<param name="revision">6a273f2027f9d052316b81f2beb1b5efe12c4ae5</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">disable</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">bz2</param>
</service>
<service name="set_version" mode="disabled">
<param name="basename">pcp</param>
</service>
</services>

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

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

3
pcp-3.11.9.tar.bz2 Normal file
View File

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

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

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

72
pcp.changes
View File

@ -1,3 +1,75 @@
-------------------------------------------------------------------
Mon Jun 19 23:09:32 UTC 2017 - ddiss@suse.com
- Follow the shared library packaging policy and split libpcp_gui.so.2,
libpcp_mmv.so.1, libpcp_trace.so.2, libpcp_import.so.1 and libpcp_web.so.1
out from libpcp3 into separate packages.
- Drop a number of unneeded explicit library package Requires.
- Fix a number of file manifest conflicts.
- Drop lio pmda on SUSE systems without proper rtslib-fb dependency.
-------------------------------------------------------------------
Sun Jun 18 19:53:55 UTC 2017 - ddiss@suse.com
- Update to 3.11.9
See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.11.9
for details.
-------------------------------------------------------------------
Fri Mar 31 12:42:00 UTC 2017 - ddiss@suse.com
- Disable remote _service execution
+ Run locally and add generated tarball and spec file
-------------------------------------------------------------------
Mon Mar 27 15:13:39 UTC 2017 - ddiss@suse.com
- Update to 3.11.8
See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.11.8
for details.
- Remove 0010-build-do-not-include-.gitignore-in-installed-file-se.patch
+ Upstream
- Drop pcp-webjs.src.tar.gz
+ https://github.com/performancecopilot/pcp-webjs/issues/3
+ Vector will be pulled in from the upstream source in future
- Enable pmda-systemd package
+ libsystemd pkg-config detection fixed upstream
- New packages
+ pcp-devel: Upstream split of non-essential devel packages from
libpcp-devel
+ pcp-pmda-bind2
+ pcp-pmda-docker
+ pcp-pmda-lio
+ pcp-pmda-nutcracker
+ pcp-pmda-oracle
+ pcp-pmda-redis
+ pcp-pmda-libvirt
+ pcp-export-pcp2influxdb
-------------------------------------------------------------------
Wed Mar 22 15:06:13 UTC 2017 - ddiss@suse.com
- Update to 3.10.9
See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.10.9
for details.
- Drop obsolete 0001-Fix-XEN-build.patch
+ PCP_PS_ALL_FLAGS now used explicitly
- Add 0010-build-do-not-include-.gitignore-in-installed-file-se.patch
- Split out a number of agents from the base package into separate rpms
- Disable sheet2pcp
+ As per upstream: "until BZ 830923 and BZ 754678 are resolved".
-------------------------------------------------------------------
Tue Feb 28 18:09:50 UTC 2017 - ddiss@suse.com
- Add _service file for pulling directly from the upstream Git repository.
-------------------------------------------------------------------
Thu Apr 16 09:14:35 UTC 2015 - ddiss@suse.com

2301
pcp.spec
View File

File diff suppressed because it is too large Load Diff