diff options
Diffstat (limited to 'meta-filesystems')
-rw-r--r-- | meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch | 65 | ||||
-rw-r--r-- | meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.1.0.bb (renamed from meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.0.0.bb) | 2 |
2 files changed, 34 insertions, 33 deletions
diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch index e10364a20..731c001e1 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch +++ b/meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1ff0d95604c406ddfc764c97ed2cb147d155f608 Mon Sep 17 00:00:00 2001 | 1 | From f260099fc45f0653aa4758d1d581e07f5b9c6a54 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 21 Dec 2022 17:43:07 -0800 | 3 | Date: Wed, 21 Dec 2022 17:43:07 -0800 |
4 | Subject: [PATCH] Replace off64_t/stat64 with off_t/stat | 4 | Subject: [PATCH] Replace off64_t/stat64 with off_t/stat |
@@ -11,6 +11,7 @@ needed | |||
11 | 11 | ||
12 | Upstream-Status: Submitted [https://lore.kernel.org/linux-xfs/20221222015327.939932-1-raj.khem@gmail.com/T/#t] | 12 | Upstream-Status: Submitted [https://lore.kernel.org/linux-xfs/20221222015327.939932-1-raj.khem@gmail.com/T/#t] |
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | |||
14 | --- | 15 | --- |
15 | copy/xfs_copy.c | 2 +- | 16 | copy/xfs_copy.c | 2 +- |
16 | fsr/xfs_fsr.c | 2 +- | 17 | fsr/xfs_fsr.c | 2 +- |
@@ -41,7 +42,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
41 | 26 files changed, 74 insertions(+), 74 deletions(-) | 42 | 26 files changed, 74 insertions(+), 74 deletions(-) |
42 | 43 | ||
43 | diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c | 44 | diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c |
44 | index 79f65946..854fd7f4 100644 | 45 | index 79f6594..854fd7f 100644 |
45 | --- a/copy/xfs_copy.c | 46 | --- a/copy/xfs_copy.c |
46 | +++ b/copy/xfs_copy.c | 47 | +++ b/copy/xfs_copy.c |
47 | @@ -888,7 +888,7 @@ main(int argc, char **argv) | 48 | @@ -888,7 +888,7 @@ main(int argc, char **argv) |
@@ -54,7 +55,7 @@ index 79f65946..854fd7f4 100644 | |||
54 | /* ensure device files are sufficiently large */ | 55 | /* ensure device files are sufficiently large */ |
55 | 56 | ||
56 | diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c | 57 | diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c |
57 | index ba02506d..12fffbd8 100644 | 58 | index ba02506..12fffbd 100644 |
58 | --- a/fsr/xfs_fsr.c | 59 | --- a/fsr/xfs_fsr.c |
59 | +++ b/fsr/xfs_fsr.c | 60 | +++ b/fsr/xfs_fsr.c |
60 | @@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd, | 61 | @@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd, |
@@ -67,7 +68,7 @@ index ba02506d..12fffbd8 100644 | |||
67 | int ct, wc, wc_b4; | 68 | int ct, wc, wc_b4; |
68 | char ffname[SMBUFSZ]; | 69 | char ffname[SMBUFSZ]; |
69 | diff --git a/io/bmap.c b/io/bmap.c | 70 | diff --git a/io/bmap.c b/io/bmap.c |
70 | index 27383ca6..0b14bb7b 100644 | 71 | index 27383ca..0b14bb7 100644 |
71 | --- a/io/bmap.c | 72 | --- a/io/bmap.c |
72 | +++ b/io/bmap.c | 73 | +++ b/io/bmap.c |
73 | @@ -257,7 +257,7 @@ bmap_f( | 74 | @@ -257,7 +257,7 @@ bmap_f( |
@@ -91,7 +92,7 @@ index 27383ca6..0b14bb7b 100644 | |||
91 | swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE; | 92 | swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE; |
92 | } | 93 | } |
93 | diff --git a/io/copy_file_range.c b/io/copy_file_range.c | 94 | diff --git a/io/copy_file_range.c b/io/copy_file_range.c |
94 | index d154fa76..422e691a 100644 | 95 | index d154fa7..422e691 100644 |
95 | --- a/io/copy_file_range.c | 96 | --- a/io/copy_file_range.c |
96 | +++ b/io/copy_file_range.c | 97 | +++ b/io/copy_file_range.c |
97 | @@ -54,7 +54,7 @@ copy_file_range_cmd(int fd, long long *src_off, long long *dst_off, size_t len) | 98 | @@ -54,7 +54,7 @@ copy_file_range_cmd(int fd, long long *src_off, long long *dst_off, size_t len) |
@@ -113,7 +114,7 @@ index d154fa76..422e691a 100644 | |||
113 | sz = copy_src_filesize(fd); | 114 | sz = copy_src_filesize(fd); |
114 | if (sz < 0 || (unsigned long long)sz > SIZE_MAX) { | 115 | if (sz < 0 || (unsigned long long)sz > SIZE_MAX) { |
115 | diff --git a/io/cowextsize.c b/io/cowextsize.c | 116 | diff --git a/io/cowextsize.c b/io/cowextsize.c |
116 | index f6b134df..00e40c6f 100644 | 117 | index f6b134d..00e40c6 100644 |
117 | --- a/io/cowextsize.c | 118 | --- a/io/cowextsize.c |
118 | +++ b/io/cowextsize.c | 119 | +++ b/io/cowextsize.c |
119 | @@ -50,10 +50,10 @@ static int | 120 | @@ -50,10 +50,10 @@ static int |
@@ -131,7 +132,7 @@ index f6b134df..00e40c6f 100644 | |||
131 | return 0; | 132 | return 0; |
132 | } | 133 | } |
133 | diff --git a/io/fadvise.c b/io/fadvise.c | 134 | diff --git a/io/fadvise.c b/io/fadvise.c |
134 | index 60cc0f08..0966c41b 100644 | 135 | index 60cc0f0..0966c41 100644 |
135 | --- a/io/fadvise.c | 136 | --- a/io/fadvise.c |
136 | +++ b/io/fadvise.c | 137 | +++ b/io/fadvise.c |
137 | @@ -39,7 +39,7 @@ fadvise_f( | 138 | @@ -39,7 +39,7 @@ fadvise_f( |
@@ -144,7 +145,7 @@ index 60cc0f08..0966c41b 100644 | |||
144 | 145 | ||
145 | while ((c = getopt(argc, argv, "dnrsw")) != EOF) { | 146 | while ((c = getopt(argc, argv, "dnrsw")) != EOF) { |
146 | diff --git a/io/fiemap.c b/io/fiemap.c | 147 | diff --git a/io/fiemap.c b/io/fiemap.c |
147 | index f0c74dfe..b41f71bf 100644 | 148 | index f0c74df..b41f71b 100644 |
148 | --- a/io/fiemap.c | 149 | --- a/io/fiemap.c |
149 | +++ b/io/fiemap.c | 150 | +++ b/io/fiemap.c |
150 | @@ -234,9 +234,9 @@ fiemap_f( | 151 | @@ -234,9 +234,9 @@ fiemap_f( |
@@ -161,7 +162,7 @@ index f0c74dfe..b41f71bf 100644 | |||
161 | struct stat st; | 162 | struct stat st; |
162 | 163 | ||
163 | diff --git a/io/fsmap.c b/io/fsmap.c | 164 | diff --git a/io/fsmap.c b/io/fsmap.c |
164 | index 9dd19cc0..dfdaa1b4 100644 | 165 | index 7db5184..bf11963 100644 |
165 | --- a/io/fsmap.c | 166 | --- a/io/fsmap.c |
166 | +++ b/io/fsmap.c | 167 | +++ b/io/fsmap.c |
167 | @@ -170,7 +170,7 @@ dump_map_verbose( | 168 | @@ -170,7 +170,7 @@ dump_map_verbose( |
@@ -185,7 +186,7 @@ index 9dd19cc0..dfdaa1b4 100644 | |||
185 | swidth = (fsgeo->swidth * fsgeo->blocksize); | 186 | swidth = (fsgeo->swidth * fsgeo->blocksize); |
186 | 187 | ||
187 | diff --git a/io/io.h b/io/io.h | 188 | diff --git a/io/io.h b/io/io.h |
188 | index 64b7a663..5f423016 100644 | 189 | index 64b7a66..5f42301 100644 |
189 | --- a/io/io.h | 190 | --- a/io/io.h |
190 | +++ b/io/io.h | 191 | +++ b/io/io.h |
191 | @@ -53,7 +53,7 @@ extern int stat_f(int argc, char **argv); | 192 | @@ -53,7 +53,7 @@ extern int stat_f(int argc, char **argv); |
@@ -226,7 +227,7 @@ index 64b7a663..5f423016 100644 | |||
226 | extern void attr_init(void); | 227 | extern void attr_init(void); |
227 | extern void bmap_init(void); | 228 | extern void bmap_init(void); |
228 | diff --git a/io/madvise.c b/io/madvise.c | 229 | diff --git a/io/madvise.c b/io/madvise.c |
229 | index bde31539..6e9c5b12 100644 | 230 | index bde3153..6e9c5b1 100644 |
230 | --- a/io/madvise.c | 231 | --- a/io/madvise.c |
231 | +++ b/io/madvise.c | 232 | +++ b/io/madvise.c |
232 | @@ -39,7 +39,7 @@ madvise_f( | 233 | @@ -39,7 +39,7 @@ madvise_f( |
@@ -239,7 +240,7 @@ index bde31539..6e9c5b12 100644 | |||
239 | void *start; | 240 | void *start; |
240 | int advise = MADV_NORMAL, c; | 241 | int advise = MADV_NORMAL, c; |
241 | diff --git a/io/mincore.c b/io/mincore.c | 242 | diff --git a/io/mincore.c b/io/mincore.c |
242 | index 67f1d6c4..24147ac2 100644 | 243 | index 67f1d6c..24147ac 100644 |
243 | --- a/io/mincore.c | 244 | --- a/io/mincore.c |
244 | +++ b/io/mincore.c | 245 | +++ b/io/mincore.c |
245 | @@ -17,7 +17,7 @@ mincore_f( | 246 | @@ -17,7 +17,7 @@ mincore_f( |
@@ -252,7 +253,7 @@ index 67f1d6c4..24147ac2 100644 | |||
252 | size_t blocksize, sectsize; | 253 | size_t blocksize, sectsize; |
253 | void *start; | 254 | void *start; |
254 | diff --git a/io/mmap.c b/io/mmap.c | 255 | diff --git a/io/mmap.c b/io/mmap.c |
255 | index 7114404b..128a2c06 100644 | 256 | index 7114404..128a2c0 100644 |
256 | --- a/io/mmap.c | 257 | --- a/io/mmap.c |
257 | +++ b/io/mmap.c | 258 | +++ b/io/mmap.c |
258 | @@ -64,11 +64,11 @@ print_mapping( | 259 | @@ -64,11 +64,11 @@ print_mapping( |
@@ -306,11 +307,11 @@ index 7114404b..128a2c06 100644 | |||
306 | void *start; | 307 | void *start; |
307 | char *sp; | 308 | char *sp; |
308 | diff --git a/io/pread.c b/io/pread.c | 309 | diff --git a/io/pread.c b/io/pread.c |
309 | index 458a78b8..89fab81d 100644 | 310 | index 0f1d8b9..79990c6 100644 |
310 | --- a/io/pread.c | 311 | --- a/io/pread.c |
311 | +++ b/io/pread.c | 312 | +++ b/io/pread.c |
312 | @@ -116,7 +116,7 @@ alloc_buffer( | 313 | @@ -116,7 +116,7 @@ alloc_buffer( |
313 | void | 314 | static void |
314 | __dump_buffer( | 315 | __dump_buffer( |
315 | void *buf, | 316 | void *buf, |
316 | - off64_t offset, | 317 | - off64_t offset, |
@@ -404,7 +405,7 @@ index 458a78b8..89fab81d 100644 | |||
404 | long long count, total, tmp; | 405 | long long count, total, tmp; |
405 | size_t fsblocksize, fssectsize; | 406 | size_t fsblocksize, fssectsize; |
406 | diff --git a/io/pwrite.c b/io/pwrite.c | 407 | diff --git a/io/pwrite.c b/io/pwrite.c |
407 | index 467bfa9f..8d134c56 100644 | 408 | index 467bfa9..8d134c5 100644 |
408 | --- a/io/pwrite.c | 409 | --- a/io/pwrite.c |
409 | +++ b/io/pwrite.c | 410 | +++ b/io/pwrite.c |
410 | @@ -54,7 +54,7 @@ pwrite_help(void) | 411 | @@ -54,7 +54,7 @@ pwrite_help(void) |
@@ -489,7 +490,7 @@ index 467bfa9f..8d134c56 100644 | |||
489 | unsigned int zeed = 0, seed = 0xcdcdcdcd; | 490 | unsigned int zeed = 0, seed = 0xcdcdcdcd; |
490 | size_t fsblocksize, fssectsize; | 491 | size_t fsblocksize, fssectsize; |
491 | diff --git a/io/reflink.c b/io/reflink.c | 492 | diff --git a/io/reflink.c b/io/reflink.c |
492 | index 8e4f3899..b6a3c05a 100644 | 493 | index 8e4f389..b6a3c05 100644 |
493 | --- a/io/reflink.c | 494 | --- a/io/reflink.c |
494 | +++ b/io/reflink.c | 495 | +++ b/io/reflink.c |
495 | @@ -98,7 +98,7 @@ dedupe_f( | 496 | @@ -98,7 +98,7 @@ dedupe_f( |
@@ -511,7 +512,7 @@ index 8e4f3899..b6a3c05a 100644 | |||
511 | char *infile = NULL; | 512 | char *infile = NULL; |
512 | int condensed, quiet_flag; | 513 | int condensed, quiet_flag; |
513 | diff --git a/io/seek.c b/io/seek.c | 514 | diff --git a/io/seek.c b/io/seek.c |
514 | index 6734ecb5..ffe7439c 100644 | 515 | index 6734ecb..ffe7439 100644 |
515 | --- a/io/seek.c | 516 | --- a/io/seek.c |
516 | +++ b/io/seek.c | 517 | +++ b/io/seek.c |
517 | @@ -63,8 +63,8 @@ static void | 518 | @@ -63,8 +63,8 @@ static void |
@@ -535,7 +536,7 @@ index 6734ecb5..ffe7439c 100644 | |||
535 | int c; | 536 | int c; |
536 | int current; /* specify data or hole */ | 537 | int current; /* specify data or hole */ |
537 | diff --git a/io/sendfile.c b/io/sendfile.c | 538 | diff --git a/io/sendfile.c b/io/sendfile.c |
538 | index a003bb55..2ce569c2 100644 | 539 | index a003bb5..2ce569c 100644 |
539 | --- a/io/sendfile.c | 540 | --- a/io/sendfile.c |
540 | +++ b/io/sendfile.c | 541 | +++ b/io/sendfile.c |
541 | @@ -34,12 +34,12 @@ sendfile_help(void) | 542 | @@ -34,12 +34,12 @@ sendfile_help(void) |
@@ -563,7 +564,7 @@ index a003bb55..2ce569c2 100644 | |||
563 | size_t blocksize, sectsize; | 564 | size_t blocksize, sectsize; |
564 | struct timeval t1, t2; | 565 | struct timeval t1, t2; |
565 | diff --git a/io/stat.c b/io/stat.c | 566 | diff --git a/io/stat.c b/io/stat.c |
566 | index b57f9eef..e8f68dc3 100644 | 567 | index b57f9ee..e8f68dc 100644 |
567 | --- a/io/stat.c | 568 | --- a/io/stat.c |
568 | +++ b/io/stat.c | 569 | +++ b/io/stat.c |
569 | @@ -21,7 +21,7 @@ static cmdinfo_t stat_cmd; | 570 | @@ -21,7 +21,7 @@ static cmdinfo_t stat_cmd; |
@@ -576,7 +577,7 @@ index b57f9eef..e8f68dc3 100644 | |||
576 | { | 577 | { |
577 | struct stat st; | 578 | struct stat st; |
578 | diff --git a/io/sync_file_range.c b/io/sync_file_range.c | 579 | diff --git a/io/sync_file_range.c b/io/sync_file_range.c |
579 | index 94285c22..2375a060 100644 | 580 | index 94285c2..2375a06 100644 |
580 | --- a/io/sync_file_range.c | 581 | --- a/io/sync_file_range.c |
581 | +++ b/io/sync_file_range.c | 582 | +++ b/io/sync_file_range.c |
582 | @@ -30,7 +30,7 @@ sync_range_f( | 583 | @@ -30,7 +30,7 @@ sync_range_f( |
@@ -589,7 +590,7 @@ index 94285c22..2375a060 100644 | |||
589 | size_t blocksize, sectsize; | 590 | size_t blocksize, sectsize; |
590 | 591 | ||
591 | diff --git a/io/truncate.c b/io/truncate.c | 592 | diff --git a/io/truncate.c b/io/truncate.c |
592 | index 1d049194..a74b6131 100644 | 593 | index 1d04919..a74b613 100644 |
593 | --- a/io/truncate.c | 594 | --- a/io/truncate.c |
594 | +++ b/io/truncate.c | 595 | +++ b/io/truncate.c |
595 | @@ -16,7 +16,7 @@ truncate_f( | 596 | @@ -16,7 +16,7 @@ truncate_f( |
@@ -602,10 +603,10 @@ index 1d049194..a74b6131 100644 | |||
602 | 603 | ||
603 | init_cvtnum(&blocksize, §size); | 604 | init_cvtnum(&blocksize, §size); |
604 | diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c | 605 | diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c |
605 | index 20e0793c..0e67b7b0 100644 | 606 | index d5aad3e..0faa05b 100644 |
606 | --- a/libxfs/rdwr.c | 607 | --- a/libxfs/rdwr.c |
607 | +++ b/libxfs/rdwr.c | 608 | +++ b/libxfs/rdwr.c |
608 | @@ -568,7 +568,7 @@ libxfs_balloc( | 609 | @@ -576,7 +576,7 @@ libxfs_balloc( |
609 | 610 | ||
610 | 611 | ||
611 | static int | 612 | static int |
@@ -614,7 +615,7 @@ index 20e0793c..0e67b7b0 100644 | |||
614 | { | 615 | { |
615 | int sts; | 616 | int sts; |
616 | 617 | ||
617 | @@ -631,7 +631,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags) | 618 | @@ -639,7 +639,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags) |
618 | fd = libxfs_device_to_fd(btp->bt_bdev); | 619 | fd = libxfs_device_to_fd(btp->bt_bdev); |
619 | buf = bp->b_addr; | 620 | buf = bp->b_addr; |
620 | for (i = 0; i < bp->b_nmaps; i++) { | 621 | for (i = 0; i < bp->b_nmaps; i++) { |
@@ -623,7 +624,7 @@ index 20e0793c..0e67b7b0 100644 | |||
623 | int len = BBTOB(bp->b_maps[i].bm_len); | 624 | int len = BBTOB(bp->b_maps[i].bm_len); |
624 | 625 | ||
625 | error = __read_buf(fd, buf, len, offset, flags); | 626 | error = __read_buf(fd, buf, len, offset, flags); |
626 | @@ -790,7 +790,7 @@ err: | 627 | @@ -798,7 +798,7 @@ err: |
627 | } | 628 | } |
628 | 629 | ||
629 | static int | 630 | static int |
@@ -632,7 +633,7 @@ index 20e0793c..0e67b7b0 100644 | |||
632 | { | 633 | { |
633 | int sts; | 634 | int sts; |
634 | 635 | ||
635 | @@ -856,7 +856,7 @@ libxfs_bwrite( | 636 | @@ -864,7 +864,7 @@ libxfs_bwrite( |
636 | void *buf = bp->b_addr; | 637 | void *buf = bp->b_addr; |
637 | 638 | ||
638 | for (i = 0; i < bp->b_nmaps; i++) { | 639 | for (i = 0; i < bp->b_nmaps; i++) { |
@@ -642,7 +643,7 @@ index 20e0793c..0e67b7b0 100644 | |||
642 | 643 | ||
643 | bp->b_error = __write_buf(fd, buf, len, offset, | 644 | bp->b_error = __write_buf(fd, buf, len, offset, |
644 | diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c | 645 | diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c |
645 | index 7c1a66c4..bb54e382 100644 | 646 | index 7c1a66c..bb54e38 100644 |
646 | --- a/mdrestore/xfs_mdrestore.c | 647 | --- a/mdrestore/xfs_mdrestore.c |
647 | +++ b/mdrestore/xfs_mdrestore.c | 648 | +++ b/mdrestore/xfs_mdrestore.c |
648 | @@ -116,7 +116,7 @@ perform_restore( | 649 | @@ -116,7 +116,7 @@ perform_restore( |
@@ -655,7 +656,7 @@ index 7c1a66c4..bb54e382 100644 | |||
655 | off = sb.sb_dblocks * sb.sb_blocksize - sizeof(lb); | 656 | off = sb.sb_dblocks * sb.sb_blocksize - sizeof(lb); |
656 | if (pwrite(dst_fd, lb, sizeof(lb), off) < 0) | 657 | if (pwrite(dst_fd, lb, sizeof(lb), off) < 0) |
657 | diff --git a/repair/prefetch.c b/repair/prefetch.c | 658 | diff --git a/repair/prefetch.c b/repair/prefetch.c |
658 | index 017750e9..35b50134 100644 | 659 | index 017750e..35b5013 100644 |
659 | --- a/repair/prefetch.c | 660 | --- a/repair/prefetch.c |
660 | +++ b/repair/prefetch.c | 661 | +++ b/repair/prefetch.c |
661 | @@ -475,7 +475,7 @@ pf_batch_read( | 662 | @@ -475,7 +475,7 @@ pf_batch_read( |
@@ -668,7 +669,7 @@ index 017750e9..35b50134 100644 | |||
668 | int i; | 669 | int i; |
669 | int inode_bufs; | 670 | int inode_bufs; |
670 | diff --git a/scrub/spacemap.c b/scrub/spacemap.c | 671 | diff --git a/scrub/spacemap.c b/scrub/spacemap.c |
671 | index 03440d3a..00bee179 100644 | 672 | index 03440d3..00bee17 100644 |
672 | --- a/scrub/spacemap.c | 673 | --- a/scrub/spacemap.c |
673 | +++ b/scrub/spacemap.c | 674 | +++ b/scrub/spacemap.c |
674 | @@ -97,11 +97,11 @@ scan_ag_rmaps( | 675 | @@ -97,11 +97,11 @@ scan_ag_rmaps( |
@@ -687,7 +688,7 @@ index 03440d3a..00bee179 100644 | |||
687 | memset(keys, 0, sizeof(struct fsmap) * 2); | 688 | memset(keys, 0, sizeof(struct fsmap) * 2); |
688 | keys->fmr_device = ctx->fsinfo.fs_datadev; | 689 | keys->fmr_device = ctx->fsinfo.fs_datadev; |
689 | diff --git a/spaceman/freesp.c b/spaceman/freesp.c | 690 | diff --git a/spaceman/freesp.c b/spaceman/freesp.c |
690 | index 423568a4..df878ce8 100644 | 691 | index 423568a..df878ce 100644 |
691 | --- a/spaceman/freesp.c | 692 | --- a/spaceman/freesp.c |
692 | +++ b/spaceman/freesp.c | 693 | +++ b/spaceman/freesp.c |
693 | @@ -62,7 +62,7 @@ static void | 694 | @@ -62,7 +62,7 @@ static void |
@@ -709,7 +710,7 @@ index 423568a4..df878ce8 100644 | |||
709 | unsigned long long freeblks = 0; | 710 | unsigned long long freeblks = 0; |
710 | unsigned long long freeexts = 0; | 711 | unsigned long long freeexts = 0; |
711 | diff --git a/spaceman/trim.c b/spaceman/trim.c | 712 | diff --git a/spaceman/trim.c b/spaceman/trim.c |
712 | index e9ed47e4..727dd818 100644 | 713 | index e9ed47e..727dd81 100644 |
713 | --- a/spaceman/trim.c | 714 | --- a/spaceman/trim.c |
714 | +++ b/spaceman/trim.c | 715 | +++ b/spaceman/trim.c |
715 | @@ -26,7 +26,7 @@ trim_f( | 716 | @@ -26,7 +26,7 @@ trim_f( |
diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.0.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.1.0.bb index bb8c55d9d..13467630d 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.0.0.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.1.0.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ | |||
13 | file://0004-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch \ | 13 | file://0004-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch \ |
14 | file://0005-Replace-off64_t-stat64-with-off_t-stat.patch \ | 14 | file://0005-Replace-off64_t-stat64-with-off_t-stat.patch \ |
15 | " | 15 | " |
16 | SRC_URI[sha256sum] = "b77cec2364aab0b8ae8d8c67daac7fdb3801e0979f1d8328d9c3469e57ca9ca0" | 16 | SRC_URI[sha256sum] = "eceb9015c4ebefa56fa85faff756ccb51ed2cf9c39ba239767f8e78705e85251" |
17 | inherit autotools-brokensep pkgconfig | 17 | inherit autotools-brokensep pkgconfig |
18 | 18 | ||
19 | PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" | 19 | PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" |