| Message ID | 20240424080953.2461900-1-changqing.li@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [master,scarthgap,meta-filesystems] fuse3: remove sysv init script and install fuse kernel module explictly | expand |
On Wed, Apr 24, 2024 at 10:09 AM Changqing Li via lists.openembedded.org < changqing.li=eng.windriver.com@lists.openembedded.org> wrote: > From: Changqing Li <changqing.li@windriver.com> > > For systemd, there is not a fuse.service since systemd provides > sys-fs-fuse-connections.mount to mount the fuse control filesystem, so > instead, only fuse.conf is added to modules-load.d to load the required > fuse kernel module. > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > --- > .../recipes-support/fuse/fuse3_3.16.2.bb | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb > b/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb > index 2b0797a6f..8c5c51360 100644 > --- a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb > +++ b/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb > @@ -28,6 +28,7 @@ inherit meson pkgconfig ptest > > SRC_URI += " \ > file://run-ptest \ > + file://fuse.conf \ Who provides this file ? I don’t see it as part of patch > > " > > RDEPENDS:${PN}-ptest += " \ > @@ -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}/fuse.conf > ${D}${sysconfdir}/modules-load.d > + fi > } > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#110121): > https://lists.openembedded.org/g/openembedded-devel/message/110121 > Mute This Topic: https://lists.openembedded.org/mt/105706495/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
On 4/24/24 22:59, Khem Raj wrote: > ** > *CAUTION: This email comes from a non Wind River email account!* > Do not click links or open attachments unless you recognize the sender > and know the content is safe. > > > On Wed, Apr 24, 2024 at 10:09 AM Changqing Li via > lists.openembedded.org > <https://urldefense.com/v3/__http://lists.openembedded.org__;!!AjveYdw8EvQ!aSee_7-ICSMQYIbOvW2JOzFIlLuJvdJNndae-DCyAUG4F8K4bVPfZESt9NY3Wxw_Fbzji7i_whkywcFNl8Lch7ilmQ$> > <changqing.li > <https://urldefense.com/v3/__http://changqing.li__;!!AjveYdw8EvQ!aSee_7-ICSMQYIbOvW2JOzFIlLuJvdJNndae-DCyAUG4F8K4bVPfZESt9NY3Wxw_Fbzji7i_whkywcFNl8IR2yqQFQ$>=eng.windriver.com@lists.openembedded.org> > wrote: > > From: Changqing Li <changqing.li@windriver.com> > > For systemd, there is not a fuse.service since systemd provides > sys-fs-fuse-connections.mount to mount the fuse control filesystem, so > instead, only fuse.conf is added to modules-load.d to load the > required > fuse kernel module. > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > --- > .../recipes-support/fuse/fuse3_3.16.2.bb > <https://urldefense.com/v3/__http://fuse3_3.16.2.bb__;!!AjveYdw8EvQ!aSee_7-ICSMQYIbOvW2JOzFIlLuJvdJNndae-DCyAUG4F8K4bVPfZESt9NY3Wxw_Fbzji7i_whkywcFNl8K4AuVerw$> > | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb > <https://urldefense.com/v3/__http://fuse3_3.16.2.bb__;!!AjveYdw8EvQ!aSee_7-ICSMQYIbOvW2JOzFIlLuJvdJNndae-DCyAUG4F8K4bVPfZESt9NY3Wxw_Fbzji7i_whkywcFNl8K4AuVerw$> > b/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb > <https://urldefense.com/v3/__http://fuse3_3.16.2.bb__;!!AjveYdw8EvQ!aSee_7-ICSMQYIbOvW2JOzFIlLuJvdJNndae-DCyAUG4F8K4bVPfZESt9NY3Wxw_Fbzji7i_whkywcFNl8K4AuVerw$> > index 2b0797a6f..8c5c51360 100644 > --- a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb > <https://urldefense.com/v3/__http://fuse3_3.16.2.bb__;!!AjveYdw8EvQ!aSee_7-ICSMQYIbOvW2JOzFIlLuJvdJNndae-DCyAUG4F8K4bVPfZESt9NY3Wxw_Fbzji7i_whkywcFNl8K4AuVerw$> > +++ b/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb > <https://urldefense.com/v3/__http://fuse3_3.16.2.bb__;!!AjveYdw8EvQ!aSee_7-ICSMQYIbOvW2JOzFIlLuJvdJNndae-DCyAUG4F8K4bVPfZESt9NY3Wxw_Fbzji7i_whkywcFNl8K4AuVerw$> > @@ -28,6 +28,7 @@ inherit meson pkgconfig ptest > > SRC_URI += " \ > file://run-ptest \ > + file://fuse.conf \ > > > Who provides this file ? I don’t see it as part of patch There is already a fuse.conf under files, it is used by fuse_2.9.9.bb. https://git.openembedded.org/meta-openembedded/tree/meta-filesystems/recipes-support/fuse/files/ Regards changqing > > " > > RDEPENDS:${PN}-ptest += " \ > @@ -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}/fuse.conf > ${D}${sysconfdir}/modules-load.d > + fi > } > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#110121): > https://lists.openembedded.org/g/openembedded-devel/message/110121 > <https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-devel/message/110121__;!!AjveYdw8EvQ!aSee_7-ICSMQYIbOvW2JOzFIlLuJvdJNndae-DCyAUG4F8K4bVPfZESt9NY3Wxw_Fbzji7i_whkywcFNl8IjKKEj_w$> > Mute This Topic: > https://lists.openembedded.org/mt/105706495/1997914 > <https://urldefense.com/v3/__https://lists.openembedded.org/mt/105706495/1997914__;!!AjveYdw8EvQ!aSee_7-ICSMQYIbOvW2JOzFIlLuJvdJNndae-DCyAUG4F8K4bVPfZESt9NY3Wxw_Fbzji7i_whkywcFNl8JO5CC2Fw$> > Group Owner: openembedded-devel+owner@lists.openembedded.org > <mailto:openembedded-devel%2Bowner@lists.openembedded.org> > Unsubscribe: > https://lists.openembedded.org/g/openembedded-devel/unsub > <https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-devel/unsub__;!!AjveYdw8EvQ!aSee_7-ICSMQYIbOvW2JOzFIlLuJvdJNndae-DCyAUG4F8K4bVPfZESt9NY3Wxw_Fbzji7i_whkywcFNl8LCNsyZIw$> > [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb b/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb index 2b0797a6f..8c5c51360 100644 --- a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb +++ b/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb @@ -28,6 +28,7 @@ inherit meson pkgconfig ptest SRC_URI += " \ file://run-ptest \ + file://fuse.conf \ " RDEPENDS:${PN}-ptest += " \ @@ -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}/fuse.conf ${D}${sysconfdir}/modules-load.d + fi }