From 6009b4d960aea634d89b11f5cee47e860bfc5d1f Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Sun, 7 Feb 2021 18:33:33 -0800
Subject: [PATCH] mtree: compat glibc 2.33

The glibc 2.33 remove macro _STAT_VER_LINUX [1],
do not use it to represent linux system

[1] https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=sysdeps/unix/sysv/linux/bits/stat.h;h=b5426232088df446f502e6aea76a6cf03e71e1c4;hp=240628a6f4c9028a774c26a04a145c24110f669b;hb=8ed005daf0ab03e142500324a34087ce179ae78e;hpb=428985c436f442e91e27173bccaf28f547233586

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../mtree/mtree/0001-compat-glibc-2.33.patch  | 36 +++++++++++++++++++
 meta-ids/recipes-ids/mtree/mtree_git.bb       |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta-ids/recipes-ids/mtree/mtree/0001-compat-glibc-2.33.patch

diff --git a/meta-ids/recipes-ids/mtree/mtree/0001-compat-glibc-2.33.patch b/meta-ids/recipes-ids/mtree/mtree/0001-compat-glibc-2.33.patch
new file mode 100644
index 0000000..e87557e
--- /dev/null
+++ b/meta-ids/recipes-ids/mtree/mtree/0001-compat-glibc-2.33.patch
@@ -0,0 +1,36 @@
+From a417070000e7cc1d2aab47a76a27d6b305c43298 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Sun, 7 Feb 2021 18:25:00 -0800
+Subject: [PATCH] compat glibc 2.33
+
+The glibc 2.33 remove macro _STAT_VER_LINUX [1],
+do not use it to represent linux system
+
+[1] https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=sysdeps/unix/sysv/linux/bits/stat.h;h=b5426232088df446f502e6aea76a6cf03e71e1c4;hp=240628a6f4c9028a774c26a04a145c24110f669b;hb=8ed005daf0ab03e142500324a34087ce179ae78e;hpb=428985c436f442e91e27173bccaf28f547233586
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ mtree.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/mtree.h b/mtree.h
+index accda0a..1cf796d 100644
+--- a/mtree.h
++++ b/mtree.h
+@@ -36,11 +36,9 @@
+ #define KEYDEFAULT \
+         (F_GID | F_MODE | F_NLINK | F_SIZE | F_SLINK | F_TIME | F_UID | F_FLAGS)
+ 
+-#ifdef _STAT_VER_LINUX
+ #define st_atimespec st_atim
+ #define st_ctimespec st_ctim
+ #define st_mtimespec st_mtim
+-#endif
+ 
+ #define MISMATCHEXIT    2
+ 
+-- 
+2.29.2
+
diff --git a/meta-ids/recipes-ids/mtree/mtree_git.bb b/meta-ids/recipes-ids/mtree/mtree_git.bb
index 27fae3c..0a303da 100644
--- a/meta-ids/recipes-ids/mtree/mtree_git.bb
+++ b/meta-ids/recipes-ids/mtree/mtree_git.bb
@@ -11,6 +11,7 @@ PV = "1.0.3+git${SRCPV}"
 SRC_URI = "git://github.com/archiecobbs/mtree-port.git \
            file://mtree-getlogin.patch \
            file://configure.ac-automake-error.patch \
+           file://0001-compat-glibc-2.33.patch \
            "
 SRCREV = "4f3e901aea980fc9a78ac8692fa12a22328b1d4a"