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.bb1
-rw-r--r--meta-filesystems/recipes-utils/binfs/bindfs_1.18.1.bb (renamed from meta-filesystems/recipes-utils/binfs/bindfs_1.17.7.bb)5
-rw-r--r--meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb1
-rw-r--r--meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb46
-rw-r--r--meta-filesystems/recipes-utils/e2tools/e2tools_git.bb75
-rw-r--r--meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.6.bb (renamed from meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.4.bb)2
-rw-r--r--meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch40
-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.bb1
-rw-r--r--meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb3
-rw-r--r--meta-filesystems/recipes-utils/nilfs-utils/nilfs-utils_v2.2.11.bb12
-rw-r--r--meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch38
-rw-r--r--meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch56
-rw-r--r--meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb28
-rw-r--r--meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb17
-rw-r--r--meta-filesystems/recipes-utils/udevil/files/Fix-build-with-gcc15.patch68
-rw-r--r--meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb1
-rw-r--r--meta-filesystems/recipes-utils/ufs-utils/ufs-utils_6.14.11.bb (renamed from meta-filesystems/recipes-utils/ufs-utils/ufs-utils_4.13.5.bb)3
-rw-r--r--meta-filesystems/recipes-utils/xfsdump/xfsdump_3.2.0.bb (renamed from meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.12.bb)2
-rw-r--r--meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb6
-rw-r--r--meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch33
-rw-r--r--meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch8
-rw-r--r--meta-filesystems/recipes-utils/xfstests/xfstests_2025.04.27.bb (renamed from meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb)21
23 files changed, 341 insertions, 128 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 4d2b909809..913b2c1d32 100644
--- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
+++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
@@ -21,7 +21,6 @@ UPSTREAM_CHECK_COMMITS = "1"
21 21
22PV = "4.9+git" 22PV = "4.9+git"
23 23
24S = "${WORKDIR}/git"
25 24
26export HOSTCC = "${BUILD_CC}" 25export HOSTCC = "${BUILD_CC}"
27do_configure:prepend() { 26do_configure:prepend() {
diff --git a/meta-filesystems/recipes-utils/binfs/bindfs_1.17.7.bb b/meta-filesystems/recipes-utils/binfs/bindfs_1.18.1.bb
index 788c85b7ce..abb7dceaa7 100644
--- a/meta-filesystems/recipes-utils/binfs/bindfs_1.17.7.bb
+++ b/meta-filesystems/recipes-utils/binfs/bindfs_1.18.1.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7DEPENDS = "fuse" 7DEPENDS = "fuse"
8RDEPENDS:${PN} = "fuse" 8RDEPENDS:${PN} = "fuse"
9 9
10SRC_URI = "git://github.com/mpartel/bindfs;protocol=https;branch=master" 10SRC_URI = "git://github.com/mpartel/bindfs;protocol=https;branch=master;tag=${PV}"
11SRCREV = "3f5e3cb1fcac5fb8034fa4712764317fab51ebe0" 11SRCREV = "70a663b3476c0b9b21b626473c00c68a3dc97b92"
12 12
13S = "${WORKDIR}/git"
14 13
15inherit autotools pkgconfig gettext 14inherit autotools pkgconfig gettext
diff --git a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb
index b4e5da6e20..645e38ca49 100644
--- a/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb
+++ b/meta-filesystems/recipes-utils/btrfsmaintenance/btrfsmaintenance_0.5.bb
@@ -20,7 +20,6 @@ UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)"
20 20
21RDEPENDS:${PN} = "bash btrfs-tools" 21RDEPENDS:${PN} = "bash btrfs-tools"
22 22
23S = "${WORKDIR}/git"
24 23
25do_configure[noexec] = "1" 24do_configure[noexec] = "1"
26do_compile[noexec] = "1" 25do_compile[noexec] = "1"
diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
new file mode 100644
index 0000000000..a60fbec821
--- /dev/null
+++ b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb
@@ -0,0 +1,46 @@
1SUMMARY = "Set of GPL'ed utilities to ext2/ext3 filesystem."
2DESCRIPTION = "e2tools is a simple set of GPL'ed utilities to read, write, \
3and manipulate files in an ext2/ext3 filesystem. These utilities access a \
4filesystem directly using the ext2fs library. Can also be used on a Linux \
5machine to read/write to disk images or floppies without having to mount \
6them or have root access."
7HOMEPAGE = "https://github.com/e2tools/e2tools"
8SECTION = "base"
9LICENSE = "GPL-2.0-only"
10LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
11
12DEPENDS += "coreutils e2fsprogs"
13
14SRC_URI = " \
15 git://github.com/e2tools/e2tools;protocol=https;branch=master \
16 file://run-ptest \
17"
18
19SRCREV = "46da6c398e70635a296245851fcedbc56c35e824"
20
21
22inherit autotools pkgconfig ptest
23
24# Otherwise these tools will be detected from build host and
25# assumptions will go wrong, Fun of cross compiling
26EXTRA_OECONF += "\
27 ac_cv_path_MKE2FS=${base_sbindir}/mke2fs \
28 ac_cv_path_CHMOD=${base_bindir}/chmod \
29 ac_cv_path_DD=${base_bindir}/dd \
30 ac_cv_path_GREP=${base_bindir}/grep \
31 "
32
33do_install_ptest() {
34 rm -rf "${D}${PTEST_PATH}/*"
35 cp -r ../build "${D}${PTEST_PATH}"
36 cp -r "${S}/build-aux" "${D}${PTEST_PATH}/build"
37 cp -r "${S}" "${D}${PTEST_PATH}"
38 rm -rf ${D}${PTEST_PATH}/build/config.log ${D}${PTEST_PATH}/build/autom4te.cache \
39 ${D}${PTEST_PATH}/git/.git ${D}${PTEST_PATH}/git/autom4te.cache
40 sed -i -e 's;${TMPDIR};;g' ${D}${PTEST_PATH}/build/config.status
41 sed -i -e 's;${STAGING_DIR_NATIVE};;g' ${D}${PTEST_PATH}/${BP}/autom4te.cache/*
42}
43
44RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl"
45
46BBCLASSEXTEND = "native"
diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb
deleted file mode 100644
index 1fa5e01874..0000000000
--- a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb
+++ /dev/null
@@ -1,75 +0,0 @@
1SUMMARY = "Set of GPL'ed utilities to ext2/ext3 filesystem."
2DESCRIPTION = "e2tools is a simple set of GPL'ed utilities to read, write, \
3and manipulate files in an ext2/ext3 filesystem. These utilities access a \
4filesystem directly using the ext2fs library. Can also be used on a Linux \
5machine to read/write to disk images or floppies without having to mount \
6them or have root access."
7HOMEPAGE = "https://github.com/e2tools/e2tools"
8SECTION = "base"
9LICENSE = "GPL-2.0-only"
10LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
11
12DEPENDS += "coreutils e2fsprogs"
13
14PV = "0.1.0+git"
15
16SRC_URI = " \
17 git://github.com/e2tools/e2tools;protocol=https;branch=master \
18 file://run-ptest \
19"
20
21SRCREV = "fd092754a6b65c3a769f74f888668c066f09c36d"
22
23S = "${WORKDIR}/git"
24
25inherit autotools pkgconfig ptest
26
27do_configure:prepend() {
28 git -C "${WORKDIR}/git" reset --hard HEAD
29
30 # To install ptest for this package, special configuration needs to be
31 # done before do_configure(). So, do_configure_ptest() which is scheduled
32 # after do_configure() cannot be used.
33
34 # We only do special configuration if we are installing ptest for this
35 # package.
36 if [ "${@d.getVar('PTEST_ENABLED')}" -eq "1" ]; then
37 # Since we guarantee run-time dependency when installing the ptest for
38 # this package, we do not need the check macros under section "checks
39 # for programs" in "configure.ac". Plus, these check macros set the
40 # ouput variables to incorrect values as these checks are performed on
41 # the host environment. Still, we need these variables outputted from
42 # these check macros. So, we insert the following lines to manually
43 # set these output variables to the correct value in "configure.ac".
44
45 # Note that HAVE_DD_COMMAND and HAVE_MKE2FS_COMMAND are only ever used
46 # in tests/Makefile-files which determines whether to include the test
47 # cases. As for output variables CHMOD, DD, and MKE2FS, they only
48 # point to the programs which test cases need to run. Since these
49 # commands are guaranteed to be present due to RDEPENDS and are
50 # guaranteed to be accessible under PATH environment variable on the
51 # target, we only need to specify the name of these programs.
52
53 perl -i -0777 -pe 's/(^dnl\s*=+\s*^dnl\s*Checks for compiler flags\s*^dnl\s*=+)/
54AC_SUBST([CHMOD], 'chmod')
55AC_SUBST([DD], 'dd')
56AC_SUBST([MKE2FS], 'mke2fs')
57AM_CONDITIONAL([HAVE_DD_COMMAND], [true])
58AM_CONDITIONAL([HAVE_MKE2FS_COMMAND], [true])
59\1/ms' "${WORKDIR}/git/configure.ac"
60 fi
61}
62
63do_install_ptest() {
64 rm -rf "${D}${PTEST_PATH}/*"
65 cp -r ../build "${D}${PTEST_PATH}"
66 cp -r "${S}/build-aux" "${D}${PTEST_PATH}/build"
67 cp -r "${S}" "${D}${PTEST_PATH}"
68 rm -rf ${D}${PTEST_PATH}/build/config.log ${D}${PTEST_PATH}/build/autom4te.cache \
69 ${D}${PTEST_PATH}/git/.git ${D}${PTEST_PATH}/git/autom4te.cache
70 sed -i -e 's;${RECIPE_SYSROOT};;g' ${D}${PTEST_PATH}/build/config.status
71}
72
73RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl"
74
75BBCLASSEXTEND = "native"
diff --git a/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.4.bb b/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.6.bb
index aa6a199784..39411b4cee 100644
--- a/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.4.bb
+++ b/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.6.bb
@@ -12,7 +12,7 @@ LICENSE = "GPL-2.0-only"
12LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 12LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
13 13
14SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" 14SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz"
15SRC_URI[sha256sum] = "ad38126dfd9f74f8c6ecb35ddfd34d2582601d6c3ff26756610b8418360c8ee2" 15SRC_URI[sha256sum] = "89d05b7a9537f2413079b724ec8d02d7a2e291c29c52e7256303e9456200fb0f"
16 16
17UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" 17UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
18UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" 18UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch
new file mode 100644
index 0000000000..4981c2151d
--- /dev/null
+++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch
@@ -0,0 +1,40 @@
1From 6617d15a660becc23825007ab3fc2d270b5b250f Mon Sep 17 00:00:00 2001
2From: Jaegeuk Kim <jaegeuk@kernel.org>
3Date: Thu, 24 Oct 2024 20:33:38 +0000
4Subject: [PATCH] f2fs-tools: use stdbool.h instead of bool
5
6The existing bool definition is broken for c23,i where bool is now a keyword.
7
8Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=6617d15a660becc23825007ab3fc2d270b5b250f]
9
10Signed-off-by: Elliott Hughes <enh@google.com>
11Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
12---
13 include/f2fs_fs.h | 4 +---
14 1 file changed, 1 insertion(+), 3 deletions(-)
15
16diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
17index 9534da9..0cb9228 100644
18--- a/include/f2fs_fs.h
19+++ b/include/f2fs_fs.h
20@@ -28,6 +28,7 @@
21 #include <stddef.h>
22 #include <string.h>
23 #include <time.h>
24+#include <stdbool.h>
25
26 #ifdef HAVE_CONFIG_H
27 #include <config.h>
28@@ -119,9 +120,6 @@ typedef uint16_t u16;
29 typedef uint8_t u8;
30 typedef u32 block_t;
31 typedef u32 nid_t;
32-#ifndef bool
33-typedef u8 bool;
34-#endif
35 typedef unsigned long pgoff_t;
36 typedef unsigned short umode_t;
37
38--
392.34.1
40
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 997fa1240a..68727b008e 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
@@ -9,11 +9,11 @@ DEPENDS = "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 \
12 file://0001-f2fs-tools-use-stdbool.h-instead-of-bool.patch \
12 file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \ 13 file://0002-f2fs_io-Define-_FILE_OFFSET_BITS-64.patch \
13 " 14 "
14UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" 15UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
15 16
16S = "${WORKDIR}/git"
17 17
18inherit pkgconfig autotools 18inherit pkgconfig autotools
19 19
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 214b3f914c..bdde0d311a 100644
--- a/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb
+++ b/meta-filesystems/recipes-utils/fatcat/fatcat_1.1.1.bb
@@ -15,6 +15,5 @@ SRC_URI = "git://github.com/Gregwar/fatcat.git;branch=master;protocol=https \
15 15
16SRCREV = "99cb99fc86eb1601ac7ae27f5bba23add04d2543" 16SRCREV = "99cb99fc86eb1601ac7ae27f5bba23add04d2543"
17 17
18S = "${WORKDIR}/git"
19 18
20inherit cmake 19inherit cmake
diff --git a/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb b/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb
index cf7ac62be8..7f90bfd666 100644
--- a/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb
+++ b/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb
@@ -1,6 +1,6 @@
1SUMMARY = "Resize FAT partitions using libparted" 1SUMMARY = "Resize FAT partitions using libparted"
2SECTION = "console/tools" 2SECTION = "console/tools"
3LICENSE = "GPL-2.0-only" 3LICENSE = "GPL-3.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
5 5
6SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https;branch=master \ 6SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https;branch=master \
@@ -9,7 +9,6 @@ SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https;branc
9 " 9 "
10SRCREV = "12da22087de2ec43f0fe5af1237389e94619c483" 10SRCREV = "12da22087de2ec43f0fe5af1237389e94619c483"
11 11
12S = "${WORKDIR}/git"
13 12
14DEPENDS = "parted" 13DEPENDS = "parted"
15 14
diff --git a/meta-filesystems/recipes-utils/nilfs-utils/nilfs-utils_v2.2.11.bb b/meta-filesystems/recipes-utils/nilfs-utils/nilfs-utils_v2.2.11.bb
new file mode 100644
index 0000000000..507684a395
--- /dev/null
+++ b/meta-filesystems/recipes-utils/nilfs-utils/nilfs-utils_v2.2.11.bb
@@ -0,0 +1,12 @@
1SUMMARY = "nilfs-utils is a set of utilities for managing the NILFS filesystem."
2HOMEPAGE = "https://nilfs.sourceforge.io/"
3
4LICENSE = "GPL-2.0-only & LGPL-2.1-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=385034ac639a62b8415db9814582ee98"
6SRC_URI = "git://github.com/nilfs-dev/nilfs-utils.git;protocol=https;branch=v2.2.y;tag=${PV}"
7
8SRCREV = "507064bb3604d0fd88f5e3f6422d9ade73a26120"
9
10DEPENDS = "util-linux util-linux-libuuid"
11
12inherit autotools
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch
new file mode 100644
index 0000000000..78802e39ab
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch
@@ -0,0 +1,38 @@
1From 2fa94fc7adf05fae46204f4665216c8b019010f3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 5 Jul 2024 23:16:38 -0700
4Subject: [PATCH 1/2] always use glibc basename()
5
6There is a use of basename() which expects it to be GNU version of
7basename, which is not available in other libcs e.g. musl on Linux
8therefore provide a version for such cases
9
10Upstream-Status: Submitted [https://github.com/kmxz/overlayfs-tools/pull/26]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 main.c | 12 ++++++++++++
14 1 file changed, 12 insertions(+)
15
16diff --git a/main.c b/main.c
17index 7b669eb..ea0f5a5 100644
18--- a/main.c
19+++ b/main.c
20@@ -30,6 +30,18 @@ bool brief;
21 bool ignore;
22 extern char *program_name;
23
24+#ifndef __GLIBC__
25+/*
26+ * GNU basename implementation
27+ */
28+static const char *__basename(const char *filename) {
29+ char *p = strrchr(filename, '/');
30+ return p ? p + 1 : filename;
31+}
32+
33+#define basename(x) __basename(x)
34+#endif
35+
36 void print_help(const char *program) {
37 printf("Usage: %s command options\n", program);
38 puts("");
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch
new file mode 100644
index 0000000000..845306292e
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch
@@ -0,0 +1,56 @@
1From be694ba90aa2e0fed3a4e9b53ad7a61efd0430c5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 5 Jul 2024 23:18:07 -0700
4Subject: [PATCH 2/2] Change program_name to have const attribute
5
6This is how it is used in all places and it also avoids a const to
7non-const conversion warning
8
9Upstream-Status: Submitted [https://github.com/kmxz/overlayfs-tools/pull/26]
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 common.c | 2 +-
14 fsck.c | 2 +-
15 main.c | 2 +-
16 3 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/common.c b/common.c
19index eaf24a8..a15b66f 100644
20--- a/common.c
21+++ b/common.c
22@@ -29,7 +29,7 @@
23 #include "common.h"
24 #include "config.h"
25
26-char *program_name;
27+const char *program_name;
28
29 /* #define DEBUG 1 */
30 #ifdef DEBUG
31diff --git a/fsck.c b/fsck.c
32index 4e513f5..285b9f1 100644
33--- a/fsck.c
34+++ b/fsck.c
35@@ -46,7 +46,7 @@
36 #include "mount.h"
37 #include "overlayfs.h"
38
39-extern char *program_name;
40+extern const char *program_name;
41
42 struct ovl_fs ofs = {};
43 int flags = 0; /* user input option flags */
44diff --git a/main.c b/main.c
45index ea0f5a5..1a8b239 100644
46--- a/main.c
47+++ b/main.c
48@@ -28,7 +28,7 @@
49 bool verbose;
50 bool brief;
51 bool ignore;
52-extern char *program_name;
53+extern const char *program_name;
54
55 #ifndef __GLIBC__
56 /*
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb
deleted file mode 100644
index 47613207af..0000000000
--- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1DESCRIPTION = "Maintenance tools for OverlayFS"
2HOMEPAGE = "https://github.com/kmxz/overlayfs-tools"
3LICENSE = "WTFPL"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69"
5
6SRC_URI = "\
7 git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \
8"
9
10PV = "1.0+git"
11SRCREV = "b5e5a829895ac98ccfe4629fbfbd8b819262bd00"
12
13S = "${WORKDIR}/git"
14B = "${S}"
15
16# Required to have the fts.h header for musl
17DEPENDS:append:libc-musl = " fts"
18
19EXTRA_OEMAKE += "'CC=${CC} -O2'"
20# Fix the missing fts libs when using musl
21EXTRA_OEMAKE:append:libc-musl = " LDLIBS=-lfts"
22TARGET_CC_ARCH += "${LDFLAGS}"
23
24do_install () {
25 install -d ${D}${bindir}
26 install -m 0755 ${B}/overlay ${D}${bindir}
27 install -m 0755 ${B}/fsck.overlay ${D}${bindir}
28}
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb
new file mode 100644
index 0000000000..708bbfcf02
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb
@@ -0,0 +1,17 @@
1DESCRIPTION = "Maintenance tools for OverlayFS"
2HOMEPAGE = "https://github.com/kmxz/overlayfs-tools"
3LICENSE = "WTFPL"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69"
5
6SRC_URI = "\
7 git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \
8 file://0001-always-use-glibc-basename.patch \
9 file://0002-Change-program_name-to-have-const-attribute.patch \
10"
11
12SRCREV = "7a4a0c4f2c6c86aa46a40e3468e394fd4a237491"
13
14
15inherit meson pkgconfig
16
17DEPENDS:append:libc-musl = " fts"
diff --git a/meta-filesystems/recipes-utils/udevil/files/Fix-build-with-gcc15.patch b/meta-filesystems/recipes-utils/udevil/files/Fix-build-with-gcc15.patch
new file mode 100644
index 0000000000..bad23327bf
--- /dev/null
+++ b/meta-filesystems/recipes-utils/udevil/files/Fix-build-with-gcc15.patch
@@ -0,0 +1,68 @@
1Fix build with gcc-15
2
3Fix the following errors:
4../../udevil-0.4.4/src/udevil.c: In function 'command_monitor':
5../../udevil-0.4.4/src/udevil.c:4891:21: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
6 4891 | signal(SIGTERM, command_monitor_finalize );
7 | ^~~~~~~~~~~~~~~~~~~~~~~~
8 | |
9 | void (*)(void)
10In file included from /home/worker/nano-ai/build-nano-ai/BUILD/work/qcs8550_aihub-webos-linux/udevil/0.4.4/recipe-sysroot/usr/include/sys/wait.h:36,
11 from ../../udevil-0.4.4/src/udevil.c:10:
12/home/worker/nano-ai/build-nano-ai/BUILD/work/qcs8550_aihub-webos-linux/udevil/0.4.4/recipe-sysroot/usr/include/signal.h:88:57: note: expected '__sighandler_t' {aka 'void (*)(int)'} but argument is of type 'void (*)(void)'
13 88 | extern __sighandler_t signal (int __sig, __sighandler_t __handler)
14 | ~~~~~~~~~~~~~~~^~~~~~~~~
15../../udevil-0.4.4/src/udevil.c:4798:6: note: 'command_monitor_finalize' declared here
16 4798 | void command_monitor_finalize()
17 | ^~~~~~~~~~~~~~~~~~~~~~~~
18/home/worker/nano-ai/build-nano-ai/BUILD/work/qcs8550_aihub-webos-linux/udevil/0.4.4/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
19 72 | typedef void (*__sighandler_t) (int);
20 | ^~~~~~~~~~~~~~
21...
22../../udevil-0.4.4/src/udevil.c: In function 'main':
23../../udevil-0.4.4/src/udevil.c:5035:22: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
24 5035 | signal( SIGTERM, command_interrupt );
25 | ^~~~~~~~~~~~~~~~~
26 | |
27 | void (*)(void)
28/home/worker/nano-ai/build-nano-ai/BUILD/work/qcs8550_aihub-webos-linux/udevil/0.4.4/recipe-sysroot/usr/include/signal.h:88:57: note: expected '__sighandler_t' {aka 'void (*)(int)'} but argument is of type 'void (*)(void)'
29 88 | extern __sighandler_t signal (int __sig, __sighandler_t __handler)
30 | ~~~~~~~~~~~~~~~^~~~~~~~~
31../../udevil-0.4.4/src/udevil.c:4916:6: note: 'command_interrupt' declared here
32 4916 | void command_interrupt()
33 | ^~~~~~~~~~~~~~~~~
34/home/worker/nano-ai/build-nano-ai/BUILD/work/qcs8550_aihub-webos-linux/udevil/0.4.4/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
35 72 | typedef void (*__sighandler_t) (int);
36 | ^~~~~~~~~~~~~~
37../../udevil-0.4.4/src/udevil.c:5036:22: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
38 5036 | signal( SIGINT, command_interrupt );
39 | ^~~~~~~~~~~~~~~~~
40 | |
41 | void (*)(void)
42
43Signed-off-by: Nguyen Dat Tho <tho3.nguyen@lge.com>
44
45Upstream-Status: Inactive-Upstream [lastrelease: 10years ago]
46---
47diff --git a/src/udevil.c b/src/udevil.c
48index bab80e9..da629d9 100644
49--- a/src/udevil.c
50+++ b/src/udevil.c
51@@ -4795,7 +4795,7 @@ static int command_info( CommandData* data )
52 return ret;
53 }
54
55-void command_monitor_finalize()
56+void command_monitor_finalize(int)
57 {
58 //if (signal == SIGINT || signal == SIGTERM)
59 //printf( "\nudevil: SIGINT || SIGTERM\n");
60@@ -4913,7 +4913,7 @@ finish_:
61 return 1;
62 }
63
64-void command_interrupt()
65+void command_interrupt(int)
66 {
67 if ( udev )
68 {
diff --git a/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb b/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
index 20d6036686..c745485a64 100644
--- a/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
+++ b/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
@@ -16,6 +16,7 @@ inherit autotools pkgconfig systemd
16SRC_URI = "https://github.com/IgnorantGuru/udevil/raw/pkg/${PV}/udevil-${PV}.tar.xz \ 16SRC_URI = "https://github.com/IgnorantGuru/udevil/raw/pkg/${PV}/udevil-${PV}.tar.xz \
17 file://0001-udevil-0.4.3-fix-compile-with-gcc6.patch \ 17 file://0001-udevil-0.4.3-fix-compile-with-gcc6.patch \
18 file://0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch \ 18 file://0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch \
19 file://Fix-build-with-gcc15.patch \
19" 20"
20 21
21SRC_URI[md5sum] = "dc1c489b603a0500a04dc7e1805ac1d9" 22SRC_URI[md5sum] = "dc1c489b603a0500a04dc7e1805ac1d9"
diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_4.13.5.bb b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_6.14.11.bb
index 7126684e61..a22e54e24c 100644
--- a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_4.13.5.bb
+++ b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_6.14.11.bb
@@ -4,14 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
4 4
5BRANCH ?= "dev" 5BRANCH ?= "dev"
6 6
7SRCREV = "18c0a8454ca1cf8969170049f8c628d88627beec" 7SRCREV = "5539a8ad8e1a9b7ea8b62213ed72eb939c5381b7"
8 8
9SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=https;branch=${BRANCH} \ 9SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=https;branch=${BRANCH} \
10 " 10 "
11 11
12UPSTREAM_CHECK_COMMITS = "1" 12UPSTREAM_CHECK_COMMITS = "1"
13 13
14S = "${WORKDIR}/git"
15 14
16EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" CFLAGS="${CFLAGS}"" 15EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" CFLAGS="${CFLAGS}""
17 16
diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.12.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.2.0.bb
index 9c0394918e..c65344f536 100644
--- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.12.bb
+++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.2.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \
15 file://0001-include-libgen.h-for-basename-API-prototype.patch \ 15 file://0001-include-libgen.h-for-basename-API-prototype.patch \
16 ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \ 16 ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \
17 " 17 "
18SRC_URI[sha256sum] = "f39c4c1b306b2dd7ec979c0e94d60fe69083d2ecf9af051cac5ef3bed772c74a" 18SRC_URI[sha256sum] = "2914dbbe1ebc88c7d93ad88e220aa57dabc43d216e11f06221c01edf3cc10732"
19 19
20inherit autotools-brokensep 20inherit autotools-brokensep
21 21
diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb
index 07c5e97dbb..907b875718 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb
+++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_6.6.0.bb
@@ -44,9 +44,9 @@ PACKAGECONFIG ??= "blkid"
44 44
45PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" 45PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux"
46 46
47export DEBUG="-DNDEBUG" 47export DEBUG = "-DNDEBUG"
48export BUILD_VERBOSE="1" 48export BUILD_VERBOSE = "1"
49export tagname="CC" 49export tagname = "CC"
50 50
51EXTRA_OEMAKE = "DIST_ROOT='${D}'" 51EXTRA_OEMAKE = "DIST_ROOT='${D}'"
52 52
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch
new file mode 100644
index 0000000000..6ac2dd92b4
--- /dev/null
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch
@@ -0,0 +1,33 @@
1From c3cc5c68a297a98adb9a7046c7563d0678245243 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Sun, 27 Apr 2025 20:29:09 +0200
4Subject: [PATCH] bstat: use uint32_t instead of __uint32_t to fix build with
5 musl
6
7* with musl this fails with:
8 http://errors.yoctoproject.org/Errors/Details/853041/
9
10bstat.c:65:33: error: unknown type name '__uint32_t'; did you mean 'uint32_t'?
11 65 | static inline int xfs_highbit32(__uint32_t v)
12 | ^~~~~~~~~~
13 | uint32_t
14
15Upstream-Status: Pending
16Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
17---
18 src/bstat.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/src/bstat.c b/src/bstat.c
22index 9a028a0d..a833af59 100644
23--- a/src/bstat.c
24+++ b/src/bstat.c
25@@ -62,7 +62,7 @@ static inline int fls(int x)
26 return r;
27 }
28
29-static inline int xfs_highbit32(__uint32_t v)
30+static inline int xfs_highbit32(uint32_t v)
31 {
32 return fls(v) - 1;
33 }
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch
index e823297343..9fdf69ff46 100644
--- a/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch
@@ -1,4 +1,4 @@
1From 79c4715a46b80653eb98b61731c094c85e969220 Mon Sep 17 00:00:00 2001 1From 340e708f79b824816aacfa74e330d8acdafc5129 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Aug 2022 13:33:05 -0700 3Date: Sun, 14 Aug 2022 13:33:05 -0700
4Subject: [PATCH] Drop detached_mounts_propagation and remove sys/mount.h from 4Subject: [PATCH] Drop detached_mounts_propagation and remove sys/mount.h from
@@ -17,15 +17,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/src/Makefile b/src/Makefile 19diff --git a/src/Makefile b/src/Makefile
20index e7442487..970f087a 100644 20index 6ac72b36..5472ba66 100644
21--- a/src/Makefile 21--- a/src/Makefile
22+++ b/src/Makefile 22+++ b/src/Makefile
23@@ -33,7 +33,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ 23@@ -34,7 +34,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \
24 dio-invalidate-cache stat_test t_encrypted_d_revalidate \ 24 dio-invalidate-cache stat_test t_encrypted_d_revalidate \
25 attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \ 25 attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \
26 fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \ 26 fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \
27- detached_mounts_propagation ext4_resize t_readdir_3 splice2pipe \ 27- detached_mounts_propagation ext4_resize t_readdir_3 splice2pipe \
28+ ext4_resize t_readdir_3 splice2pipe \ 28+ ext4_resize t_readdir_3 splice2pipe \
29 uuid_ioctl t_snapshot_deleted_subvolume 29 uuid_ioctl t_snapshot_deleted_subvolume fiemap-fault min_dio_alignment
30 30
31 EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \ 31 EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2025.04.27.bb
index 9e82b0f749..9e86b77c5e 100644
--- a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2025.04.27.bb
@@ -2,22 +2,22 @@ SUMMARY = "File system QA test suite"
2LICENSE = "GPL-2.0-only" 2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038" 3LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038"
4 4
5SRCREV = "088e5bd4cb6d7295612430a56ae84ff5c8f54730" 5SRCREV = "92c428db1fe3fa4f7bd2593788bc9b71403d59ae"
6SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" 6SRCREV_unionmount = "c6ab621ac19f2b96d34cd98f244e611750e2bb23"
7SRCREV_FORMAT = "default_unionmount" 7SRCREV_FORMAT = "default_unionmount"
8 8
9SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master \ 9SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master;tag=v${PV} \
10 git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ 10 git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \
11 file://0001-add-missing-FTW_-macros-when-not-available-in-libc.patch \ 11 file://0001-add-missing-FTW_-macros-when-not-available-in-libc.patch \
12 file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ 12 file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \
13 file://0001-include-libgen.h-for-basename-API-prototype.patch \ 13 file://0001-include-libgen.h-for-basename-API-prototype.patch \
14 file://0002-Add-missing-STATX_ATTR_-defines-from-musl-sys-stat.h.patch \ 14 file://0002-Add-missing-STATX_ATTR_-defines-from-musl-sys-stat.h.patch \
15 file://0001-bstat-use-uint32_t-instead-of-__uint32_t-to-fix-buil.patch \
15 " 16 "
16 17
17S = "${WORKDIR}/git"
18 18
19# brokensep because m4/package_globals.m4 calls ". ./VERSION" (and that's not the only issue) 19# brokensep because m4/package_globals.m4 calls ". ./VERSION" (and that's not the only issue)
20inherit autotools-brokensep useradd 20inherit autotools-brokensep useradd pkgconfig
21 21
22DEPENDS += "xfsprogs acl" 22DEPENDS += "xfsprogs acl"
23RDEPENDS:${PN} += "\ 23RDEPENDS:${PN} += "\
@@ -36,6 +36,11 @@ RDEPENDS:${PN} += "\
36 xfsprogs \ 36 xfsprogs \
37 acl \ 37 acl \
38 gawk \ 38 gawk \
39 util-linux-mkfs \
40 util-linux-mount \
41 util-linux-findmnt \
42 inetutils-hostname \
43 grep \
39" 44"
40 45
41USERADD_PACKAGES = "${PN}" 46USERADD_PACKAGES = "${PN}"
@@ -65,3 +70,9 @@ do_install() {
65} 70}
66 71
67FILES:${PN} += "${prefix}/xfstests" 72FILES:${PN} += "${prefix}/xfstests"
73
74# This one is reproducible only on 32bit MACHINEs
75# http://errors.yoctoproject.org/Errors/Details/766963/
76# lstat64.c:65:14: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types]
77# bstat.c:18:19: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
78CFLAGS += "-Wno-error=incompatible-pointer-types"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-01 20:23:11 +0000