51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
|
From 1b3425d8cbc5697f7321ba364e38ef4c5ed9f2b4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
||
|
|
Date: Tue, 1 Aug 2017 09:22:38 +0200
|
||
|
|
Subject: [PATCH 22/93] INTG: Add --with-session-recording=/bin/false to
|
||
|
|
intgcheck's configure
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Let's ensure that running `make intgcheck-*` doesn't fail when done
|
||
|
|
locally.
|
||
|
|
|
||
|
|
As --with-session-recording=/bin/false is now set in the Makefile.am,
|
||
|
|
there's no need to set it in contrib/ci/configure.sh. Thus, the option
|
||
|
|
has been removed from there.
|
||
|
|
|
||
|
|
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
|
||
|
|
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
||
|
|
---
|
||
|
|
Makefile.am | 1 +
|
||
|
|
contrib/ci/configure.sh | 1 -
|
||
|
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.am b/Makefile.am
|
||
|
|
index e7d69d2f0ffdf6f966d2f430174c0159fceb9118..62e0baf76df2a99329f7f9c77b2e9267b7dfca91 100644
|
||
|
|
--- a/Makefile.am
|
||
|
|
+++ b/Makefile.am
|
||
|
|
@@ -3538,6 +3538,7 @@ intgcheck-prepare:
|
||
|
|
--with-ldb-lib-dir="$$prefix"/lib/ldb \
|
||
|
|
--enable-intgcheck-reqs \
|
||
|
|
--without-semanage \
|
||
|
|
+ --with-session-recording-shell=/bin/false \
|
||
|
|
$(INTGCHECK_CONFIGURE_FLAGS) \
|
||
|
|
CFLAGS="$$CFLAGS -DKCM_PEER_UID=$$(id -u)"; \
|
||
|
|
$(MAKE) $(AM_MAKEFLAGS) ; \
|
||
|
|
diff --git a/contrib/ci/configure.sh b/contrib/ci/configure.sh
|
||
|
|
index 4a219da7577ea6aab5c8f14679b9e603c6c35be3..9d18d0c187561a2dc3bc47d3e8913626e7ff3046 100644
|
||
|
|
--- a/contrib/ci/configure.sh
|
||
|
|
+++ b/contrib/ci/configure.sh
|
||
|
|
@@ -29,7 +29,6 @@ declare -a CONFIGURE_ARG_LIST=(
|
||
|
|
"--enable-ldb-version-check"
|
||
|
|
"--with-syslog=journald"
|
||
|
|
"--enable-systemtap"
|
||
|
|
- "--with-session-recording-shell=/bin/false"
|
||
|
|
)
|
||
|
|
|
||
|
|
|
||
|
|
--
|
||
|
|
2.14.1
|
||
|
|
|