From 986fd73afbd8dcae03c141203eae0c51089c6b08 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 18 Nov 2025 17:08:46 +0800 Subject: sshfs-fuse: upgrade 3.7.3 -> 3.7.5 03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch a1d58ae1be99571a88b8439b027abe6349b74658.patch removed since they're included in 3.7.5 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch | 34 ---------------------- .../a1d58ae1be99571a88b8439b027abe6349b74658.patch | 31 -------------------- .../sshfs-fuse/sshfs-fuse_3.7.3.bb | 32 -------------------- .../sshfs-fuse/sshfs-fuse_3.7.5.bb | 29 ++++++++++++++++++ 4 files changed, 29 insertions(+), 97 deletions(-) delete mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch delete mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch delete mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb create mode 100644 meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.5.bb diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch deleted file mode 100644 index 63cdc57b44..0000000000 --- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 03ee1f8aa0899268ec02b2f54849352df92a3a1d Mon Sep 17 00:00:00 2001 -From: Gabriel Staples -Date: Tue, 22 Dec 2020 23:33:55 -0800 -Subject: [PATCH] pytest.ini: fix test warning - -Warning: - -``` -test/util.py:99 - sshfs/build/test/util.py:99: PytestUnknownMarkWarning: Unknown pytest.mark.uses_fuse - is this a typo? - You can register custom marks to avoid this warning - for details, see https://docs.pytest.org/en/stable/mark.html - return pytest.mark.uses_fuse() -``` - -References for the fix: - -1. https://stackoverflow.com/questions/60806473/pytestunknownmarkwarning-unknown-pytest-mark-xxx-is-this-a-typo/60813297#60813297 -1. https://docs.pytest.org/en/stable/mark.html - -Upstream-Status: Submitted [https://github.com/libfuse/sshfs/pull/238] -Signed-off-by: Khem Raj ---- - test/pytest.ini | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/test/pytest.ini b/test/pytest.ini -index 95161546..7a7efed4 100644 ---- a/test/pytest.ini -+++ b/test/pytest.ini -@@ -1,2 +1,4 @@ - [pytest] - addopts = --verbose --assert=rewrite --tb=native -x -r a -+markers = -+ uses_fuse diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch deleted file mode 100644 index e76dbd5059..0000000000 --- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a1d58ae1be99571a88b8439b027abe6349b74658 Mon Sep 17 00:00:00 2001 -From: Gabriel Staples -Date: Tue, 22 Dec 2020 23:26:40 -0800 -Subject: [PATCH] Fix deprecated warning in conftest.py - -``` -test/conftest.py:66 - sshfs/build/test/conftest.py:66: PytestDeprecationWarning: @pytest.yield_fixture is deprecated. - Use @pytest.fixture instead; they are the same. - @pytest.yield_fixture(autouse=True) -``` - -Upstream-Status: Submitted [https://github.com/libfuse/sshfs/pull/238] -Signed-off-by: Khem Raj ---- - test/conftest.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/conftest.py b/test/conftest.py -index 70cd0c62..d58d45b2 100644 ---- a/test/conftest.py -+++ b/test/conftest.py -@@ -63,7 +63,7 @@ def register_output(self, pattern, count=1, flags=re.MULTILINE): - # relies on tests running sequential (i.e., don't dare to use e.g. the xdist - # plugin) - current_capfd = None --@pytest.yield_fixture(autouse=True) -+@pytest.fixture(autouse=True) - def save_cap_fixtures(request, capfd): - global current_capfd - capfd.false_positives = [] diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb deleted file mode 100644 index c3a00566ab..0000000000 --- a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE" -HOMEPAGE = "https://github.com/libfuse/sshfs" -SECTION = "console/network" -LICENSE = "GPL-2.0-only" -DEPENDS = "glib-2.0 fuse3" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/libfuse/sshfs;branch=master;protocol=https \ - file://03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch \ - file://a1d58ae1be99571a88b8439b027abe6349b74658.patch \ -" -SRCREV = "c91eb9a9a992f1a36c49a8e6f1146e45b5e1c8e7" - -inherit meson pkgconfig ptest - -SRC_URI += " \ - file://run-ptest \ -" -#python3-compile for filecmp module -RDEPENDS:${PN}-ptest += " \ - python3-compile \ - python3-pytest \ - python3-unittest-automake-output \ - bash \ - fuse \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test - cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ - ln -sf ${bindir}/sshfs ${D}${PTEST_PATH}/sshfs -} diff --git a/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.5.bb b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.5.bb new file mode 100644 index 0000000000..ba27bc6312 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.5.bb @@ -0,0 +1,29 @@ +SUMMARY = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE" +HOMEPAGE = "https://github.com/libfuse/sshfs" +SECTION = "console/network" +LICENSE = "GPL-2.0-only" +DEPENDS = "glib-2.0 fuse3" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/libfuse/sshfs;branch=master;protocol=https;tag=sshfs-${PV}" +SRCREV = "9e35c39ba83f54a49a9df4bf0a629f26c60cc38c" + +inherit meson pkgconfig ptest + +SRC_URI += " \ + file://run-ptest \ +" +#python3-compile for filecmp module +RDEPENDS:${PN}-ptest += " \ + python3-compile \ + python3-pytest \ + python3-unittest-automake-output \ + bash \ + fuse \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ + ln -sf ${bindir}/sshfs ${D}${PTEST_PATH}/sshfs +} -- cgit v1.2.3-54-g00ecf