summaryrefslogtreecommitdiffstats
path: root/meta-filesystems/recipes-utils
diff options
context:
space:
mode:
Diffstat (limited to 'meta-filesystems/recipes-utils')
-rw-r--r--meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb2
-rw-r--r--meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb2
-rw-r--r--meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb2
-rw-r--r--meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb2
-rw-r--r--meta-filesystems/recipes-utils/ufs-utils/files/0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch39
-rw-r--r--meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.12.bb6
-rw-r--r--meta-filesystems/recipes-utils/xfsprogs/files/0001-include-include-xfs-linux.h-after-sys-mman.h.patch (renamed from meta-filesystems/recipes-utils/xfsprogs/files/0002-include-include-xfs-linux.h-after-sys-mman.h.patch)4
-rw-r--r--meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch40
-rw-r--r--meta-filesystems/recipes-utils/xfsprogs/files/0002-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch (renamed from meta-filesystems/recipes-utils/xfsprogs/files/0004-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch)6
-rw-r--r--meta-filesystems/recipes-utils/xfsprogs/files/0003-doc-man-support-reproducible-builds.patch (renamed from meta-filesystems/recipes-utils/xfsprogs/files/0001-doc-man-support-reproducible-builds.patch)9
-rw-r--r--meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch724
-rw-r--r--meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch14
-rw-r--r--meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.18.0.bb (renamed from meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb)45
13 files changed, 38 insertions, 857 deletions
diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
index 61ec508b43..0abbc9ef50 100644
--- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
+++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
@@ -63,6 +63,6 @@ do_install:class-native () {
63 done 63 done
64} 64}
65 65
66RRECOMMENDS:${PN}:class-target += "kernel-module-aufs" 66RRECOMMENDS:${PN}:append:class-target = " kernel-module-aufs"
67 67
68BBCLASSEXTEND = "native" 68BBCLASSEXTEND = "native"
diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
index 06f0c28d6d..6581ac96d2 100644
--- a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
+++ b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
12DEPENDS += "coreutils e2fsprogs" 12DEPENDS += "coreutils e2fsprogs"
13 13
14SRC_URI = " \ 14SRC_URI = " \
15 git://github.com/e2tools/e2tools;protocol=https;branch=master \ 15 git://github.com/e2tools/e2tools;protocol=https;branch=master;tag=v${PV} \
16 file://run-ptest \ 16 file://run-ptest \
17" 17"
18 18
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb
index 68727b008e..78a71359cf 100644
--- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb
+++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.16.0.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3"
8DEPENDS = "util-linux" 8DEPENDS = "util-linux"
9 9
10SRCREV = "06c027abc6153c4a97cba5317844e8dcaaee3cf7" 10SRCREV = "06c027abc6153c4a97cba5317844e8dcaaee3cf7"
11SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;branch=master \ 11SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;branch=master;tag=v${PV} \
12 file://0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch \ 12 file://0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch \
13 file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \ 13 file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \
14 " 14 "
diff --git a/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb b/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb
index 876e8618eb..47bb8650a6 100644
--- a/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb
+++ b/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/Gregwar/fatcat"
7LICENSE = "MIT" 7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=57fbbfebd0dd1d6ff21b8cecb552a03f" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=57fbbfebd0dd1d6ff21b8cecb552a03f"
9 9
10SRC_URI = "git://github.com/Gregwar/fatcat.git;branch=master;protocol=https \ 10SRC_URI = "git://github.com/Gregwar/fatcat.git;branch=master;protocol=https;tag=v${PV} \
11 file://0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch \ 11 file://0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch \
12 file://0002-Enable-64bit-off_t.patch \ 12 file://0002-Enable-64bit-off_t.patch \
13 file://0001-Replace-std-ptr_fun-for-c-17.patch \ 13 file://0001-Replace-std-ptr_fun-for-c-17.patch \
diff --git a/meta-filesystems/recipes-utils/ufs-utils/files/0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch b/meta-filesystems/recipes-utils/ufs-utils/files/0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch
deleted file mode 100644
index 7ae858a65e..0000000000
--- a/meta-filesystems/recipes-utils/ufs-utils/files/0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 989dcd297223d6896c5892532d14984326fa093d Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Fri, 18 Jul 2025 16:52:57 +0800
4Subject: [PATCH] ufs_cmds: fix full_path buffer size in find_bsg_device
5
6The full_path buffer consists of: path + '/' + files->d_name + '\0'
7So the buffer size should be: strlen(path) + strlen(files->d_name) + 2
8
9Fix crash when running 32-bit binary on 64-bit system:
10$ ufs-utils list_bsg
11malloc(): invalid next size (unsorted)
12Aborted (core dumped)
13
14Fix #58
15
16Upstream-Status: Backport
17[https://github.com/SanDisk-Open-Source/ufs-utils/commit/989dcd297223d6896c5892532d14984326fa093d]
18
19Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
20---
21 ufs_cmds.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/ufs_cmds.c b/ufs_cmds.c
25index ddb037c..a6faa27 100644
26--- a/ufs_cmds.c
27+++ b/ufs_cmds.c
28@@ -1520,7 +1520,7 @@ static int find_bsg_device(char* path, int *counter) {
29 if ((strcmp(files->d_name, ".") != 0) &&
30 (strcmp(files->d_name, "..") != 0)) {
31 char *full_path = (char *)malloc(strlen(path) +
32- strlen(files->d_name) + 1);
33+ strlen(files->d_name) + 2);
34 sprintf(full_path, "%s/%s",
35 path, files->d_name);
36 rc = find_bsg_device(full_path, counter);
37--
382.34.1
39
diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.12.bb b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.12.bb
index 3c12bc5fbe..fa23718611 100644
--- a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.12.bb
+++ b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.12.bb
@@ -4,11 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
4 4
5BRANCH ?= "dev" 5BRANCH ?= "dev"
6 6
7SRCREV = "dd2e655780424eadf7610de33e5966be19168a95" 7SRCREV = "bcf4b0dca8e58b8fc8265ba746a7b84af86fc365"
8 8
9SRC_URI = "git://github.com/SanDisk-Open-Source/ufs-utils.git;protocol=https;branch=${BRANCH} \ 9SRC_URI = "git://github.com/SanDisk-Open-Source/ufs-utils.git;protocol=https;branch=${BRANCH};tag=v${PV}"
10 file://0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch \
11 "
12 10
13UPSTREAM_CHECK_COMMITS = "1" 11UPSTREAM_CHECK_COMMITS = "1"
14 12
diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0002-include-include-xfs-linux.h-after-sys-mman.h.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-include-include-xfs-linux.h-after-sys-mman.h.patch
index f924cd1a16..d9aa309607 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/files/0002-include-include-xfs-linux.h-after-sys-mman.h.patch
+++ b/meta-filesystems/recipes-utils/xfsprogs/files/0001-include-include-xfs-linux.h-after-sys-mman.h.patch
@@ -1,4 +1,4 @@
1From 11a42df394de3dc520e72a016296dcc6dea02a7a Mon Sep 17 00:00:00 2001 1From 04a4272a36f6b2a1ad30a10fcf36a4a1c68a5449 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 Aug 2018 05:33:57 +0000 3Date: Thu, 23 Aug 2018 05:33:57 +0000
4Subject: [PATCH] include include/xfs/linux.h after <sys/mman.h> 4Subject: [PATCH] include include/xfs/linux.h after <sys/mman.h>
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 3 insertions(+), 2 deletions(-) 14 1 file changed, 3 insertions(+), 2 deletions(-)
15 15
16diff --git a/io/mmap.c b/io/mmap.c 16diff --git a/io/mmap.c b/io/mmap.c
17index dbfcca5..ca00df1 100644 17index 4c03e3d..3763551 100644
18--- a/io/mmap.c 18--- a/io/mmap.c
19+++ b/io/mmap.c 19+++ b/io/mmap.c
20@@ -4,10 +4,11 @@ 20@@ -4,10 +4,11 @@
diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch
deleted file mode 100644
index 84f4f88e5f..0000000000
--- a/meta-filesystems/recipes-utils/xfsprogs/files/0001-support-usrmerge.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From e81633a276dd6a9f919e5e5c15481ac50a8e485d Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 30 Aug 2019 14:59:06 +0800
4Subject: [PATCH] support usrmerge
5
6Upstream-Status: Inappropriate [oe-specific]
7
8Signed-off-by: Changqing Li <changqing.li@windriver.com>
9---
10 configure.ac | 7 +++----
11 1 file changed, 3 insertions(+), 4 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index 4b7e4c8..f1afbd6 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -110,8 +110,7 @@ AC_ARG_ENABLE(libicu,
18 # If the user specified a libdir ending in lib64 do not append another
19 # 64 to the library names.
20 #
21-base_libdir=`basename "$libdir"`
22-case $base_libdir in
23+case `basename "$libdir"` in
24 lib64)
25 enable_lib64=no
26 esac
27@@ -125,8 +124,8 @@ esac
28 #
29 case $exec_prefix:$prefix in
30 NONE:NONE | NONE:/usr | /usr:*)
31- root_sbindir='/sbin'
32- root_libdir="/${base_libdir}"
33+ root_sbindir="${base_sbindir}"
34+ root_libdir="${base_libdir}"
35 ;;
36 *)
37 root_sbindir="${sbindir}"
38--
392.7.4
40
diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0004-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0002-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch
index 60be8bfa34..d62ad022c3 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/files/0004-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch
+++ b/meta-filesystems/recipes-utils/xfsprogs/files/0002-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch
@@ -1,4 +1,4 @@
1From f62d3e5cc1d4e416b97778059f0b3c20d777a4c2 Mon Sep 17 00:00:00 2001 1From 471bbf39f6b9104d39f0b9c8d4a64328dd5ae58e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 21 Dec 2022 17:40:11 -0800 3Date: Wed, 21 Dec 2022 17:40:11 -0800
4Subject: [PATCH] configure: Use AC_SYS_LARGERFILE autoconf macro 4Subject: [PATCH] configure: Use AC_SYS_LARGERFILE autoconf macro
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 1 file changed, 3 insertions(+) 12 1 file changed, 3 insertions(+)
13 13
14diff --git a/configure.ac b/configure.ac 14diff --git a/configure.ac b/configure.ac
15index 5a6bf185..a6f556ec 100644 15index a8b8f7d..f8caa73 100644
16--- a/configure.ac 16--- a/configure.ac
17+++ b/configure.ac 17+++ b/configure.ac
18@@ -10,6 +10,9 @@ AC_PROG_INSTALL 18@@ -18,6 +18,9 @@ AC_PROG_INSTALL
19 LT_INIT 19 LT_INIT
20 20
21 AC_PROG_CC 21 AC_PROG_CC
diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-doc-man-support-reproducible-builds.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0003-doc-man-support-reproducible-builds.patch
index 182d45e4e2..fed3f3451a 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/files/0001-doc-man-support-reproducible-builds.patch
+++ b/meta-filesystems/recipes-utils/xfsprogs/files/0003-doc-man-support-reproducible-builds.patch
@@ -1,4 +1,4 @@
1From c98d9022377e88f8cc2d557a4ffd321e6f2dd320 Mon Sep 17 00:00:00 2001 1From a2d78f6716157d6e1e94d9864e351887d74d0b30 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@eng.windriver.com> 2From: Hongxu Jia <hongxu.jia@eng.windriver.com>
3Date: Tue, 18 Nov 2025 01:04:27 -0800 3Date: Tue, 18 Nov 2025 01:04:27 -0800
4Subject: [PATCH] doc/man: support reproducible builds 4Subject: [PATCH] doc/man: support reproducible builds
@@ -16,7 +16,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@eng.windriver.com>
16 2 files changed, 3 insertions(+), 3 deletions(-) 16 2 files changed, 3 insertions(+), 3 deletions(-)
17 17
18diff --git a/doc/Makefile b/doc/Makefile 18diff --git a/doc/Makefile b/doc/Makefile
19index 83dfa38b..17b63c85 100644 19index 83dfa38..17b63c8 100644
20--- a/doc/Makefile 20--- a/doc/Makefile
21+++ b/doc/Makefile 21+++ b/doc/Makefile
22@@ -14,7 +14,7 @@ include $(BUILDRULES) 22@@ -14,7 +14,7 @@ include $(BUILDRULES)
@@ -29,7 +29,7 @@ index 83dfa38b..17b63c85 100644
29 install: default 29 install: default
30 $(INSTALL) -m 755 -d $(PKG_DOC_DIR) 30 $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
31diff --git a/include/buildmacros b/include/buildmacros 31diff --git a/include/buildmacros b/include/buildmacros
32index 9183e5bc..6ba0d515 100644 32index 9183e5b..6ba0d51 100644
33--- a/include/buildmacros 33--- a/include/buildmacros
34+++ b/include/buildmacros 34+++ b/include/buildmacros
35@@ -105,7 +105,7 @@ INSTALL_MAN = \ 35@@ -105,7 +105,7 @@ INSTALL_MAN = \
@@ -49,6 +49,3 @@ index 9183e5bc..6ba0d515 100644
49+ $(ZIP) -n --best -c < $$f > $$f.gz; \ 49+ $(ZIP) -n --best -c < $$f > $$f.gz; \
50 fi; \ 50 fi; \
51 done 51 done
52--
532.49.0
54
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
deleted file mode 100644
index 940d63c010..0000000000
--- a/meta-filesystems/recipes-utils/xfsprogs/files/0005-Replace-off64_t-stat64-with-off_t-stat.patch
+++ /dev/null
@@ -1,724 +0,0 @@
1From f260099fc45f0653aa4758d1d581e07f5b9c6a54 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 21 Dec 2022 17:43:07 -0800
4Subject: [PATCH] Replace off64_t/stat64 with off_t/stat
5
6When using AC_SYS_LARGEFILE, it will automatically add
7-D_FILE_OFFSET_BITS=64 to enable 64bit off_t and all lfs64 support
8
9helps compile on musl where off_t was always 64bit and lfs64 were never
10needed
11
12Upstream-Status: Submitted [https://lore.kernel.org/linux-xfs/20221222015327.939932-1-raj.khem@gmail.com/T/#t]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15---
16 copy/xfs_copy.c | 2 +-
17 fsr/xfs_fsr.c | 2 +-
18 io/bmap.c | 6 +++---
19 io/copy_file_range.c | 4 ++--
20 io/cowextsize.c | 6 +++---
21 io/fadvise.c | 2 +-
22 io/fiemap.c | 6 +++---
23 io/fsmap.c | 6 +++---
24 io/io.h | 10 +++++-----
25 io/madvise.c | 2 +-
26 io/mincore.c | 2 +-
27 io/mmap.c | 12 ++++++------
28 io/pread.c | 22 +++++++++++-----------
29 io/pwrite.c | 20 ++++++++++----------
30 io/reflink.c | 4 ++--
31 io/seek.c | 6 +++---
32 io/sendfile.c | 6 +++---
33 io/stat.c | 2 +-
34 io/sync_file_range.c | 2 +-
35 io/truncate.c | 2 +-
36 libxfs/rdwr.c | 8 ++++----
37 mdrestore/xfs_mdrestore.c | 2 +-
38 repair/prefetch.c | 2 +-
39 scrub/spacemap.c | 6 +++---
40 spaceman/freesp.c | 4 ++--
41 spaceman/trim.c | 2 +-
42 26 files changed, 74 insertions(+), 74 deletions(-)
43
44diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
45index 0420649..98a578a 100644
46--- a/copy/xfs_copy.c
47+++ b/copy/xfs_copy.c
48@@ -881,7 +881,7 @@ main(int argc, char **argv)
49 }
50 } else {
51 char *lb = memalign(wbuf_align, XFS_MAX_SECTORSIZE);
52- off64_t off;
53+ off_t off;
54 ssize_t len;
55
56 /* ensure device files are sufficiently large */
57diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
58index ba02506..12fffbd 100644
59--- a/fsr/xfs_fsr.c
60+++ b/fsr/xfs_fsr.c
61@@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd,
62 struct dioattr dio;
63 static xfs_swapext_t sx;
64 struct xfs_flock64 space;
65- off64_t cnt, pos;
66+ off_t cnt, pos;
67 void *fbuf = NULL;
68 int ct, wc, wc_b4;
69 char ffname[SMBUFSZ];
70diff --git a/io/bmap.c b/io/bmap.c
71index 722a389..6182e1c 100644
72--- a/io/bmap.c
73+++ b/io/bmap.c
74@@ -257,7 +257,7 @@ bmap_f(
75 #define FLG_BSW 0000010 /* Not on begin of stripe width */
76 #define FLG_ESW 0000001 /* Not on end of stripe width */
77 int agno;
78- off64_t agoff, bbperag;
79+ off_t agoff, bbperag;
80 int foff_w, boff_w, aoff_w, tot_w, agno_w;
81 char rbuf[32], bbuf[32], abuf[32];
82 int sunit, swidth;
83@@ -267,8 +267,8 @@ bmap_f(
84 if (is_rt)
85 sunit = swidth = bbperag = 0;
86 else {
87- bbperag = (off64_t)fsgeo.agblocks *
88- (off64_t)fsgeo.blocksize / BBSIZE;
89+ bbperag = (off_t)fsgeo.agblocks *
90+ (off_t)fsgeo.blocksize / BBSIZE;
91 sunit = (fsgeo.sunit * fsgeo.blocksize) / BBSIZE;
92 swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE;
93 }
94diff --git a/io/copy_file_range.c b/io/copy_file_range.c
95index d154fa7..422e691 100644
96--- a/io/copy_file_range.c
97+++ b/io/copy_file_range.c
98@@ -54,7 +54,7 @@ copy_file_range_cmd(int fd, long long *src_off, long long *dst_off, size_t len)
99 return 0;
100 }
101
102-static off64_t
103+static off_t
104 copy_src_filesize(int fd)
105 {
106 struct stat st;
107@@ -154,7 +154,7 @@ copy_range_f(int argc, char **argv)
108 }
109
110 if (!len_specified) {
111- off64_t sz;
112+ off_t sz;
113
114 sz = copy_src_filesize(fd);
115 if (sz < 0 || (unsigned long long)sz > SIZE_MAX) {
116diff --git a/io/cowextsize.c b/io/cowextsize.c
117index f6b134d..00e40c6 100644
118--- a/io/cowextsize.c
119+++ b/io/cowextsize.c
120@@ -50,10 +50,10 @@ static int
121 set_cowextsize(const char *path, int fd, long extsz)
122 {
123 struct fsxattr fsx;
124- struct stat64 stat;
125+ struct stat stat;
126
127- if (fstat64(fd, &stat) < 0) {
128- perror("fstat64");
129+ if (fstat(fd, &stat) < 0) {
130+ perror("fstat");
131 exitcode = 1;
132 return 0;
133 }
134diff --git a/io/fadvise.c b/io/fadvise.c
135index 60cc0f0..0966c41 100644
136--- a/io/fadvise.c
137+++ b/io/fadvise.c
138@@ -39,7 +39,7 @@ fadvise_f(
139 int argc,
140 char **argv)
141 {
142- off64_t offset = 0, length = 0;
143+ off_t offset = 0, length = 0;
144 int c, range = 0, advise = POSIX_FADV_NORMAL;
145
146 while ((c = getopt(argc, argv, "dnrsw")) != EOF) {
147diff --git a/io/fiemap.c b/io/fiemap.c
148index f0c74df..b41f71b 100644
149--- a/io/fiemap.c
150+++ b/io/fiemap.c
151@@ -234,9 +234,9 @@ fiemap_f(
152 int tot_w = 5; /* 5 since its just one number */
153 int flg_w = 5;
154 __u64 last_logical = 0; /* last extent offset handled */
155- off64_t start_offset = 0; /* mapping start */
156- off64_t length = -1LL; /* mapping length */
157- off64_t range_end = -1LL; /* mapping end*/
158+ off_t start_offset = 0; /* mapping start */
159+ off_t length = -1LL; /* mapping length */
160+ off_t range_end = -1LL; /* mapping end*/
161 size_t fsblocksize, fssectsize;
162 struct stat st;
163
164diff --git a/io/fsmap.c b/io/fsmap.c
165index 7db5184..bf11963 100644
166--- a/io/fsmap.c
167+++ b/io/fsmap.c
168@@ -170,7 +170,7 @@ dump_map_verbose(
169 unsigned long long i;
170 struct fsmap *p;
171 int agno;
172- off64_t agoff, bperag;
173+ off_t agoff, bperag;
174 int foff_w, boff_w, aoff_w, tot_w, agno_w, own_w;
175 int nr_w, dev_w;
176 char rbuf[40], bbuf[40], abuf[40], obuf[40];
177@@ -183,8 +183,8 @@ dump_map_verbose(
178 dev_w = 3;
179 nr_w = 4;
180 tot_w = MINTOT_WIDTH;
181- bperag = (off64_t)fsgeo->agblocks *
182- (off64_t)fsgeo->blocksize;
183+ bperag = (off_t)fsgeo->agblocks *
184+ (off_t)fsgeo->blocksize;
185 sunit = (fsgeo->sunit * fsgeo->blocksize);
186 swidth = (fsgeo->swidth * fsgeo->blocksize);
187
188diff --git a/io/io.h b/io/io.h
189index fe474fa..68e5e48 100644
190--- a/io/io.h
191+++ b/io/io.h
192@@ -53,7 +53,7 @@ extern int stat_f(int argc, char **argv);
193 typedef struct mmap_region {
194 void *addr; /* address of start of mapping */
195 size_t length; /* length of mapping */
196- off64_t offset; /* start offset into backing file */
197+ off_t offset; /* start offset into backing file */
198 int prot; /* protection mode of the mapping */
199 int flags; /* MAP_* flags passed to mmap() */
200 char *name; /* name of backing file */
201@@ -63,13 +63,13 @@ extern mmap_region_t *maptable; /* mmap'd region array */
202 extern int mapcount; /* #entries in the mapping table */
203 extern mmap_region_t *mapping; /* active mapping table entry */
204 extern int maplist_f(void);
205-extern void *check_mapping_range(mmap_region_t *, off64_t, size_t, int);
206+extern void *check_mapping_range(mmap_region_t *, off_t, size_t, int);
207
208 /*
209 * Various xfs_io helper routines/globals
210 */
211
212-extern off64_t filesize(void);
213+extern off_t filesize(void);
214 extern int openfile(char *, struct xfs_fsop_geom *, int, mode_t,
215 struct fs_path *);
216 extern int addfile(char *, int , struct xfs_fsop_geom *, int,
217@@ -84,9 +84,9 @@ extern size_t io_buffersize;
218 extern int vectors;
219 extern struct iovec *iov;
220 extern int alloc_buffer(size_t, int, unsigned int);
221-extern int read_buffer(int, off64_t, long long, long long *,
222+extern int read_buffer(int, off_t, long long, long long *,
223 int, int);
224-extern void dump_buffer(off64_t, ssize_t);
225+extern void dump_buffer(off_t, ssize_t);
226
227 extern void attr_init(void);
228 extern void bmap_init(void);
229diff --git a/io/madvise.c b/io/madvise.c
230index bde3153..6e9c5b1 100644
231--- a/io/madvise.c
232+++ b/io/madvise.c
233@@ -39,7 +39,7 @@ madvise_f(
234 int argc,
235 char **argv)
236 {
237- off64_t offset, llength;
238+ off_t offset, llength;
239 size_t length;
240 void *start;
241 int advise = MADV_NORMAL, c;
242diff --git a/io/mincore.c b/io/mincore.c
243index 67f1d6c..24147ac 100644
244--- a/io/mincore.c
245+++ b/io/mincore.c
246@@ -17,7 +17,7 @@ mincore_f(
247 int argc,
248 char **argv)
249 {
250- off64_t offset, llength;
251+ off_t offset, llength;
252 size_t length;
253 size_t blocksize, sectsize;
254 void *start;
255diff --git a/io/mmap.c b/io/mmap.c
256index 7114404..128a2c0 100644
257--- a/io/mmap.c
258+++ b/io/mmap.c
259@@ -64,11 +64,11 @@ print_mapping(
260 void *
261 check_mapping_range(
262 mmap_region_t *map,
263- off64_t offset,
264+ off_t offset,
265 size_t length,
266 int pagealign)
267 {
268- off64_t relative;
269+ off_t relative;
270
271 if (offset < mapping->offset) {
272 printf(_("offset (%lld) is before start of mapping (%lld)\n"),
273@@ -156,7 +156,7 @@ mmap_f(
274 int argc,
275 char **argv)
276 {
277- off64_t offset;
278+ off_t offset;
279 ssize_t length = 0, length2 = 0;
280 void *address = NULL;
281 char *filename;
282@@ -309,7 +309,7 @@ msync_f(
283 int argc,
284 char **argv)
285 {
286- off64_t offset;
287+ off_t offset;
288 ssize_t length;
289 void *start;
290 int c, flags = 0;
291@@ -402,7 +402,7 @@ mread_f(
292 int argc,
293 char **argv)
294 {
295- off64_t offset, tmp, dumpoffset, printoffset;
296+ off_t offset, tmp, dumpoffset, printoffset;
297 ssize_t length;
298 size_t dumplen, cnt = 0;
299 char *bp;
300@@ -567,7 +567,7 @@ mwrite_f(
301 int argc,
302 char **argv)
303 {
304- off64_t offset, tmp;
305+ off_t offset, tmp;
306 ssize_t length;
307 void *start;
308 char *sp;
309diff --git a/io/pread.c b/io/pread.c
310index 0f1d8b9..79990c6 100644
311--- a/io/pread.c
312+++ b/io/pread.c
313@@ -116,7 +116,7 @@ alloc_buffer(
314 static void
315 __dump_buffer(
316 void *buf,
317- off64_t offset,
318+ off_t offset,
319 ssize_t len)
320 {
321 int i, j;
322@@ -141,7 +141,7 @@ __dump_buffer(
323
324 void
325 dump_buffer(
326- off64_t offset,
327+ off_t offset,
328 ssize_t len)
329 {
330 int i, l;
331@@ -164,7 +164,7 @@ dump_buffer(
332 static ssize_t
333 do_preadv(
334 int fd,
335- off64_t offset,
336+ off_t offset,
337 long long count)
338 {
339 int vecs = 0;
340@@ -199,7 +199,7 @@ do_preadv(
341 static ssize_t
342 do_pread(
343 int fd,
344- off64_t offset,
345+ off_t offset,
346 long long count,
347 size_t buffer_size)
348 {
349@@ -212,13 +212,13 @@ do_pread(
350 static int
351 read_random(
352 int fd,
353- off64_t offset,
354+ off_t offset,
355 long long count,
356 long long *total,
357 unsigned int seed,
358 int eof)
359 {
360- off64_t end, off, range;
361+ off_t end, off, range;
362 ssize_t bytes;
363 int ops = 0;
364
365@@ -259,12 +259,12 @@ read_random(
366 static int
367 read_backward(
368 int fd,
369- off64_t *offset,
370+ off_t *offset,
371 long long *count,
372 long long *total,
373 int eof)
374 {
375- off64_t end, off = *offset;
376+ off_t end, off = *offset;
377 ssize_t bytes = 0, bytes_requested;
378 long long cnt = *count;
379 int ops = 0;
380@@ -319,7 +319,7 @@ read_backward(
381 static int
382 read_forward(
383 int fd,
384- off64_t offset,
385+ off_t offset,
386 long long count,
387 long long *total,
388 int verbose,
389@@ -353,7 +353,7 @@ read_forward(
390 int
391 read_buffer(
392 int fd,
393- off64_t offset,
394+ off_t offset,
395 long long count,
396 long long *total,
397 int verbose,
398@@ -368,7 +368,7 @@ pread_f(
399 char **argv)
400 {
401 size_t bsize;
402- off64_t offset;
403+ off_t offset;
404 unsigned int zeed = 0;
405 long long count, total, tmp;
406 size_t fsblocksize, fssectsize;
407diff --git a/io/pwrite.c b/io/pwrite.c
408index 467bfa9..8d134c5 100644
409--- a/io/pwrite.c
410+++ b/io/pwrite.c
411@@ -54,7 +54,7 @@ pwrite_help(void)
412 static ssize_t
413 do_pwritev(
414 int fd,
415- off64_t offset,
416+ off_t offset,
417 long long count,
418 int pwritev2_flags)
419 {
420@@ -97,7 +97,7 @@ do_pwritev(
421 static ssize_t
422 do_pwrite(
423 int fd,
424- off64_t offset,
425+ off_t offset,
426 long long count,
427 size_t buffer_size,
428 int pwritev2_flags)
429@@ -110,13 +110,13 @@ do_pwrite(
430
431 static int
432 write_random(
433- off64_t offset,
434+ off_t offset,
435 long long count,
436 unsigned int seed,
437 long long *total,
438 int pwritev2_flags)
439 {
440- off64_t off, range;
441+ off_t off, range;
442 ssize_t bytes;
443 int ops = 0;
444
445@@ -155,12 +155,12 @@ write_random(
446
447 static int
448 write_backward(
449- off64_t offset,
450+ off_t offset,
451 long long *count,
452 long long *total,
453 int pwritev2_flags)
454 {
455- off64_t end, off = offset;
456+ off_t end, off = offset;
457 ssize_t bytes = 0, bytes_requested;
458 long long cnt = *count;
459 int ops = 0;
460@@ -214,11 +214,11 @@ write_backward(
461
462 static int
463 write_buffer(
464- off64_t offset,
465+ off_t offset,
466 long long count,
467 size_t bs,
468 int fd,
469- off64_t skip,
470+ off_t skip,
471 long long *total,
472 int pwritev2_flags)
473 {
474@@ -253,7 +253,7 @@ write_buffer(
475
476 static int
477 write_once(
478- off64_t offset,
479+ off_t offset,
480 long long count,
481 long long *total,
482 int pwritev2_flags)
483@@ -275,7 +275,7 @@ pwrite_f(
484 char **argv)
485 {
486 size_t bsize;
487- off64_t offset, skip = 0;
488+ off_t offset, skip = 0;
489 long long count, total, tmp;
490 unsigned int zeed = 0, seed = 0xcdcdcdcd;
491 size_t fsblocksize, fssectsize;
492diff --git a/io/reflink.c b/io/reflink.c
493index 8e4f389..b6a3c05 100644
494--- a/io/reflink.c
495+++ b/io/reflink.c
496@@ -98,7 +98,7 @@ dedupe_f(
497 int argc,
498 char **argv)
499 {
500- off64_t soffset, doffset;
501+ off_t soffset, doffset;
502 long long count, total;
503 char *infile;
504 int condensed, quiet_flag;
505@@ -226,7 +226,7 @@ reflink_f(
506 int argc,
507 char **argv)
508 {
509- off64_t soffset, doffset;
510+ off_t soffset, doffset;
511 long long count = 0, total;
512 char *infile = NULL;
513 int condensed, quiet_flag;
514diff --git a/io/seek.c b/io/seek.c
515index 6734ecb..ffe7439 100644
516--- a/io/seek.c
517+++ b/io/seek.c
518@@ -63,8 +63,8 @@ static void
519 seek_output(
520 int startflag,
521 char *type,
522- off64_t start,
523- off64_t offset)
524+ off_t start,
525+ off_t offset)
526 {
527 if (offset == -1) {
528 if (errno == ENXIO) {
529@@ -92,7 +92,7 @@ seek_f(
530 int argc,
531 char **argv)
532 {
533- off64_t offset, start;
534+ off_t offset, start;
535 size_t fsblocksize, fssectsize;
536 int c;
537 int current; /* specify data or hole */
538diff --git a/io/sendfile.c b/io/sendfile.c
539index a003bb5..2ce569c 100644
540--- a/io/sendfile.c
541+++ b/io/sendfile.c
542@@ -34,12 +34,12 @@ sendfile_help(void)
543
544 static int
545 send_buffer(
546- off64_t offset,
547+ off_t offset,
548 size_t count,
549 int fd,
550 long long *total)
551 {
552- off64_t off = offset;
553+ off_t off = offset;
554 ssize_t bytes, bytes_remaining = count;
555 int ops = 0;
556
557@@ -66,7 +66,7 @@ sendfile_f(
558 int argc,
559 char **argv)
560 {
561- off64_t offset = 0;
562+ off_t offset = 0;
563 long long count, total;
564 size_t blocksize, sectsize;
565 struct timeval t1, t2;
566diff --git a/io/stat.c b/io/stat.c
567index b57f9ee..e8f68dc 100644
568--- a/io/stat.c
569+++ b/io/stat.c
570@@ -21,7 +21,7 @@ static cmdinfo_t stat_cmd;
571 static cmdinfo_t statfs_cmd;
572 static cmdinfo_t statx_cmd;
573
574-off64_t
575+off_t
576 filesize(void)
577 {
578 struct stat st;
579diff --git a/io/sync_file_range.c b/io/sync_file_range.c
580index 94285c2..2375a06 100644
581--- a/io/sync_file_range.c
582+++ b/io/sync_file_range.c
583@@ -30,7 +30,7 @@ sync_range_f(
584 int argc,
585 char **argv)
586 {
587- off64_t offset = 0, length = 0;
588+ off_t offset = 0, length = 0;
589 int c, sync_mode = 0;
590 size_t blocksize, sectsize;
591
592diff --git a/io/truncate.c b/io/truncate.c
593index 1d04919..a74b613 100644
594--- a/io/truncate.c
595+++ b/io/truncate.c
596@@ -16,7 +16,7 @@ truncate_f(
597 int argc,
598 char **argv)
599 {
600- off64_t offset;
601+ off_t offset;
602 size_t blocksize, sectsize;
603
604 init_cvtnum(&blocksize, &sectsize);
605diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
606index 0e33211..153007d 100644
607--- a/libxfs/rdwr.c
608+++ b/libxfs/rdwr.c
609@@ -576,7 +576,7 @@ libxfs_balloc(
610
611
612 static int
613-__read_buf(int fd, void *buf, int len, off64_t offset, int flags)
614+__read_buf(int fd, void *buf, int len, off_t offset, int flags)
615 {
616 int sts;
617
618@@ -638,7 +638,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags)
619
620 buf = bp->b_addr;
621 for (i = 0; i < bp->b_nmaps; i++) {
622- off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
623+ off_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
624 int len = BBTOB(bp->b_maps[i].bm_len);
625
626 error = __read_buf(fd, buf, len, offset, flags);
627@@ -797,7 +797,7 @@ err:
628 }
629
630 static int
631-__write_buf(int fd, void *buf, int len, off64_t offset, int flags)
632+__write_buf(int fd, void *buf, int len, off_t offset, int flags)
633 {
634 int sts;
635
636@@ -863,7 +863,7 @@ libxfs_bwrite(
637 void *buf = bp->b_addr;
638
639 for (i = 0; i < bp->b_nmaps; i++) {
640- off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
641+ off_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
642 int len = BBTOB(bp->b_maps[i].bm_len);
643
644 bp->b_error = __write_buf(fd, buf, len, offset,
645diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
646index 8e3998d..334bdd2 100644
647--- a/mdrestore/xfs_mdrestore.c
648+++ b/mdrestore/xfs_mdrestore.c
649@@ -160,7 +160,7 @@ verify_device_size(
650 } else {
651 /* ensure device is sufficiently large enough */
652 char lb[XFS_MAX_SECTORSIZE] = { 0 };
653- off64_t off;
654+ off_t off;
655
656 off = nr_blocks * blocksize - sizeof(lb);
657 if (pwrite(dev_fd, lb, sizeof(lb), off) < 0)
658diff --git a/repair/prefetch.c b/repair/prefetch.c
659index 78c1e39..b0dd197 100644
660--- a/repair/prefetch.c
661+++ b/repair/prefetch.c
662@@ -475,7 +475,7 @@ pf_batch_read(
663 {
664 struct xfs_buf *bplist[MAX_BUFS];
665 unsigned int num;
666- off64_t first_off, last_off, next_off;
667+ off_t first_off, last_off, next_off;
668 int len, size;
669 int i;
670 int inode_bufs;
671diff --git a/scrub/spacemap.c b/scrub/spacemap.c
672index b6fd411..9cefe07 100644
673--- a/scrub/spacemap.c
674+++ b/scrub/spacemap.c
675@@ -97,11 +97,11 @@ scan_ag_rmaps(
676 struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx;
677 struct scan_blocks *sbx = arg;
678 struct fsmap keys[2];
679- off64_t bperag;
680+ off_t bperag;
681 int ret;
682
683- bperag = (off64_t)ctx->mnt.fsgeom.agblocks *
684- (off64_t)ctx->mnt.fsgeom.blocksize;
685+ bperag = (off_t)ctx->mnt.fsgeom.agblocks *
686+ (off_t)ctx->mnt.fsgeom.blocksize;
687
688 memset(keys, 0, sizeof(struct fsmap) * 2);
689 keys->fmr_device = ctx->fsinfo.fs_datadev;
690diff --git a/spaceman/freesp.c b/spaceman/freesp.c
691index 70dcdb5..f5177cb 100644
692--- a/spaceman/freesp.c
693+++ b/spaceman/freesp.c
694@@ -62,7 +62,7 @@ static void
695 addtohist(
696 xfs_agnumber_t agno,
697 xfs_agblock_t agbno,
698- off64_t len)
699+ off_t len)
700 {
701 long i;
702
703@@ -152,7 +152,7 @@ scan_ag(
704 struct fsmap *l, *h;
705 struct fsmap *p;
706 struct xfs_fd *xfd = &file->xfd;
707- off64_t aglen;
708+ off_t aglen;
709 xfs_agblock_t agbno;
710 unsigned long long freeblks = 0;
711 unsigned long long freeexts = 0;
712diff --git a/spaceman/trim.c b/spaceman/trim.c
713index e9ed47e..727dd81 100644
714--- a/spaceman/trim.c
715+++ b/spaceman/trim.c
716@@ -26,7 +26,7 @@ trim_f(
717 struct xfs_fd *xfd = &file->xfd;
718 struct xfs_fsop_geom *fsgeom = &xfd->fsgeom;
719 xfs_agnumber_t agno = 0;
720- off64_t offset = 0;
721+ off_t offset = 0;
722 ssize_t length = 0;
723 ssize_t minlen = 0;
724 int aflag = 0;
diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch b/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch
index 5bab162c85..9ea2a4f188 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch
+++ b/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch
@@ -1,15 +1,15 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Index: xfsprogs-4.14.0/include/builddefs.in 3Index: xfsprogs-6.18.0/include/builddefs.in
4=================================================================== 4===================================================================
5--- xfsprogs-4.14.0.orig/include/builddefs.in 5--- xfsprogs-6.18.0.orig/include/builddefs.in
6+++ xfsprogs-4.14.0/include/builddefs.in 6+++ xfsprogs-6.18.0/include/builddefs.in
7@@ -168,7 +168,7 @@ ifeq ($(ENABLE_GETTEXT),yes) 7@@ -180,7 +180,7 @@ SANITIZER_CXXFLAGS = $(SANITIZER_CFLAGS)
8 GCFLAGS += -DENABLE_GETTEXT 8 GCXXFLAGS = $(GCFLAGS)
9 endif 9 PCXXFLAGS = $(PCFLAGS)
10 10
11-BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS) 11-BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS)
12+BUILD_CFLAGS += $(GCFLAGS) 12+BUILD_CFLAGS += $(GCFLAGS)
13 # First, Sanitizer, Global, Platform, Local CFLAGS 13 # First, Sanitizer, Global, Platform, Local CFLAGS
14 CFLAGS += $(FCFLAGS) $(SANITIZER_CFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) 14 CFLAGS += $(FCFLAGS) $(SANITIZER_CFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
15 15 CXXFLAGS += $(FCXXFLAGS) $(SANITIZER_CXXFLAGS) $(OPTIMIZER) $(GCXXFLAGS) $(PCXXFLAGS) $(LCXXFLAGS)
diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.18.0.bb
index 80bce6f939..33847a86d7 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb
+++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.18.0.bb
@@ -5,29 +5,29 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
5LICENSE:libhandle = "LGPL-2.1-only" 5LICENSE:libhandle = "LGPL-2.1-only"
6LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \ 6LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
7 file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" 7 file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd"
8DEPENDS = "util-linux util-linux-native" 8
9SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ 9SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \
10 file://remove_flags_from_build_flags.patch \ 10 file://remove_flags_from_build_flags.patch \
11 file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ 11 file://0001-include-include-xfs-linux.h-after-sys-mman.h.patch \
12 file://0001-support-usrmerge.patch \ 12 file://0002-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch \
13 file://0004-configure-Use-AC_SYS_LARGERFILE-autoconf-macro.patch \ 13 file://0003-doc-man-support-reproducible-builds.patch \
14 file://0005-Replace-off64_t-stat64-with-off_t-stat.patch \
15 file://0001-doc-man-support-reproducible-builds.patch \
16 " 14 "
17SRC_URI[sha256sum] = "50ca2f4676df8fab4cb4c3ef3dd512d5551e6844d40a65a31d5b8e03593d22df" 15
16SRC_URI[sha256sum] = "3a6dc7b1245ce9bccd197bab00691f1b190bd3694d3ccc301d21b83afc133199"
17
18inherit autotools-brokensep pkgconfig 18inherit autotools-brokensep pkgconfig
19 19
20PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" 20DEPENDS = "util-linux util-linux-native libinih liburcu"
21 21
22DEPENDS += "util-linux libinih liburcu" 22PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle"
23 23
24RDEPENDS:${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" 24RDEPENDS:${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair python3-core bash"
25 25
26FILES:${PN}-fsck = "${base_sbindir}/fsck.xfs" 26FILES:${PN}-fsck = "${sbindir}/fsck.xfs"
27FILES:${PN}-mkfs = "${base_sbindir}/mkfs.xfs" 27FILES:${PN}-mkfs = "${sbindir}/mkfs.xfs"
28FILES:${PN}-repair = "${base_sbindir}/xfs_repair" 28FILES:${PN}-repair = "${sbindir}/xfs_repair"
29 29
30FILES:libhandle = "${base_libdir}/libhandle${SOLIBS}" 30FILES:libhandle = "${libdir}/libhandle${SOLIBS}"
31 31
32EXTRA_OECONF = "--enable-gettext=no \ 32EXTRA_OECONF = "--enable-gettext=no \
33 --enable-scrub=no \ 33 --enable-scrub=no \
@@ -41,21 +41,17 @@ EXTRA_OECONF = "--enable-gettext=no \
41DISABLE_STATIC = "" 41DISABLE_STATIC = ""
42EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" 42EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader"
43 43
44PACKAGECONFIG ??= "blkid"
45
46PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux"
47
48export DEBUG = "-DNDEBUG" 44export DEBUG = "-DNDEBUG"
49export BUILD_VERBOSE = "1" 45export BUILD_VERBOSE = "1"
50export tagname = "CC" 46export tagname = "CC"
51 47
52EXTRA_OEMAKE = "DIST_ROOT='${D}'" 48EXTRA_OEMAKE = "DIST_ROOT='${D}'"
53 49
54do_configure () { 50do_configure() {
55 export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" 51 export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}"
56 # Prevent Makefile from calling configure without arguments, 52 # Prevent Makefile from calling configure without arguments,
57 # when do_configure gets called for a second time. 53 # when do_configure gets called for a second time.
58 rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure 54 rm -f ${B}/include/builddefs ${B}/configure
59 # Recreate configure script. 55 # Recreate configure script.
60 oe_runmake configure 56 oe_runmake configure
61 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} 57 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
@@ -64,12 +60,5 @@ do_configure () {
64} 60}
65 61
66do_install:append() { 62do_install:append() {
67 oe_runmake 'DESTDIR=${D}' install-dev 63 oe_runmake 'DESTDIR=${D}' install-dev
68 rm ${D}${libdir}/*.la
69 rmdir --ignore-fail-on-non-empty ${D}${libdir}
70
71 if [ ${libdir} != ${base_libdir} ];then
72 ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a
73 ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so
74 fi
75} 64}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-04-22 09:41:37 +0000