From 0d7cfe86600b0306af97578b16ec7ca264ea1346 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Thu, 31 May 2018 17:08:04 -0400 Subject: lxc: uprev to v3.0.0 Update to the latest lxc release. This requires some minor patch updates (fuzz and offset, not content) along with dropping a no longer needed fix for gcc7 (gcc 7.3 is everywhere and is patched). The ptests were already busted before the uprev so I was not able to run them but I will follow up with a fix for this. I did run against our usual usecases 'lxc-create', 'lxc-console', 'lxc-ls', 'lxc-destroy', 'lxc-start', 'lxc-execute', 'lxc-attach'... and there were no issues (outcomes matched v2.0.8). Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- .../logs-optionally-use-base-filenames-to-report-src-fil.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch') diff --git a/recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch b/recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch index 583b6f1c..f430601a 100644 --- a/recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch +++ b/recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch @@ -31,9 +31,9 @@ diff --git a/configure.ac b/configure.ac index deba90b..c1ed67b 100644 --- a/configure.ac +++ b/configure.ac -@@ -357,6 +357,15 @@ AM_COND_IF([ENABLE_PYTHON], - PKG_CHECK_MODULES([PYTHONDEV], [python3 >= 3.2],[],[AC_MSG_ERROR([You must install python3-dev])]) - AC_DEFINE_UNQUOTED([ENABLE_PYTHON], 1, [Python3 is available])]) +@@ -356,6 +356,15 @@ AM_COND_IF([ENABLE_PYTHON], + [], [enable_examples=yes]) + AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"]) +# Enable basenames in the logs for source files +AC_ARG_ENABLE([log-src-basename], @@ -51,7 +51,7 @@ diff --git a/src/lxc/log.h b/src/lxc/log.h index 76bd4df..4365977 100644 --- a/src/lxc/log.h +++ b/src/lxc/log.h -@@ -74,8 +74,13 @@ struct lxc_log_locinfo { +@@ -77,8 +77,13 @@ struct lxc_log_locinfo { int line; }; -- cgit v1.2.3-54-g00ecf