diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2021-02-07 18:33:33 -0800 |
---|---|---|
committer | Jia Zhang <zhang.jia@linux.alibaba.com> | 2021-02-09 10:40:10 +0800 |
commit | 6009b4d960aea634d89b11f5cee47e860bfc5d1f (patch) | |
tree | ea0d9523da0a55ebe498ac7808e8b736ec87a087 | |
parent | 032e3b77401ff7c3e911ff5b3fabc89e6d9380e8 (diff) | |
download | meta-secure-core-6009b4d960aea634d89b11f5cee47e860bfc5d1f.tar.gz |
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>
-rw-r--r-- | meta-ids/recipes-ids/mtree/mtree/0001-compat-glibc-2.33.patch | 36 | ||||
-rw-r--r-- | meta-ids/recipes-ids/mtree/mtree_git.bb | 1 |
2 files changed, 37 insertions, 0 deletions
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 @@ | |||
1 | From a417070000e7cc1d2aab47a76a27d6b305c43298 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Sun, 7 Feb 2021 18:25:00 -0800 | ||
4 | Subject: [PATCH] compat glibc 2.33 | ||
5 | |||
6 | The glibc 2.33 remove macro _STAT_VER_LINUX [1], | ||
7 | do not use it to represent linux system | ||
8 | |||
9 | [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 | ||
10 | |||
11 | Upstream-Status: Inappropriate [oe specific] | ||
12 | |||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
14 | --- | ||
15 | mtree.h | 2 -- | ||
16 | 1 file changed, 2 deletions(-) | ||
17 | |||
18 | diff --git a/mtree.h b/mtree.h | ||
19 | index accda0a..1cf796d 100644 | ||
20 | --- a/mtree.h | ||
21 | +++ b/mtree.h | ||
22 | @@ -36,11 +36,9 @@ | ||
23 | #define KEYDEFAULT \ | ||
24 | (F_GID | F_MODE | F_NLINK | F_SIZE | F_SLINK | F_TIME | F_UID | F_FLAGS) | ||
25 | |||
26 | -#ifdef _STAT_VER_LINUX | ||
27 | #define st_atimespec st_atim | ||
28 | #define st_ctimespec st_ctim | ||
29 | #define st_mtimespec st_mtim | ||
30 | -#endif | ||
31 | |||
32 | #define MISMATCHEXIT 2 | ||
33 | |||
34 | -- | ||
35 | 2.29.2 | ||
36 | |||
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}" | |||
11 | SRC_URI = "git://github.com/archiecobbs/mtree-port.git \ | 11 | SRC_URI = "git://github.com/archiecobbs/mtree-port.git \ |
12 | file://mtree-getlogin.patch \ | 12 | file://mtree-getlogin.patch \ |
13 | file://configure.ac-automake-error.patch \ | 13 | file://configure.ac-automake-error.patch \ |
14 | file://0001-compat-glibc-2.33.patch \ | ||
14 | " | 15 | " |
15 | SRCREV = "4f3e901aea980fc9a78ac8692fa12a22328b1d4a" | 16 | SRCREV = "4f3e901aea980fc9a78ac8692fa12a22328b1d4a" |
16 | 17 | ||