rpms/pacemaker
6
0
Fork 0
Code Issues Pull Requests Releases Activity
436eae4e1e
pacemaker/0004-Build-cts-update-scripts-to-use-new-BASH_PATH-subsit.patch
Jan Pokorný 436eae4e1e
2.0.0-0.1.rc2 - Update for new upstream tarball 
... for release candidate: Pacemaker-2.0.0-rc2,
  for full details, see included ChangeLog file or
  https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.0.0-rc2

Adapt spec file more akin to upstream version including:
. out-of-tree change from 1.1.18-2 build got subsumed (508ad52e7)
. %%{_sysconfdir}/pacemaker path got properly owned
  (-cli package; f6e3ab98d)
. -libs package started to properly declare Requires(pre): shadow-utils
  (293fcc1e8 + b3d49d210)
. some build conditionals and dependencies dropped for no longer
  (snmp, esmtp; f24bdc6f2 and 1f7374884, respectively) or never
  being relevant (~bison, byacc, flex; 61aef8af4)
. some dependencies were constrained with new or higher lower bounds:
  corosync needs to be of version 2+ unconditionally (ccd58fe29),
  ditto some others components (~GLib, 1ac2e7cbb), plus both 2 and 3
  versions of Python are now (comprehensively for the auxiliary
  functionality where used) supported upstream with the latter being
  a better fit (453355f8f)
. package descriptions got to reflect the drop of legacy low-level
  cluster infrastructures (55ab749bf)

Adapt spec file akin to current packaging guidelines including:
. drop some redundant/futile expressions (defattr, "-n %%{name}-libs"
  instead of plain "libs", "timezone hack"), add some notes for future
. make -cts and -doc packages noarch (former enabled with 088a5e7d4)
. simplify "systemd_requires" macro invocation, and relax it to
  "systemd_ordering" for -remote package where possible so as not
  to drag systemd into a lightweight system setup (e.g. container)
  needlessly
. adjust, in a compatible way, common ldconfig invocation with
  post{,un} scriptlets
  (https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets)
. drop some more unuseful conditionals (upstart_job)

Apply some regression fixes on top as patches (PR #1457, #1459)

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
2018-04-13 18:27:39 +02:00

179 lines
6.1 KiB
Diff
Raw Blame History

From 5f370802061ea4e8d5a194fd5ed4f1020e195145 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Mon, 9 Apr 2018 10:57:40 -0500
Subject: [PATCH 04/17] Build: cts: update scripts to use new @BASH_PATH@
subsitution variable
---
configure.ac | 5 ++++
cts/{CTS.py => CTS.py.in} | 28 +++++------------------
cts/{cluster_test => cluster_test.in} | 8 ++++++-
cts/{cts-cli => cts-cli.in} | 8 ++++++-
cts/{cts-regression => cts-regression.in} | 7 +++++-
cts/{cts => cts.in} | 8 ++++++-
7 files changed, 38 insertions(+), 26 deletions(-)
rename cts/{CTS.py => CTS.py.in} (97%)
rename cts/{cluster_test => cluster_test.in} (96%)
rename cts/{cts-cli => cts-cli.in} (99%)
rename cts/{cts-regression => cts-regression.in} (96%)
rename cts/{cts => cts.in} (97%)
diff --git a/configure.ac b/configure.ac
index c39954272..41676ed61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1700,9 +1700,13 @@ dnl Files we output that need to be executable
AC_CONFIG_FILES([cts/CTSlab.py], [chmod +x cts/CTSlab.py])
AC_CONFIG_FILES([cts/LSBDummy], [chmod +x cts/LSBDummy])
AC_CONFIG_FILES([cts/OCFIPraTest.py], [chmod +x cts/OCFIPraTest.py])
+AC_CONFIG_FILES([cts/cluster_test], [chmod +x cts/cluster_test])
+AC_CONFIG_FILES([cts/cts], [chmod +x cts/cts])
+AC_CONFIG_FILES([cts/cts-cli], [chmod +x cts/cts-cli])
AC_CONFIG_FILES([cts/cts-coverage], [chmod +x cts/cts-coverage])
AC_CONFIG_FILES([cts/cts-lrmd], [chmod +x cts/cts-lrmd])
AC_CONFIG_FILES([cts/cts-pengine], [chmod +x cts/cts-pengine])
+AC_CONFIG_FILES([cts/cts-regression], [chmod +x cts/cts-regression])
AC_CONFIG_FILES([cts/cts-stonithd], [chmod +x cts/cts-stonithd])
AC_CONFIG_FILES([cts/lxc_autogen.sh], [chmod +x cts/lxc_autogen.sh])
AC_CONFIG_FILES([cts/benchmark/clubench], [chmod +x cts/benchmark/clubench])
@@ -1718,6 +1722,7 @@ dnl Other files we output
AC_CONFIG_FILES(Makefile \
Doxyfile \
cts/Makefile \
+ cts/CTS.py \
cts/CTSvars.py \
cts/benchmark/Makefile \
cib/Makefile \
diff --git a/cts/CTS.py b/cts/CTS.py.in
similarity index 97%
rename from cts/CTS.py
rename to cts/CTS.py.in
index e78b54d56..30ecfba88 100644
--- a/cts/CTS.py
+++ b/cts/CTS.py.in
@@ -3,27 +3,11 @@
Classes related to testing high-availability clusters...
'''
-from __future__ import print_function
-
-__copyright__ = '''
-Copyright (C) 2000, 2001 Alan Robertson <alanr@unix.sh>
-Licensed under the GNU GPL.
-'''
-
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# Pacemaker targets compatibility with Python 2.7 and 3.2+
+from __future__ import print_function, unicode_literals, absolute_import, division
+
+__copyright__ = "Copyright 2000-2018 Alan Robertson <alanr@unix.sh>"
+__license__ = "GNU General Public License version 2 or later (GPLv2+) WITHOUT ANY WARRANTY"
import string, sys, time, re, os, traceback
@@ -42,7 +26,7 @@ from cts.patterns import PatternSelector
has_log_stats = {}
log_stats_bin = CTSvars.CRM_DAEMON_DIR + "/cts_log_stats.sh"
log_stats = """
-#!/bin/bash
+#!@BASH_PATH@
# Tool for generating system load reports while CTS runs
trap "" 1
diff --git a/cts/cluster_test b/cts/cluster_test.in
similarity index 96%
rename from cts/cluster_test
rename to cts/cluster_test.in
index 0cc8c26af..603bfe2f7 100755
--- a/cts/cluster_test
+++ b/cts/cluster_test.in
@@ -1,4 +1,10 @@
-#!/bin/bash
+#!@BASH_PATH@
+#
+# Copyright 2008-2018 Andrew Beekhof <andrew@beekhof.net>
+#
+# This source code is licensed under the GNU General Public License version 2
+# or later (GPLv2+) WITHOUT ANY WARRANTY.
+#
if [ -e ~/.cts ]; then
. ~/.cts
fi
diff --git a/cts/cts-cli b/cts/cts-cli.in
similarity index 99%
rename from cts/cts-cli
rename to cts/cts-cli.in
index 75751c662..e62e5e2fe 100755
--- a/cts/cts-cli
+++ b/cts/cts-cli.in
@@ -1,4 +1,10 @@
-#!/bin/bash
+#!@BASH_PATH@
+#
+# Copyright 2008-2018 Andrew Beekhof <andrew@beekhof.net>
+#
+# This source code is licensed under the GNU General Public License version 2
+# or later (GPLv2+) WITHOUT ANY WARRANTY.
+#
USAGE_TEXT="Usage: cts-cli [<options>]
Options:
diff --git a/cts/cts-regression b/cts/cts-regression.in
similarity index 96%
rename from cts/cts-regression
rename to cts/cts-regression.in
index fbc6319f8..6c9931f79 100755
--- a/cts/cts-regression
+++ b/cts/cts-regression.in
@@ -1,9 +1,14 @@
-#!/bin/bash
+#!@BASH_PATH@
#
# cts-regression
#
# Convenience wrapper for running any of the Pacemaker regression tests
#
+# Copyright 2012-2018 Andrew Beekhof <andrew@beekhof.net>
+#
+# This source code is licensed under the GNU General Public License version 2
+# or later (GPLv2+) WITHOUT ANY WARRANTY.
+#
USAGE_TEXT="Usage: cts-regression [<options>] [<test> ...]
Options:
diff --git a/cts/cts b/cts/cts.in
similarity index 97%
rename from cts/cts
rename to cts/cts.in
index 5a2ee0c47..9ff107c66 100755
--- a/cts/cts
+++ b/cts/cts.in
@@ -1,4 +1,10 @@
-#!/bin/bash
+#!@BASH_PATH
+#
+# Copyright 2012-2018 Andrew Beekhof <andrew@beekhof.net>
+#
+# This source code is licensed under the GNU General Public License version 2
+# or later (GPLv2+) WITHOUT ANY WARRANTY.
+#
if [ -e $PWD/cts/CTSlab.py ]; then
cts_root=$PWD/cts
--
2.17.0
Reference in New Issue View Git Blame Copy Permalink