diff --git a/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk b/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk index c1f1a2ae21..9113c61691 100644 --- a/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="sshfs" -PKG_VERSION="2.10" -PKG_SHA256="70845dde2d70606aa207db5edfe878e266f9c193f1956dd10ba1b7e9a3c8d101" +PKG_VERSION="3.7.3" +PKG_SHA256="5218ce7bdd2ce0a34137a0d7798e0f6d09f0e6d21b1e98ee730a18b0699c2e99" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libfuse/sshfs" -PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-${PKG_VERSION}/sshfs-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain fuse glib" +PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-${PKG_VERSION}/sshfs-${PKG_VERSION}.tar.xz" +PKG_DEPENDS_TARGET="toolchain fuse3 glib" PKG_LONGDESC="A filesystem client based on the SSH File Transfer Protocol." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/tools/network-tools/changelog.txt b/packages/addons/tools/network-tools/changelog.txt index 8236b82a0e..467a6fb5b4 100644 --- a/packages/addons/tools/network-tools/changelog.txt +++ b/packages/addons/tools/network-tools/changelog.txt @@ -1,3 +1,7 @@ +118 +- sshfs: update to 3.7.3 +- include fuse and fuse3 + 117 - iperf: update to 3.12 - nmap: update to 7.93 diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk index 7da5ea9e69..618a0d8731 100644 --- a/packages/addons/tools/network-tools/package.mk +++ b/packages/addons/tools/network-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="network-tools" PKG_VERSION="1.0" -PKG_REV="117" +PKG_REV="118" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" @@ -35,10 +35,20 @@ PKG_DEPENDS_TARGET="toolchain \ wireless_tools" addon() { - mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib} # bwm-ng cp -P $(get_install_dir bwm-ng)/usr/bin/bwm-ng ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + # fuse + cp -P $(get_install_dir fuse)/usr/bin/{fusermount,ulockmgr_server} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir fuse)/usr/sbin/mount.fuse ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir fuse)/usr/lib/{libfuse.so*,libulockmgr.so*} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + + # fuse3 + cp -P $(get_install_dir fuse3)/usr/bin/fusermount3 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir fuse3)/usr/sbin/mount.fuse3 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir fuse3)/usr/lib/libfuse3.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + # iftop cp -P $(get_install_dir iftop)/usr/sbin/iftop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin diff --git a/packages/addons/tools/system-tools/changelog.txt b/packages/addons/tools/system-tools/changelog.txt index d0c7838ef9..6eeecb1ec3 100644 --- a/packages/addons/tools/system-tools/changelog.txt +++ b/packages/addons/tools/system-tools/changelog.txt @@ -1,3 +1,6 @@ +133 +- include fuse + 132 - vim: update to 9.0.0453 diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index dea5b7ad86..c1f4c6044c 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="system-tools" PKG_VERSION="1.0" -PKG_REV="132" +PKG_REV="133" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" @@ -92,6 +92,11 @@ addon() { cp -P $(get_install_dir file)/usr/bin/file ${ADDON_BUILD}/${PKG_ADDON_ID}/bin cp -P $(get_install_dir file)/usr/share/misc/magic.mgc ${ADDON_BUILD}/${PKG_ADDON_ID}/data + # fuse + cp -P $(get_install_dir fuse)/usr/bin/{fusermount,ulockmgr_server} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir fuse)/usr/sbin/mount.fuse ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir fuse)/usr/lib/{libfuse.so*,libulockmgr.so*} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + # getscancodes cp -P $(get_install_dir getscancodes)/usr/bin/getscancodes ${ADDON_BUILD}/${PKG_ADDON_ID}/bin diff --git a/packages/sysutils/fuse3/package.mk b/packages/sysutils/fuse3/package.mk new file mode 100644 index 0000000000..9659a45f55 --- /dev/null +++ b/packages/sysutils/fuse3/package.mk @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="fuse3" +PKG_VERSION="3.11.0" +PKG_SHA256="8982c4c521daf3974dda8a5d55d575c988da13a571970f00aea149eb54fdf14c" +PKG_LICENSE="GPL" +PKG_SITE="https://github.com/libfuse/libfuse/" +PKG_URL="https://github.com/libfuse/libfuse/releases/download/fuse-${PKG_VERSION}/fuse-${PKG_VERSION}.tar.xz" +PKG_DEPENDS_TARGET="toolchain systemd" +PKG_LONGDESC="FUSE is an interface for userspace programs to export a filesystem to the Linux kernel." + +PKG_MESON_OPTS_TARGET="-Ddisable-mtab=false \ + -Dutils=true \ + -Dexamples=false \ + -Duseroot=false \ + -Dtests=false" + +post_makeinstall_target() { + rm -rf ${INSTALL}/etc + rm -rf ${INSTALL}/usr/lib/udev +} diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk index 6cc4e34d5c..7cba20175b 100644 --- a/packages/sysutils/open-vm-tools/package.mk +++ b/packages/sysutils/open-vm-tools/package.mk @@ -10,7 +10,7 @@ PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/vmware/open-vm-tools" PKG_URL="https://github.com/vmware/open-vm-tools/archive/stable-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain fuse glib:host glib libdnet libtirpc" +PKG_DEPENDS_TARGET="toolchain fuse3 glib:host glib libdnet libtirpc" PKG_LONGDESC="open-vm-tools: open source implementation of VMware Tools" PKG_TOOLCHAIN="autotools" @@ -26,6 +26,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-docs \ --without-xerces \ --without-icu \ --without-kernel-modules \ + --with-fuse=fuse3 \ --with-udev-rules-dir=/usr/lib/udev/rules.d/ \ --with-sysroot=${SYSROOT_PREFIX}"