1 files changed, 9 insertions, 10 deletions

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 f430601a..648193b4 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
@@ -1,8 +1,9 @@
-From 4729d0f4c4d1dacd150ddfd7061dda875eb94e34 Mon Sep 17 00:00:00 2001
-Message-Id: <4729d0f4c4d1dacd150ddfd7061dda875eb94e34.1443216870.git.Jim.Somerville@windriver.com>
+From c50ddb2b2cf22a29e4c671b1efbd338eeba694aa Mon Sep 17 00:00:00 2001
 From: Jim Somerville <Jim.Somerville@windriver.com>
 Date: Fri, 25 Sep 2015 15:08:17 -0400
-Subject: [PATCH 1/1] logs: optionally use base filenames to report src files
+Subject: [PATCH] logs: optionally use base filenames to report src files
+
+Message-Id: <4729d0f4c4d1dacd150ddfd7061dda875eb94e34.1443216870.git.Jim.Somerville@windriver.com>
 
 Problem:  Logs are nice in that they report the source file,
 routine, and line number where an issue occurs.  But the
@@ -22,16 +23,17 @@ machinery, and that may still be the absolute pathname to
 the file.
 
 Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
+
 ---
  configure.ac  | 9 +++++++++
  src/lxc/log.h | 5 +++++
  2 files changed, 14 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index deba90b..c1ed67b 100644
+index 74b976a..9c561f7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -356,6 +356,15 @@ AM_COND_IF([ENABLE_PYTHON],
+@@ -356,6 +356,15 @@ AC_ARG_ENABLE([examples],
         [], [enable_examples=yes])
  AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
  
@@ -48,11 +50,11 @@ index deba90b..c1ed67b 100644
  AC_ARG_ENABLE([mutex-debugging],
         [AC_HELP_STRING([--enable-mutex-debugging], [Makes mutexes to report error and provide stack trace [default=no]])],
 diff --git a/src/lxc/log.h b/src/lxc/log.h
-index 76bd4df..4365977 100644
+index 4654fd9..6885d78 100644
 --- a/src/lxc/log.h
 +++ b/src/lxc/log.h
 @@ -77,8 +77,13 @@ struct lxc_log_locinfo {
-        int             line;
+        int line;
  };
  
 +#ifdef LXC_LOG_USE_BASENAME
@@ -65,6 +67,3 @@ index 76bd4df..4365977 100644
  
  /* brief logging event object */
  struct lxc_log_event {
--- 
-1.8.3.2
-