[yocto] [meta-cgl][PATCH] ocfs2-tools: fix compile error with glibc 2.26

[jackie.huang at windriver.com]

From: Jackie Huang <jackie.huang at windriver.com>

When glibc upgrade to glibc-2.26.90-14, there was a compile error in fsck.ocfs2,
the compile error messages like,

In file included from /usr/include/string.h:431:0,
                 from ../include/ocfs2/ocfs2.h:41,
                 from pass4.c:32:
include/strings.h:37:1: error: unknown type name 'errcode_t'; did you mean 'mode_t'?
 errcode_t o2fsck_strings_insert(o2fsck_strings *strings, char *string,
 ^~~~~~~~~
 mode_t

Backport a patch to rename strings.h => o2fsck_strings.h

Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
---
 ...cfs2-fix-compile-error-when-glibc-upgrade.patch | 88 ++++++++++++++++++++++
 .../recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.4.bb   |  1 +
 2 files changed, 89 insertions(+)
 create mode 100644 meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-fix-compile-error-when-glibc-upgrade.patch

diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-fix-compile-error-when-glibc-upgrade.patch b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-fix-compile-error-when-glibc-upgrade.patch
new file mode 100644
index 0000000..5eb2a61
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-fix-compile-error-when-glibc-upgrade.patch
@@ -0,0 +1,88 @@
+From 0ffd58b223e24779420130522ea8ee359505f493 Mon Sep 17 00:00:00 2001
+From: Gang He <ghe at suse.com>
+Date: Mon, 4 Sep 2017 14:08:59 +0800
+Subject: [PATCH] fsck.ocfs2: fix compile error when glibc upgrade
+
+When glibc upgrade to glibc-2.26.90-14, there was a compile error in fsck.ocfs2,
+the compile error messages like,
+
+In file included from /usr/include/string.h:431:0,
+                 from ../include/ocfs2/ocfs2.h:41,
+                 from pass4.c:32:
+include/strings.h:37:1: error: unknown type name 'errcode_t'; did you mean 'mode_t'?
+ errcode_t o2fsck_strings_insert(o2fsck_strings *strings, char *string,
+ ^~~~~~~~~
+ mode_t
+
+
+Upstream-Status: Backport [https://github.com/markfasheh/ocfs2-tools/commit/0ffd58b223e24779420130522ea8ee359505f493]
+
+Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
+---
+ fsck.ocfs2/Makefile                                | 2 +-
+ fsck.ocfs2/include/{strings.h => o2fsck_strings.h} | 0
+ fsck.ocfs2/pass2.c                                 | 2 +-
+ fsck.ocfs2/pass5.c                                 | 2 +-
+ fsck.ocfs2/strings.c                               | 2 +-
+ 5 files changed, 4 insertions(+), 4 deletions(-)
+ rename fsck.ocfs2/include/{strings.h => o2fsck_strings.h} (100%)
+
+diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile
+index 051ed74..baf1994 100644
+--- a/fsck.ocfs2/Makefile
++++ b/fsck.ocfs2/Makefile
+@@ -64,7 +64,7 @@ HFILES = 	include/fsck.h		\
+ 		include/problem.h	\
+ 		include/refcount.h	\
+ 		include/slot_recovery.h	\
+-		include/strings.h	\
++		include/o2fsck_strings.h	\
+ 		include/util.h
+ 
+ 
+diff --git a/fsck.ocfs2/include/strings.h b/fsck.ocfs2/include/o2fsck_strings.h
+similarity index 100%
+rename from fsck.ocfs2/include/strings.h
+rename to fsck.ocfs2/include/o2fsck_strings.h
+diff --git a/fsck.ocfs2/pass2.c b/fsck.ocfs2/pass2.c
+index 181febb..a48a50b 100644
+--- a/fsck.ocfs2/pass2.c
++++ b/fsck.ocfs2/pass2.c
+@@ -43,7 +43,7 @@
+ #include "fsck.h"
+ #include "pass2.h"
+ #include "problem.h"
+-#include "strings.h"
++#include "o2fsck_strings.h"
+ #include "util.h"
+ 
+ static const char *whoami = "pass2";
+diff --git a/fsck.ocfs2/pass5.c b/fsck.ocfs2/pass5.c
+index 5c2d899..bfad1b7 100644
+--- a/fsck.ocfs2/pass5.c
++++ b/fsck.ocfs2/pass5.c
+@@ -40,7 +40,7 @@
+ #include "fsck.h"
+ #include "pass5.h"
+ #include "problem.h"
+-#include "strings.h"
++#include "o2fsck_strings.h"
+ #include "util.h"
+ 
+ static const char *whoami = "pass5";
+diff --git a/fsck.ocfs2/strings.c b/fsck.ocfs2/strings.c
+index 4ad3782..8a7a8d9 100644
+--- a/fsck.ocfs2/strings.c
++++ b/fsck.ocfs2/strings.c
+@@ -31,7 +31,7 @@
+ #include "ocfs2/ocfs2.h"
+ 
+ #include "fsck.h"
+-#include "strings.h"
++#include "o2fsck_strings.h"
+ #include "util.h"
+ 
+ struct string_entry {
+-- 
+2.7.4
+
diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.4.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.4.bb
index f40bfdf..9098fbf 100644
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.4.bb
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.4.bb
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRC_URI = "git://oss.oracle.com/git/ocfs2-tools.git \
     file://0003-vendor-common-o2cb.ocf-add-new-conf-file.patch \
     file://disable-ocfs2-stack-user-support.patch \
+    file://ocfs2-fix-compile-error-when-glibc-upgrade.patch \
     file://o2cb.service \
     file://ocfs2.service \
 "
-- 
2.11.0