summaryrefslogtreecommitdiffstats
path: root/meta-filesystems
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-07-05 14:22:00 +0800
committerKhem Raj <raj.khem@gmail.com>2018-07-05 10:19:03 -0700
commitfb420dde3e9bc4b7e2e058bfd9c0d20c0d342142 (patch)
tree001893157846fbdcab011928b70b4e380d813c10 /meta-filesystems
parent04da00b14810f1f9e43db162e6fa8329f0a31980 (diff)
downloadmeta-openembedded-fb420dde3e9bc4b7e2e058bfd9c0d20c0d342142.tar.gz
xfsdump: upgrade 3.1.7 -> 3.1.8
Drop musl related patches since they had been merged upstream. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-filesystems')
-rw-r--r--meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch28
-rw-r--r--meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch28
-rw-r--r--meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch122
-rw-r--r--meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch40
-rw-r--r--meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch29
-rw-r--r--meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch27
-rw-r--r--meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb (renamed from meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb)10
7 files changed, 2 insertions, 282 deletions
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch b/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch
deleted file mode 100644
index 660468d73..000000000
--- a/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 8cf48da5f645dd7bbb1ccbeab5bb0964f40f17f7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jul 2017 23:18:47 -0700
4Subject: [PATCH 1/5] Include fcntl.h for O_EXCL
5
6Fix
7error: 'O_CREAT' undeclared (first use in this function)
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 invutil/invidx.c | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/invutil/invidx.c b/invutil/invidx.c
15index 67efdf7..325a9a1 100644
16--- a/invutil/invidx.c
17+++ b/invutil/invidx.c
18@@ -27,6 +27,7 @@
19 #include <sys/stat.h>
20 #include <string.h>
21 #include <uuid/uuid.h>
22+#include <fcntl.h>
23
24 #include "types.h"
25 #include "mlog.h"
26--
272.13.2
28
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch
deleted file mode 100644
index 1fe1bde8b..000000000
--- a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From f1e822d546e08cc195eaeb38ca172bd0c3800aa9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 9 Sep 2017 07:48:48 -0700
4Subject: [PATCH] xfsdump: Use c99 defined int64_t instead of __int64_t
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Submitted
9
10 common/hsmapi.c | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/common/hsmapi.c b/common/hsmapi.c
14index 6054773..0709dbe 100644
15--- a/common/hsmapi.c
16+++ b/common/hsmapi.c
17@@ -585,7 +585,7 @@ HsmModifyExtentMap(
18 struct getbmapx *bmap)
19 {
20 dmf_f_ctxt_t *dmf_f_ctxtp = (dmf_f_ctxt_t *)contextp;
21- __int64_t length;
22+ int64_t length;
23
24 if (bmap[0].bmv_entries <= 0) {
25 return 1; /* caller must already be at EOF */
26--
272.14.1
28
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch b/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch
deleted file mode 100644
index ed3e0a9e9..000000000
--- a/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch
+++ /dev/null
@@ -1,122 +0,0 @@
1From f76d2142905f0e5bd830d5d576c235af1171c6ac Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jul 2017 23:23:31 -0700
4Subject: [PATCH 2/5] Replace __uint32_t with uint32_t
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 common/content_inode.h | 4 ++--
9 doc/xfsdump.html | 8 ++++----
10 inventory/inv_oref.h | 2 +-
11 inventory/inv_priv.h | 4 ++--
12 inventory/inventory.h | 2 +-
13 5 files changed, 10 insertions(+), 10 deletions(-)
14
15diff --git a/common/content_inode.h b/common/content_inode.h
16index a69a9a0..6936e05 100644
17--- a/common/content_inode.h
18+++ b/common/content_inode.h
19@@ -191,10 +191,10 @@ typedef struct bstat bstat_t;
20 * and using two 16bit values to hold new 32bit projid was choosen
21 * to retain compatibility with "old" filesystems).
22 */
23-static inline __uint32_t
24+static inline uint32_t
25 bstat_projid(struct bstat *bs)
26 {
27- return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
28+ return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
29 }
30
31
32diff --git a/doc/xfsdump.html b/doc/xfsdump.html
33index 9c6722e..f85128f 100644
34--- a/doc/xfsdump.html
35+++ b/doc/xfsdump.html
36@@ -1935,7 +1935,7 @@ The files are constructed like so:
37 <pre>
38 typedef struct invt_counter {
39 INVT_COUNTER_FIELDS
40- __uint32_t ic_vernum;/* on disk version number for posterity */\
41+ uint32_t ic_vernum;/* on disk version number for posterity */\
42 u_int ic_curnum;/* number of sessions/invindices recorded \
43 so far */ \
44 u_int ic_maxnum;/* maximum number of sessions/inv_indices \
45@@ -1975,7 +1975,7 @@ typedef struct invt_fstab {
46 <pre>
47 typedef struct invt_counter {
48 INVT_COUNTER_FIELDS
49- __uint32_t ic_vernum;/* on disk version number for posterity */\
50+ uint32_t ic_vernum;/* on disk version number for posterity */\
51 u_int ic_curnum;/* number of sessions/invindices recorded \
52 so far */ \
53 u_int ic_maxnum;/* maximum number of sessions/inv_indices \
54@@ -2012,7 +2012,7 @@ typedef struct invt_entry {
55 <pre>
56 typedef struct invt_sescounter {
57 INVT_COUNTER_FIELDS
58- __uint32_t ic_vernum;/* on disk version number for posterity */\
59+ uint32_t ic_vernum;/* on disk version number for posterity */\
60 u_int ic_curnum;/* number of sessions/invindices recorded \
61 so far */ \
62 u_int ic_maxnum;/* maximum number of sessions/inv_indices \
63@@ -2034,7 +2034,7 @@ typedef struct invt_seshdr {
64 off64_t sh_streams_off; /* offset to start of the set of
65 stream hdrs */
66 time_t sh_time; /* time of the dump */
67- __uint32_t sh_flag; /* for misc flags */
68+ uint32_t sh_flag; /* for misc flags */
69 u_char sh_level; /* dump level */
70 u_char sh_pruned; /* pruned by invutil flag */
71 char sh_padding[22];
72diff --git a/inventory/inv_oref.h b/inventory/inv_oref.h
73index e16684d..38303a4 100644
74--- a/inventory/inv_oref.h
75+++ b/inventory/inv_oref.h
76@@ -46,7 +46,7 @@
77
78
79
80-typedef __uint32_t invt_objtype_t;
81+typedef uint32_t invt_objtype_t;
82
83 #define INVT_LOCKED 0x0001
84
85diff --git a/inventory/inv_priv.h b/inventory/inv_priv.h
86index 1690271..364ffbc 100644
87--- a/inventory/inv_priv.h
88+++ b/inventory/inv_priv.h
89@@ -120,7 +120,7 @@ typedef struct invt_seshdr {
90 off64_t sh_streams_off; /* offset to start of the set of
91 stream hdrs */
92 time32_t sh_time; /* time of the dump */
93- __uint32_t sh_flag; /* for misc flags */
94+ uint32_t sh_flag; /* for misc flags */
95 u_char sh_level; /* dump level */
96 u_char sh_pruned; /* pruned by invutil flag */
97 char sh_padding[22];
98@@ -184,7 +184,7 @@ typedef struct invt_entry {
99
100 /* Cheap Inheritance, and an attempt to avoid a nested type */
101 #define INVT_COUNTER_FIELDS \
102- __uint32_t ic_vernum;/* on disk version number for posterity */\
103+ uint32_t ic_vernum;/* on disk version number for posterity */\
104 uint ic_curnum;/* number of sessions/invindices recorded \
105 so far */ \
106 uint ic_maxnum;/* maximum number of sessions/inv_indices \
107diff --git a/inventory/inventory.h b/inventory/inventory.h
108index 134b9ba..c1d7403 100644
109--- a/inventory/inventory.h
110+++ b/inventory/inventory.h
111@@ -43,7 +43,7 @@
112 /* length of labels, mntpts, etc */
113 #define INV_STRLEN GLOBAL_HDR_STRING_SZ
114
115-typedef __uint32_t inv_version_t;
116+typedef uint32_t inv_version_t;
117
118 /* This is the general inventory version.
119 */
120--
1212.13.2
122
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch b/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch
deleted file mode 100644
index 31303d8fa..000000000
--- a/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From fcc0cf15a309947103a0695b8a1f4865b820eb5c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jul 2017 23:26:03 -0700
4Subject: [PATCH 3/5] replace use of SIGCLD with SIGCHLD
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 common/main.c | 2 +-
9 doc/xfsdump.html | 2 +-
10 2 files changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/common/main.c b/common/main.c
13index 3848499..faa66ee 100644
14--- a/common/main.c
15+++ b/common/main.c
16@@ -2225,7 +2225,7 @@ static sig_printmap_t sig_printmap[ ] = {
17 {SIGTERM, "SIGTERM"},
18 {SIGUSR1, "SIGUSR1"},
19 {SIGUSR2, "SIGUSR2"},
20- {SIGCLD, "SIGCLD"},
21+ {SIGCHLD, "SIGCHLD"},
22 {SIGPWR, "SIGPWR"},
23 {SIGURG, "SIGURG"},
24 {SIGPOLL, "SIGPOLL"},
25diff --git a/doc/xfsdump.html b/doc/xfsdump.html
26index f85128f..d96f037 100644
27--- a/doc/xfsdump.html
28+++ b/doc/xfsdump.html
29@@ -334,7 +334,7 @@ the ring buffer. It ignores signals and does not terminate until it
30 receives a RING_OP_DIE message. It then exits 0.
31 <p>
32 The main process sleeps waiting for any of its children to die
33-(ie. waiting for a SIGCLD). All children that it cares about (stream
34+(ie. waiting for a SIGCHLD). All children that it cares about (stream
35 managers and ring buffer slaves) are registered through the child
36 manager abstraction. When a child dies wait status and other info is
37 stored with its entry in the child manager. main() ignores the deaths
38--
392.13.2
40
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch b/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch
deleted file mode 100644
index 62ea15b86..000000000
--- a/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 98c7d96f0f2c6eddf60aa4a1a08d7d4467645930 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jul 2017 23:28:10 -0700
4Subject: [PATCH 4/5] include limit.h for PATH_MAX
5
6fixed
7var.c:42:12: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'?
8 char path[PATH_MAX];`
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 dump/var.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/dump/var.c b/dump/var.c
16index 645caab..8156d37 100644
17--- a/dump/var.c
18+++ b/dump/var.c
19@@ -16,6 +16,7 @@
20 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21 */
22
23+#include <limits.h>
24 #include <unistd.h>
25 #include <stdlib.h>
26 #include <sys/stat.h>
27--
282.13.2
29
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch b/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch
deleted file mode 100644
index fb6e467c9..000000000
--- a/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From d95f494de1aa8123c74170ffebaed8ea89649da2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jul 2017 23:33:44 -0700
4Subject: [PATCH 5/5] include sys/types.h for u_int32_t in attr/attributes.h
5
6error: unknown type name 'u_int32_t'
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 restore/content.c | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/restore/content.c b/restore/content.c
14index 7c4a81f..1d5de1b 100644
15--- a/restore/content.c
16+++ b/restore/content.c
17@@ -24,6 +24,7 @@
18 #include <sys/param.h>
19 #include <sys/stat.h>
20 #include <sys/ioctl.h>
21+#include <sys/types.h>
22 #include <attr/attributes.h>
23 #include <xfs/handle.h>
24 #include <time.h>
25--
262.13.2
27
diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
index 39f11890e..54ab30cbb 100644
--- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb
+++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb
@@ -12,15 +12,9 @@ DEPENDS = "xfsprogs attr"
12 12
13SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ 13SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \
14 file://remove-install-as-user.patch \ 14 file://remove-install-as-user.patch \
15 file://0001-Include-fcntl.h-for-O_EXCL.patch \
16 file://0002-Replace-__uint32_t-with-uint32_t.patch \
17 file://0003-replace-use-of-SIGCLD-with-SIGCHLD.patch \
18 file://0004-include-limit.h-for-PATH_MAX.patch \
19 file://0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch \
20 file://0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch \
21 " 15 "
22SRC_URI[md5sum] = "c6e91f2ac8b76c796db2d236f5ca5947" 16SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7"
23SRC_URI[sha256sum] = "99e6d4df257ebc6d29ca9e970ca20672c2ea03481ad949bc68f98de3e4d56dce" 17SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585"
24 18
25inherit autotools-brokensep 19inherit autotools-brokensep
26 20
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-24 17:50:51 +0000