5 files changed, 31 insertions, 6 deletions
diff --git a/meta-openembedded/meta-filesystems/README.md b/meta-openembedded/meta-filesystems/README.md
index 78a4429ce2..bf48806035 100644
--- a/meta-openembedded/meta-filesystems/README.md
+++ b/meta-openembedded/meta-filesystems/README.md
@@ -11,26 +11,26 @@ This layer depends on:
 
   URI: git://git.openembedded.org/openembedded-core
   layers: meta
-  branch: master
+  branch: scarthgap
 
   URI: git://git.openembedded.org/meta-openembedded
   layers: meta-oe
-  branch: master
+  branch: scarthgap
 
 Patches
 =======
 
 Please submit any patches against the filesystems layer to the
 OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org)
-with '[meta-filesystems]' in the subject.
+with '[meta-filesystems][scarthgap]' in the subject.
 
-Layer maintainer: Khem Raj <raj.khem@gmail.com>
+Layer maintainer: Armin Kuster <akuster808@gmail.com>
 
 When sending single patches, please use something like:
 
    git send-email -1 -M \
         --to openembedded-devel@lists.openembedded.org \
-        --subject-prefix='meta-filesystems][PATCH'
+        --subject-prefix='meta-filesystems][scarthgap][PATCH'
 
 
 Table of Contents
diff --git a/meta-openembedded/meta-filesystems/conf/include/non-repro-meta-filesystems.inc b/meta-openembedded/meta-filesystems/conf/include/non-repro-meta-filesystems.inc
new file mode 100644
index 0000000000..4975593277
--- /dev/null
+++ b/meta-openembedded/meta-filesystems/conf/include/non-repro-meta-filesystems.inc
@@ -0,0 +1,9 @@
+# List of known non-reproducible package of the meta-filesystems layer
+# Please keep this list sorted
+KNOWN_NON_REPRO_META_FILESYSTEMS = " \
+    e2tools-ptest \
+    xfsprogs-doc \
+    zfs \
+    zfs-dbg \
+    zfs-dev \
+"
diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3/fuse3.conf b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3/fuse3.conf
new file mode 100644
index 0000000000..a517c488f3
--- /dev/null
+++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3/fuse3.conf
@@ -0,0 +1 @@
+fuse
diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb
index 2b0797a6f5..b946b63ee4 100644
--- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb
+++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb
@@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = " \
 "
 
 SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz \
+           file://fuse3.conf \
 "
 SRC_URI[sha256sum] = "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87"
 
@@ -79,6 +80,20 @@ FILES:fuse3-utils = "${bindir} ${base_sbindir}"
 DEBIAN_NOAUTONAME:fuse3-utils = "1"
 DEBIAN_NOAUTONAME:${PN}-dbg = "1"
 
+SYSTEMD_SERVICE:${PN} = ""
+
 do_install:append() {
     rm -rf ${D}${base_prefix}/dev
+
+    # systemd class remove the sysv_initddir only if systemd_system_unitdir
+    # contains anything, but it's not needed if sysvinit is not in DISTRO_FEATURES
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then
+        rm -rf ${D}${sysconfdir}/init.d/
+    fi
+
+    # Install systemd related configuration file
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/modules-load.d
+        install -m 0644 ${WORKDIR}/fuse3.conf ${D}${sysconfdir}/modules-load.d
+    fi
 }
diff --git a/meta-openembedded/meta-filesystems/recipes-utils/binfs/bindfs_1.17.6.bb b/meta-openembedded/meta-filesystems/recipes-utils/binfs/bindfs_1.17.7.bb
index 673198e2dd..788c85b7ce 100644
--- a/meta-openembedded/meta-filesystems/recipes-utils/binfs/bindfs_1.17.6.bb
+++ b/meta-openembedded/meta-filesystems/recipes-utils/binfs/bindfs_1.17.7.bb
@@ -8,7 +8,7 @@ DEPENDS = "fuse"
 RDEPENDS:${PN} = "fuse"
 
 SRC_URI = "git://github.com/mpartel/bindfs;protocol=https;branch=master"
-SRCREV = "b982aee1161307cdd0e90f7f9597b11872440efc"
+SRCREV = "3f5e3cb1fcac5fb8034fa4712764317fab51ebe0"
 
 S = "${WORKDIR}/git"