mgoodwin pushed to pcp (el5). "remove stale patch sources"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Jun 16 00:51:24 UTC 2015
From f0c40041ffe48e180e143b2937500d7585da16fa Mon Sep 17 00:00:00 2001
From: Mark Goodwin <mgoodwin at redhat.com>
Date: Tue, 16 Jun 2015 10:51:13 +1000
Subject: remove stale patch sources
diff --git a/pcp.3.10.2.el5.python-1.patch b/pcp.3.10.2.el5.python-1.patch
deleted file mode 100644
index 34e6cbe..0000000
--- a/pcp.3.10.2.el5.python-1.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-diff --git a/qa/GNUmakefile b/qa/GNUmakefile
-index 1751d69..0c7dbf1 100644
---- a/qa/GNUmakefile
-+++ b/qa/GNUmakefile
-@@ -1,5 +1,6 @@
- #!gmake
- #
-+# Copyright (c) 2015 Red Hat.
- # Copyright (c) 1997-2002 Silicon Graphics, Inc. All Rights Reserved.
- #
- # NB: this GNUmakefile is only for use from within the PCP build tree. It governs
-@@ -13,8 +14,11 @@ include $(TOPDIR)/src/include/builddefs
- TESTDIR = $(PCP_VAR_DIR)/testsuite
- TESTS = $(shell sed -n -e '/^[0-9]/s/:retired//' -e '/^[0-9]/s/:reserved//' -e '/^[0-9]/s/[ ].*//' -e '/^[0-9]/p' <group)
-
--SUBDIRS = src pmdas cisco gluster pconf sadist collectl secure nfsclient \
-+SUBDIRS = src pmdas cisco gluster pconf sadist collectl nfsclient \
- archives views qt linux perfevent unbound cifs
-+ifeq "$(ENABLE_PYTHON)" "true"
-+SUBDIRS += secure
-+endif
- LCONFIG = localconfig
-
- # No implicit rules here, thank you
-@@ -49,8 +53,11 @@ COMMON_SCRIPTS = common.install.cisco common.pcpweb
- COMMON = common.check common.config common.filter \
- common.product common.rc common.setup \
- common.secure common.gfs2 common.rpm \
-- common.python common.sh common.qt common.avahi \
-+ common.sh common.qt common.avahi \
- common.discovery common.compress common.webapi
-+ifeq "$(ENABLE_PYTHON)" "true"
-+COMMON += common.python
-+endif
-
- OTHERS = GNUmakefile.install group qa_hosts.master README \
- valgrind-suppress sanity.coverage
-diff --git a/qa/pmdas/GNUmakefile b/qa/pmdas/GNUmakefile
-index 9d1e915..bfbb510 100644
---- a/qa/pmdas/GNUmakefile
-+++ b/qa/pmdas/GNUmakefile
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2012-2014 Red Hat.
-+# Copyright (c) 2012-2015 Red Hat.
- # Copyright (c) 2010 Aconex. All Rights Reserved.
- #
-
-@@ -7,9 +7,13 @@ TOPDIR = ../..
- include $(TOPDIR)/src/include/builddefs
-
- TESTDIR = $(PCP_VAR_DIR)/testsuite/pmdas
--SUBDIRS = broken bigun dynamic slow slow_python memory_python test_perl \
-+SUBDIRS = broken bigun dynamic slow test_perl \
- schizo
-
-+ifeq "$(ENABLE_PYTHON)" "true"
-+SUBDIRS += slow_python memory_python
-+endif
-+
- default default_pcp: $(SUBDIRS)
- $(SUBDIRS_MAKERULE)
-
-diff --git a/qa/src/GNUlocaldefs b/qa/src/GNUlocaldefs
-index 897ed8e..d489cf9 100644
---- a/qa/src/GNUlocaldefs
-+++ b/qa/src/GNUlocaldefs
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2012-2014 Red Hat.
-+# Copyright (c) 2012-2015 Red Hat.
- # Copyright (c) 2009 Aconex. All Rights Reserved.
- # Copyright (c) 1997-2002 Silicon Graphics, Inc. All Rights Reserved.
- #
-@@ -158,6 +158,7 @@ PERLFILES = \
- # not installed:
- PLFILES = $(shell echo $(PERLFILES) | sed -e 's/\.perl/.pl/g')
-
-+ifeq "$(ENABLE_PYTHON)" "true"
- PYTHONFILES = \
- test_pcp.python test_pmcc.python \
- test_pmi.python check_import.python \
-@@ -166,6 +167,10 @@ PYTHONFILES = \
- test_pcp_time.python
- # not installed:
- PYFILES = $(shell echo $(PYTHONFILES) | sed -e 's/\.python/.py/g')
-+else
-+PYTHONFILES =
-+PYFILES =
-+endif
-
- ifneq "$(TARGET_OS)" "mingw"
- CFILES += $(POSIXFILES) $(TRACEFILES)
-diff --git a/src/GNUmakefile b/src/GNUmakefile
-index a161d62..bd4205f 100644
---- a/src/GNUmakefile
-+++ b/src/GNUmakefile
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2012-2014 Red Hat.
-+# Copyright (c) 2012-2015 Red Hat.
- # Copyright (c) 2000,2004,2012 Silicon Graphics, Inc. All Rights Reserved.
- #
- # This program is free software; you can redistribute it and/or modify it
-@@ -90,7 +90,6 @@ OTHER_SUBDIRS = \
- pmval \
- pmwebapi \
- perl \
-- python \
- procmemstat \
- autofsd-probe \
- telnet-probe \
-@@ -103,6 +102,10 @@ OTHER_SUBDIRS = \
- pcp2graphite \
- #
-
-+ifeq "$(ENABLE_PYTHON)" "true"
-+OTHER_SUBDIRS += python
-+endif
-+
- SUBDIRS = \
- $(INCLUDE_SUBDIR) \
- $(LIBPCP_SUBDIR) \
-diff --git a/src/pmdas/GNUmakefile b/src/pmdas/GNUmakefile
-index 6820ace..a12c0a3 100644
---- a/src/pmdas/GNUmakefile
-+++ b/src/pmdas/GNUmakefile
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2013-2014 Red Hat.
-+# Copyright (c) 2013-2015 Red Hat.
- # Copyright (c) 2000,2003,2004 Silicon Graphics, Inc. All Rights Reserved.
- #
- # This program is free software; you can redistribute it and/or modify it
-@@ -32,7 +32,11 @@ PLPMDAS = bonding netfilter zimbra postgresql \
- rsyslog elasticsearch snmp nginx nfsclient \
- ds389 ds389log activemq
-
-+ifeq "$(ENABLE_PYTHON)" "true"
- PYPMDAS = gluster zswap dmcache unbound
-+else
-+PYPMDAS =
-+endif
-
- SUBDIRS = $(CPMDAS) $(PLPMDAS) $(PYPMDAS)
- LDIRT = pmcd.conf
-diff --git a/src/pmdas/simple/GNUmakefile b/src/pmdas/simple/GNUmakefile
-index a0c50bb..eb071ad 100644
---- a/src/pmdas/simple/GNUmakefile
-+++ b/src/pmdas/simple/GNUmakefile
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2012-2013 Red Hat.
-+# Copyright (c) 2012-2015 Red Hat.
- # Copyright (c) 2000,2003,2004 Silicon Graphics, Inc. All Rights Reserved.
- #
- # This program is free software; you can redistribute it and/or modify it
-@@ -21,7 +21,10 @@ CMDTARGET = pmdasimple$(EXECSUFFIX)
- LLDLIBS = $(PCP_PMDALIB)
- LCFLAGS = -I.
- DFILES = README help
--SCRIPTS = pmdasimple.perl pmdasimple.python
-+SCRIPTS = pmdasimple.perl
-+ifeq "$(ENABLE_PYTHON)" "true"
-+SCRIPTS += pmdasimple.python
-+endif
- LSRCFILES = Install Remove pmns root $(DFILES) $(SCRIPTS) \
- simple.conf GNUmakefile.install
-
diff --git a/pcp.3.10.2.el5.python-2.patch b/pcp.3.10.2.el5.python-2.patch
deleted file mode 100644
index a4f99bf..0000000
--- a/pcp.3.10.2.el5.python-2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/qa/common.python b/qa/common.python
-index e9d4dcc..d8e917b 100755
---- a/qa/common.python
-+++ b/qa/common.python
-@@ -10,6 +10,7 @@
-
- # allow alternate versions of python to be used
- python=${PYTHON:-/usr/bin/python}
-+eval $python -c exit 2>/dev/null || _notrun "$python unavailable"
-
- # verify output from unittest indicates successful testing
- _check_unittest()
-diff --git a/src/GNUmakefile b/src/GNUmakefile
-index bd4205f..98682d0 100644
---- a/src/GNUmakefile
-+++ b/src/GNUmakefile
-@@ -90,6 +90,7 @@ OTHER_SUBDIRS = \
- pmval \
- pmwebapi \
- perl \
-+ python \
- procmemstat \
- autofsd-probe \
- telnet-probe \
-@@ -102,10 +103,6 @@ OTHER_SUBDIRS = \
- pcp2graphite \
- #
-
--ifeq "$(ENABLE_PYTHON)" "true"
--OTHER_SUBDIRS += python
--endif
--
- SUBDIRS = \
- $(INCLUDE_SUBDIR) \
- $(LIBPCP_SUBDIR) \
diff --git a/statics.patch b/statics.patch
deleted file mode 100644
index 830de11..0000000
--- a/statics.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 23dfcd45668d2076dfceeeb96d80a42b06240fe6
-Author: Nathan Scott <nathans at redhat.com>
-Date: Thu Mar 20 14:05:30 2014 +1100
-
- Fix build on RHEL5 i386 where libpcp has unexpected statics
-
- $ ./check-statics
- rtime.o: d startend_relative_terms.9369 : Error: additional symbol
-
-diff --git a/src/libpcp/src/check-statics b/src/libpcp/src/check-statics
-index 086167786965..7f04ee771e34 100755
---- a/src/libpcp/src/check-statics
-+++ b/src/libpcp/src/check-statics
-@@ -315,7 +315,7 @@ rtime.o
- r ?ampm # const (MinGW)
- r ?months # const (MinGW)
- r ?wdays # const (MinGW)
-- s ?startend_relative_terms.[0-9]* # const
-+ [ds] ?startend_relative_terms.[0-9]* # const
- sortinst.o
- spec.o
- store.o
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/pcp.git/commit/?h=el5&id=f0c40041ffe48e180e143b2937500d7585da16fa
More information about the scm-commits
mailing list