|
 |
c54a00 |
From 55c576d970ed5b3446204668e7439d626e6d1a13 Mon Sep 17 00:00:00 2001
|
|
|
c54a00 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
c54a00 |
Date: Fri, 29 Mar 2019 19:48:23 -0500
|
|
|
c54a00 |
Subject: [PATCH 1/3] Build: configure: make bug report URL configurable
|
|
|
c54a00 |
|
|
|
c54a00 |
to allow distributions to direct users to their own bug reporters
|
|
|
c54a00 |
---
|
|
|
c54a00 |
configure.ac | 10 ++++++++++
|
|
|
c54a00 |
1 file changed, 10 insertions(+)
|
|
|
c54a00 |
|
|
|
c54a00 |
diff --git a/configure.ac b/configure.ac
|
|
|
c54a00 |
index 70e074e..6fd17fd 100644
|
|
|
c54a00 |
--- a/configure.ac
|
|
|
c54a00 |
+++ b/configure.ac
|
|
|
c54a00 |
@@ -318,6 +318,12 @@ AC_ARG_WITH(brand,
|
|
|
c54a00 |
[ test x"$withval" = x"no" || PUBLICAN_BRAND="$withval" ])
|
|
|
c54a00 |
AC_SUBST(PUBLICAN_BRAND)
|
|
|
c54a00 |
|
|
|
c54a00 |
+BUG_URL=""
|
|
|
c54a00 |
+AC_ARG_WITH(bug-url,
|
|
|
c54a00 |
+ [ --with-bug-url=DIR Address where users should submit bug reports @<:@https://bugs.clusterlabs.org/enter_bug.cgi?product=Pacemaker@:>@],
|
|
|
c54a00 |
+ [ BUG_URL="$withval" ]
|
|
|
c54a00 |
+)
|
|
|
c54a00 |
+
|
|
|
c54a00 |
ASCIIDOC_CLI_TYPE="pcs"
|
|
|
c54a00 |
AC_ARG_WITH(doc-cli,
|
|
|
c54a00 |
[ --with-doc-cli=cli_type CLI type to use for generated documentation. [$ASCIIDOC_CLI_TYPE]],
|
|
|
c54a00 |
@@ -442,6 +448,10 @@ if test x"${CONFIGDIR}" = x""; then
|
|
|
c54a00 |
fi
|
|
|
c54a00 |
AC_SUBST(CONFIGDIR)
|
|
|
c54a00 |
|
|
|
c54a00 |
+if test x"${BUG_URL}" = x""; then
|
|
|
c54a00 |
+ BUG_URL="https://bugs.clusterlabs.org/enter_bug.cgi?product=Pacemaker"
|
|
|
c54a00 |
+fi
|
|
|
c54a00 |
+
|
|
|
c54a00 |
for j in prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir \
|
|
|
c54a00 |
sharedstatedir localstatedir libdir includedir oldincludedir infodir \
|
|
|
c54a00 |
mandir INITDIR docdir CONFIGDIR
|
|
|
c54a00 |
--
|
|
|
c54a00 |
1.8.3.1
|
|
|
c54a00 |
|
|
|
c54a00 |
|
|
|
c54a00 |
From 6c5938df90f83dcd686f11453ae701099a98836b Mon Sep 17 00:00:00 2001
|
|
|
c54a00 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
c54a00 |
Date: Fri, 29 Mar 2019 19:50:21 -0500
|
|
|
c54a00 |
Subject: [PATCH 2/3] Feature: tools: make crm_report bug report URL
|
|
|
c54a00 |
configurable at build time
|
|
|
c54a00 |
|
|
|
c54a00 |
should have been done with 52aaffd
|
|
|
c54a00 |
---
|
|
|
c54a00 |
configure.ac | 1 +
|
|
|
c54a00 |
tools/crm_report.in | 2 +-
|
|
|
c54a00 |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
c54a00 |
|
|
|
c54a00 |
diff --git a/configure.ac b/configure.ac
|
|
|
c54a00 |
index 6fd17fd..ed51f67 100644
|
|
|
c54a00 |
--- a/configure.ac
|
|
|
c54a00 |
+++ b/configure.ac
|
|
|
c54a00 |
@@ -451,6 +451,7 @@ AC_SUBST(CONFIGDIR)
|
|
|
c54a00 |
if test x"${BUG_URL}" = x""; then
|
|
|
c54a00 |
BUG_URL="https://bugs.clusterlabs.org/enter_bug.cgi?product=Pacemaker"
|
|
|
c54a00 |
fi
|
|
|
c54a00 |
+AC_SUBST(BUG_URL)
|
|
|
c54a00 |
|
|
|
c54a00 |
for j in prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir \
|
|
|
c54a00 |
sharedstatedir localstatedir libdir includedir oldincludedir infodir \
|
|
|
c54a00 |
diff --git a/tools/crm_report.in b/tools/crm_report.in
|
|
|
c54a00 |
index 8e0d4b6..63c137c 100755
|
|
|
c54a00 |
--- a/tools/crm_report.in
|
|
|
c54a00 |
+++ b/tools/crm_report.in
|
|
|
c54a00 |
@@ -230,7 +230,7 @@ EOF
|
|
|
c54a00 |
log "Collected results are available in $fname"
|
|
|
c54a00 |
log " "
|
|
|
c54a00 |
log "Please create a bug entry at"
|
|
|
c54a00 |
- log " http://bugs.clusterlabs.org/enter_bug.cgi?product=Pacemaker"
|
|
|
c54a00 |
+ log " @BUG_URL@"
|
|
|
c54a00 |
log "Include a description of your problem and attach this tarball"
|
|
|
c54a00 |
log " "
|
|
|
c54a00 |
log "Thank you for taking time to create this report."
|
|
|
c54a00 |
--
|
|
|
c54a00 |
1.8.3.1
|
|
|
c54a00 |
|
|
|
c54a00 |
|
|
|
c54a00 |
From d99c1fa3fd52be01e03ce27a964fb1b09d29c46c Mon Sep 17 00:00:00 2001
|
|
|
c54a00 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
c54a00 |
Date: Tue, 2 Apr 2019 10:35:16 -0500
|
|
|
c54a00 |
Subject: [PATCH 3/3] Test: tools: define missing constant
|
|
|
c54a00 |
|
|
|
c54a00 |
accidentally omitted in abc33eff
|
|
|
c54a00 |
---
|
|
|
c54a00 |
tools/regression.sh | 2 ++
|
|
|
c54a00 |
1 file changed, 2 insertions(+)
|
|
|
c54a00 |
|
|
|
c54a00 |
diff --git a/tools/regression.sh b/tools/regression.sh
|
|
|
c54a00 |
index 0c38629..3680f13 100755
|
|
|
c54a00 |
--- a/tools/regression.sh
|
|
|
c54a00 |
+++ b/tools/regression.sh
|
|
|
c54a00 |
@@ -8,6 +8,8 @@ GREP_OPTIONS=
|
|
|
c54a00 |
verbose=0
|
|
|
c54a00 |
tests="dates tools acls validity"
|
|
|
c54a00 |
|
|
|
c54a00 |
+CRM_EX_OK=0
|
|
|
c54a00 |
+
|
|
|
c54a00 |
function test_assert() {
|
|
|
c54a00 |
target=$1; shift
|
|
|
c54a00 |
cib=$1; shift
|
|
|
c54a00 |
--
|
|
|
c54a00 |
1.8.3.1
|
|
|
c54a00 |
|