- Update sshfs from 2.2 to 3.7.1 - Changelog is available at https://github.com/libfuse/sshfs/releases - Build had to be changed from autotools to meson/ninja - Change in rootfiles
Signed-off-by: Adolf Belka ahb.ipfire@gmail.com --- config/rootfiles/common/sshfs | 2 ++ lfs/sshfs | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@
include Config
-VER = 2.2 +VER = 3.7.1
-THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0
install : $(TARGET)
@@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install @rm -rf $(DIR_APP) @$(POSTBUILD)
Dear all,
Forgot to mention in the logs that I have also installed the built IPFire with new fuse and sshfs into my testbed system and was able to setup an sshfs mount from a remote computer into the IPFire system, so confirmed working.
The only thing I had to do was run modprobe fuse as the fuse module was not loaded. Is that normal to need to do or did I miss something when I was building sshfs/fuse
Regards, Adolf.
On 05/01/2021 15:20, Adolf Belka wrote:
- Update sshfs from 2.2 to 3.7.1
- Changelog is available at https://github.com/libfuse/sshfs/releases
- Build had to be changed from autotools to meson/ninja
- Change in rootfiles
Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
config/rootfiles/common/sshfs | 2 ++ lfs/sshfs | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@
include Config
-VER = 2.2 +VER = 3.7.1
-THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0
install : $(TARGET)
@@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install @rm -rf $(DIR_APP) @$(POSTBUILD)
Hi,
On 5 Jan 2021, at 14:28, Adolf Belka ahb.ipfire@gmail.com wrote:
Dear all,
Forgot to mention in the logs that I have also installed the built IPFire with new fuse and sshfs into my testbed system and was able to setup an sshfs mount from a remote computer into the IPFire system, so confirmed working.
The only thing I had to do was run modprobe fuse as the fuse module was not loaded. Is that normal to need to do or did I miss something when I was building sshfs/fuse
I would expect that sshfs is doing that automatically.
Regards, Adolf.
On 05/01/2021 15:20, Adolf Belka wrote:
- Update sshfs from 2.2 to 3.7.1
- Changelog is available at https://github.com/libfuse/sshfs/releases
- Build had to be changed from autotools to meson/ninja
- Change in rootfiles
Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
config/rootfiles/common/sshfs | 2 ++ lfs/sshfs | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@ include Config -VER = 2.2 +VER = 3.7.1 -THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 install : $(TARGET) @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install @rm -rf $(DIR_APP) @$(POSTBUILD)
Hi,
On 06/01/2021 16:30, Michael Tremer wrote:
Hi,
On 5 Jan 2021, at 14:28, Adolf Belka ahb.ipfire@gmail.com wrote:
Dear all,
Forgot to mention in the logs that I have also installed the built IPFire with new fuse and sshfs into my testbed system and was able to setup an sshfs mount from a remote computer into the IPFire system, so confirmed working.
The only thing I had to do was run modprobe fuse as the fuse module was not loaded. Is that normal to need to do or did I miss something when I was building sshfs/fuse
I would expect that sshfs is doing that automatically.
Then there may be a problem. When I ran the sshfs command I got a message that it could not find fuse and it suggested that I should run modprobe fuse, which I did, and then the same sshfs command worked.
Not sure how to find out why sshfs did not have the modprobe command run automatically or how to make it do so.
Regards, Adolf.
On 05/01/2021 15:20, Adolf Belka wrote:
- Update sshfs from 2.2 to 3.7.1
- Changelog is available at https://github.com/libfuse/sshfs/releases
- Build had to be changed from autotools to meson/ninja
- Change in rootfiles
Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
config/rootfiles/common/sshfs | 2 ++ lfs/sshfs | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@ include Config -VER = 2.2 +VER = 3.7.1 -THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 install : $(TARGET) @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install @rm -rf $(DIR_APP) @$(POSTBUILD)
Hi Michael,
I suddenly thought I should also check the old version on Core 153, so I did that and the same thing happens. The fuse module is not loaded automatically when sshfs command is run, but the error message is very helpful.
"fuse: device not found, try 'modprobe fuse' first"
So the new sshfs version operates the same as the old one, so I am no longer so worried about this.
Regards,
Adolf
On 06/01/2021 19:39, Adolf Belka wrote:
Hi,
On 06/01/2021 16:30, Michael Tremer wrote:
Hi,
On 5 Jan 2021, at 14:28, Adolf Belka ahb.ipfire@gmail.com wrote:
Dear all,
Forgot to mention in the logs that I have also installed the built IPFire with new fuse and sshfs into my testbed system and was able to setup an sshfs mount from a remote computer into the IPFire system, so confirmed working.
The only thing I had to do was run modprobe fuse as the fuse module was not loaded. Is that normal to need to do or did I miss something when I was building sshfs/fuse
I would expect that sshfs is doing that automatically.
Then there may be a problem. When I ran the sshfs command I got a message that it could not find fuse and it suggested that I should run modprobe fuse, which I did, and then the same sshfs command worked.
Not sure how to find out why sshfs did not have the modprobe command run automatically or how to make it do so.
Regards, Adolf.
On 05/01/2021 15:20, Adolf Belka wrote:
- Update sshfs from 2.2 to 3.7.1
- Changelog is available at https://github.com/libfuse/sshfs/releases
- Build had to be changed from autotools to meson/ninja
- Change in rootfiles
Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
config/rootfiles/common/sshfs | 2 ++ lfs/sshfs | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@ include Config -VER = 2.2 +VER = 3.7.1 -THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 install : $(TARGET) @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install @rm -rf $(DIR_APP) @$(POSTBUILD)
Hi,
In the Git repository of fuse, there is an initscript that loads the kernel module when the system boots:
https://github.com/libfuse/libfuse/blob/f54eb86e9a0b596dfeceb18277efa8f840d8...
Maybe we want to integrate this.
-Michael
On 6 Jan 2021, at 19:21, Adolf Belka ahb.ipfire@gmail.com wrote:
Hi Michael,
I suddenly thought I should also check the old version on Core 153, so I did that and the same thing happens. The fuse module is not loaded automatically when sshfs command is run, but the error message is very helpful.
"fuse: device not found, try 'modprobe fuse' first"
So the new sshfs version operates the same as the old one, so I am no longer so worried about this.
Regards,
Adolf
On 06/01/2021 19:39, Adolf Belka wrote:
Hi,
On 06/01/2021 16:30, Michael Tremer wrote:
Hi,
On 5 Jan 2021, at 14:28, Adolf Belka ahb.ipfire@gmail.com wrote:
Dear all,
Forgot to mention in the logs that I have also installed the built IPFire with new fuse and sshfs into my testbed system and was able to setup an sshfs mount from a remote computer into the IPFire system, so confirmed working.
The only thing I had to do was run modprobe fuse as the fuse module was not loaded. Is that normal to need to do or did I miss something when I was building sshfs/fuse
I would expect that sshfs is doing that automatically.
Then there may be a problem. When I ran the sshfs command I got a message that it could not find fuse and it suggested that I should run modprobe fuse, which I did, and then the same sshfs command worked.
Not sure how to find out why sshfs did not have the modprobe command run automatically or how to make it do so.
Regards, Adolf.
On 05/01/2021 15:20, Adolf Belka wrote:
- Update sshfs from 2.2 to 3.7.1
- Changelog is available at https://github.com/libfuse/sshfs/releases
- Build had to be changed from autotools to meson/ninja
- Change in rootfiles
Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
config/rootfiles/common/sshfs | 2 ++ lfs/sshfs | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@ include Config -VER = 2.2 +VER = 3.7.1 -THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 install : $(TARGET) @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install @rm -rf $(DIR_APP) @$(POSTBUILD)
Hi Michael,
On 07/01/2021 12:25, Michael Tremer wrote:
Hi,
In the Git repository of fuse, there is an initscript that loads the kernel module when the system boots:
https://github.com/libfuse/libfuse/blob/f54eb86e9a0b596dfeceb18277efa8f840d8...
Maybe we want to integrate this.
That could be an option but the downside would be that the fuse module would then be enabled for all IPFire users, even if they are not using fuse. I think if people aren't using fuse on a firewall it is probably better to not load it automatically.
As there have been no questions on IPFire Community about fuse not being loaded or any problems with sshfs then either no one is using sshfs and fuse or they have been able to figure it out.
My preference would be to leave it as it is. I was going to say that I could update the wiki to mention about the need to run modprobe fuse but I found that sshfs is not mentioned anywhere in the wiki (at least the search came back with zero results).
Having found out about sshfs on IPFire, I will likely use it from time to time.
Regards, Adolf
-Michael
On 6 Jan 2021, at 19:21, Adolf Belka ahb.ipfire@gmail.com wrote:
Hi Michael,
I suddenly thought I should also check the old version on Core 153, so I did that and the same thing happens. The fuse module is not loaded automatically when sshfs command is run, but the error message is very helpful.
"fuse: device not found, try 'modprobe fuse' first"
So the new sshfs version operates the same as the old one, so I am no longer so worried about this.
Regards,
Adolf
On 06/01/2021 19:39, Adolf Belka wrote:
Hi,
On 06/01/2021 16:30, Michael Tremer wrote:
Hi,
On 5 Jan 2021, at 14:28, Adolf Belka ahb.ipfire@gmail.com wrote:
Dear all,
Forgot to mention in the logs that I have also installed the built IPFire with new fuse and sshfs into my testbed system and was able to setup an sshfs mount from a remote computer into the IPFire system, so confirmed working.
The only thing I had to do was run modprobe fuse as the fuse module was not loaded. Is that normal to need to do or did I miss something when I was building sshfs/fuse
I would expect that sshfs is doing that automatically.
Then there may be a problem. When I ran the sshfs command I got a message that it could not find fuse and it suggested that I should run modprobe fuse, which I did, and then the same sshfs command worked.
Not sure how to find out why sshfs did not have the modprobe command run automatically or how to make it do so.
Regards, Adolf.
On 05/01/2021 15:20, Adolf Belka wrote:
- Update sshfs from 2.2 to 3.7.1
- Changelog is available at https://github.com/libfuse/sshfs/releases
- Build had to be changed from autotools to meson/ninja
- Change in rootfiles
Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
config/rootfiles/common/sshfs | 2 ++ lfs/sshfs | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@ include Config -VER = 2.2 +VER = 3.7.1 -THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 install : $(TARGET) @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install @rm -rf $(DIR_APP) @$(POSTBUILD)
Hello,
On 7 Jan 2021, at 13:34, Adolf Belka ahb.ipfire@gmail.com wrote:
Hi Michael,
On 07/01/2021 12:25, Michael Tremer wrote:
Hi, In the Git repository of fuse, there is an initscript that loads the kernel module when the system boots: https://github.com/libfuse/libfuse/blob/f54eb86e9a0b596dfeceb18277efa8f840d8... Maybe we want to integrate this.
That could be an option but the downside would be that the fuse module would then be enabled for all IPFire users, even if they are not using fuse. I think if people aren't using fuse on a firewall it is probably better to not load it automatically.
Yes, I would agree. I assumed fuse was a package. Maybe it should be one.
As there have been no questions on IPFire Community about fuse not being loaded or any problems with sshfs then either no one is using sshfs and fuse or they have been able to figure it out.
My preference would be to leave it as it is. I was going to say that I could update the wiki to mention about the need to run modprobe fuse but I found that sshfs is not mentioned anywhere in the wiki (at least the search came back with zero results).
Having found out about sshfs on IPFire, I will likely use it from time to time.
It is quite a nice tool :)
Regards, Adolf
-Michael
On 6 Jan 2021, at 19:21, Adolf Belka ahb.ipfire@gmail.com wrote:
Hi Michael,
I suddenly thought I should also check the old version on Core 153, so I did that and the same thing happens. The fuse module is not loaded automatically when sshfs command is run, but the error message is very helpful.
"fuse: device not found, try 'modprobe fuse' first"
So the new sshfs version operates the same as the old one, so I am no longer so worried about this.
Regards,
Adolf
On 06/01/2021 19:39, Adolf Belka wrote:
Hi,
On 06/01/2021 16:30, Michael Tremer wrote:
Hi,
On 5 Jan 2021, at 14:28, Adolf Belka ahb.ipfire@gmail.com wrote:
Dear all,
Forgot to mention in the logs that I have also installed the built IPFire with new fuse and sshfs into my testbed system and was able to setup an sshfs mount from a remote computer into the IPFire system, so confirmed working.
The only thing I had to do was run modprobe fuse as the fuse module was not loaded. Is that normal to need to do or did I miss something when I was building sshfs/fuse
I would expect that sshfs is doing that automatically.
Then there may be a problem. When I ran the sshfs command I got a message that it could not find fuse and it suggested that I should run modprobe fuse, which I did, and then the same sshfs command worked.
Not sure how to find out why sshfs did not have the modprobe command run automatically or how to make it do so.
Regards, Adolf.
On 05/01/2021 15:20, Adolf Belka wrote: > - Update sshfs from 2.2 to 3.7.1 > - Changelog is available at https://github.com/libfuse/sshfs/releases > - Build had to be changed from autotools to meson/ninja > - Change in rootfiles > Signed-off-by: Adolf Belka ahb.ipfire@gmail.com > --- > config/rootfiles/common/sshfs | 2 ++ > lfs/sshfs | 14 ++++++-------- > 2 files changed, 8 insertions(+), 8 deletions(-) > diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs > index 2cafa3e24..579b938f5 100644 > --- a/config/rootfiles/common/sshfs > +++ b/config/rootfiles/common/sshfs > @@ -1,2 +1,4 @@ > usr/bin/sshfs > +#usr/sbin/mount.fuse.sshfs > +#usr/sbin/mount.sshfs > #usr/share/man/man1/sshfs.1 > diff --git a/lfs/sshfs b/lfs/sshfs > index 23fbd18ca..1e7706194 100644 > --- a/lfs/sshfs > +++ b/lfs/sshfs > @@ -24,10 +24,10 @@ > include Config > -VER = 2.2 > +VER = 3.7.1 > -THISAPP = sshfs-fuse-$(VER) > -DL_FILE = $(THISAPP).tar.gz > +THISAPP = sshfs-$(VER) > +DL_FILE = $(THISAPP).tar.xz > DL_FROM = $(URL_IPFIRE) > DIR_APP = $(DIR_SRC)/$(THISAPP) > TARGET = $(DIR_INFO)/$(THISAPP) > @@ -40,7 +40,7 @@ objects = $(DL_FILE) > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f > +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 > install : $(TARGET) > @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > @$(PREBUILD) > - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) > - cd $(DIR_APP) && ./configure --prefix=/usr > - cd $(DIR_APP) && make $(MAKETUNING) > - cd $(DIR_APP) && make install > + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) > + cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install > @rm -rf $(DIR_APP) > @$(POSTBUILD)
Hi,
On 07/01/2021 14:53, Michael Tremer wrote:
Hello,
On 7 Jan 2021, at 13:34, Adolf Belka ahb.ipfire@gmail.com wrote:
Hi Michael,
On 07/01/2021 12:25, Michael Tremer wrote:
Hi, In the Git repository of fuse, there is an initscript that loads the kernel module when the system boots: https://github.com/libfuse/libfuse/blob/f54eb86e9a0b596dfeceb18277efa8f840d8... Maybe we want to integrate this.
That could be an option but the downside would be that the fuse module would then be enabled for all IPFire users, even if they are not using fuse. I think if people aren't using fuse on a firewall it is probably better to not load it automatically.
Yes, I would agree. I assumed fuse was a package. Maybe it should be one.
So I have had a look at this and it seems like both sshfs and fuse could be converted to addons. Fuse is only mentioned on three other addons, samba, openvmtools and borgbackup and not for any core programs.
Fuse would need to be added as a dependency to those addons. By having that dependency does it mean that any systems with one of those addons already installed will automatically have the fuse addon installed as part of the core update or will I need a separate script to check for that.
Should I look at doing this change now or wait till after the next core update has been released.
Regards,
Adolf
As there have been no questions on IPFire Community about fuse not being loaded or any problems with sshfs then either no one is using sshfs and fuse or they have been able to figure it out.
My preference would be to leave it as it is. I was going to say that I could update the wiki to mention about the need to run modprobe fuse but I found that sshfs is not mentioned anywhere in the wiki (at least the search came back with zero results).
Having found out about sshfs on IPFire, I will likely use it from time to time.
It is quite a nice tool :)
Regards, Adolf
-Michael
On 6 Jan 2021, at 19:21, Adolf Belka ahb.ipfire@gmail.com wrote:
Hi Michael,
I suddenly thought I should also check the old version on Core 153, so I did that and the same thing happens. The fuse module is not loaded automatically when sshfs command is run, but the error message is very helpful.
"fuse: device not found, try 'modprobe fuse' first"
So the new sshfs version operates the same as the old one, so I am no longer so worried about this.
Regards,
Adolf
On 06/01/2021 19:39, Adolf Belka wrote:
Hi,
On 06/01/2021 16:30, Michael Tremer wrote:
Hi,
> On 5 Jan 2021, at 14:28, Adolf Belka ahb.ipfire@gmail.com wrote: > > Dear all, > > Forgot to mention in the logs that I have also installed the built IPFire with new fuse and sshfs into my testbed system and was able to setup an sshfs mount from a remote computer into the IPFire system, so confirmed working. > > The only thing I had to do was run modprobe fuse as the fuse module was not loaded. Is that normal to need to do or did I miss something when I was building sshfs/fuse I would expect that sshfs is doing that automatically.
Then there may be a problem. When I ran the sshfs command I got a message that it could not find fuse and it suggested that I should run modprobe fuse, which I did, and then the same sshfs command worked.
Not sure how to find out why sshfs did not have the modprobe command run automatically or how to make it do so.
> Regards, > Adolf. > > On 05/01/2021 15:20, Adolf Belka wrote: >> - Update sshfs from 2.2 to 3.7.1 >> - Changelog is available at https://github.com/libfuse/sshfs/releases >> - Build had to be changed from autotools to meson/ninja >> - Change in rootfiles >> Signed-off-by: Adolf Belka ahb.ipfire@gmail.com >> --- >> config/rootfiles/common/sshfs | 2 ++ >> lfs/sshfs | 14 ++++++-------- >> 2 files changed, 8 insertions(+), 8 deletions(-) >> diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs >> index 2cafa3e24..579b938f5 100644 >> --- a/config/rootfiles/common/sshfs >> +++ b/config/rootfiles/common/sshfs >> @@ -1,2 +1,4 @@ >> usr/bin/sshfs >> +#usr/sbin/mount.fuse.sshfs >> +#usr/sbin/mount.sshfs >> #usr/share/man/man1/sshfs.1 >> diff --git a/lfs/sshfs b/lfs/sshfs >> index 23fbd18ca..1e7706194 100644 >> --- a/lfs/sshfs >> +++ b/lfs/sshfs >> @@ -24,10 +24,10 @@ >> include Config >> -VER = 2.2 >> +VER = 3.7.1 >> -THISAPP = sshfs-fuse-$(VER) >> -DL_FILE = $(THISAPP).tar.gz >> +THISAPP = sshfs-$(VER) >> +DL_FILE = $(THISAPP).tar.xz >> DL_FROM = $(URL_IPFIRE) >> DIR_APP = $(DIR_SRC)/$(THISAPP) >> TARGET = $(DIR_INFO)/$(THISAPP) >> @@ -40,7 +40,7 @@ objects = $(DL_FILE) >> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f >> +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 >> install : $(TARGET) >> @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : >> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> @$(PREBUILD) >> - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >> - cd $(DIR_APP) && ./configure --prefix=/usr >> - cd $(DIR_APP) && make $(MAKETUNING) >> - cd $(DIR_APP) && make install >> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) >> + cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install >> @rm -rf $(DIR_APP) >> @$(POSTBUILD)
Hi,
On 9 Jan 2021, at 14:55, Adolf Belka (ipfire) ahb.ipfire@gmail.com wrote:
Hi,
On 07/01/2021 14:53, Michael Tremer wrote:
Hello,
On 7 Jan 2021, at 13:34, Adolf Belka ahb.ipfire@gmail.com wrote:
Hi Michael,
On 07/01/2021 12:25, Michael Tremer wrote:
Hi, In the Git repository of fuse, there is an initscript that loads the kernel module when the system boots: https://github.com/libfuse/libfuse/blob/f54eb86e9a0b596dfeceb18277efa8f840d8... Maybe we want to integrate this.
That could be an option but the downside would be that the fuse module would then be enabled for all IPFire users, even if they are not using fuse. I think if people aren't using fuse on a firewall it is probably better to not load it automatically.
Yes, I would agree. I assumed fuse was a package. Maybe it should be one.
So I have had a look at this and it seems like both sshfs and fuse could be converted to addons. Fuse is only mentioned on three other addons, samba, openvmtools and borgbackup and not for any core programs.
I do not understand precisely why those add-ons need fuse. Any ideas?
Fuse would need to be added as a dependency to those addons. By having that dependency does it mean that any systems with one of those addons already installed will automatically have the fuse addon installed as part of the core update or will I need a separate script to check for that.
Should I look at doing this change now or wait till after the next core update has been released.
I think we can start working on this now. I do not see any reason to wait.
-Michael
Regards,
Adolf
As there have been no questions on IPFire Community about fuse not being loaded or any problems with sshfs then either no one is using sshfs and fuse or they have been able to figure it out.
My preference would be to leave it as it is. I was going to say that I could update the wiki to mention about the need to run modprobe fuse but I found that sshfs is not mentioned anywhere in the wiki (at least the search came back with zero results).
Having found out about sshfs on IPFire, I will likely use it from time to time.
It is quite a nice tool :)
Regards, Adolf
-Michael
On 6 Jan 2021, at 19:21, Adolf Belka ahb.ipfire@gmail.com wrote:
Hi Michael,
I suddenly thought I should also check the old version on Core 153, so I did that and the same thing happens. The fuse module is not loaded automatically when sshfs command is run, but the error message is very helpful.
"fuse: device not found, try 'modprobe fuse' first"
So the new sshfs version operates the same as the old one, so I am no longer so worried about this.
Regards,
Adolf
On 06/01/2021 19:39, Adolf Belka wrote:
Hi,
On 06/01/2021 16:30, Michael Tremer wrote: > Hi, > >> On 5 Jan 2021, at 14:28, Adolf Belka ahb.ipfire@gmail.com wrote: >> >> Dear all, >> >> Forgot to mention in the logs that I have also installed the built IPFire with new fuse and sshfs into my testbed system and was able to setup an sshfs mount from a remote computer into the IPFire system, so confirmed working. >> >> The only thing I had to do was run modprobe fuse as the fuse module was not loaded. Is that normal to need to do or did I miss something when I was building sshfs/fuse > I would expect that sshfs is doing that automatically. Then there may be a problem. When I ran the sshfs command I got a message that it could not find fuse and it suggested that I should run modprobe fuse, which I did, and then the same sshfs command worked.
Not sure how to find out why sshfs did not have the modprobe command run automatically or how to make it do so.
>> Regards, >> Adolf. >> >> On 05/01/2021 15:20, Adolf Belka wrote: >>> - Update sshfs from 2.2 to 3.7.1 >>> - Changelog is available at https://github.com/libfuse/sshfs/releases >>> - Build had to be changed from autotools to meson/ninja >>> - Change in rootfiles >>> Signed-off-by: Adolf Belka ahb.ipfire@gmail.com >>> --- >>> config/rootfiles/common/sshfs | 2 ++ >>> lfs/sshfs | 14 ++++++-------- >>> 2 files changed, 8 insertions(+), 8 deletions(-) >>> diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs >>> index 2cafa3e24..579b938f5 100644 >>> --- a/config/rootfiles/common/sshfs >>> +++ b/config/rootfiles/common/sshfs >>> @@ -1,2 +1,4 @@ >>> usr/bin/sshfs >>> +#usr/sbin/mount.fuse.sshfs >>> +#usr/sbin/mount.sshfs >>> #usr/share/man/man1/sshfs.1 >>> diff --git a/lfs/sshfs b/lfs/sshfs >>> index 23fbd18ca..1e7706194 100644 >>> --- a/lfs/sshfs >>> +++ b/lfs/sshfs >>> @@ -24,10 +24,10 @@ >>> include Config >>> -VER = 2.2 >>> +VER = 3.7.1 >>> -THISAPP = sshfs-fuse-$(VER) >>> -DL_FILE = $(THISAPP).tar.gz >>> +THISAPP = sshfs-$(VER) >>> +DL_FILE = $(THISAPP).tar.xz >>> DL_FROM = $(URL_IPFIRE) >>> DIR_APP = $(DIR_SRC)/$(THISAPP) >>> TARGET = $(DIR_INFO)/$(THISAPP) >>> @@ -40,7 +40,7 @@ objects = $(DL_FILE) >>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>> -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f >>> +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 >>> install : $(TARGET) >>> @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : >>> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>> @$(PREBUILD) >>> - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >>> - cd $(DIR_APP) && ./configure --prefix=/usr >>> - cd $(DIR_APP) && make $(MAKETUNING) >>> - cd $(DIR_APP) && make install >>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) >>> + cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install >>> @rm -rf $(DIR_APP) >>> @$(POSTBUILD)
Hi Michael,
On 09/01/2021 15:58, Michael Tremer wrote:
Hi,
On 9 Jan 2021, at 14:55, Adolf Belka (ipfire) ahb.ipfire@gmail.com wrote:
Hi,
On 07/01/2021 14:53, Michael Tremer wrote:
Hello,
On 7 Jan 2021, at 13:34, Adolf Belka ahb.ipfire@gmail.com wrote:
Hi Michael,
On 07/01/2021 12:25, Michael Tremer wrote:
Hi, In the Git repository of fuse, there is an initscript that loads the kernel module when the system boots: https://github.com/libfuse/libfuse/blob/f54eb86e9a0b596dfeceb18277efa8f840d8... Maybe we want to integrate this.
That could be an option but the downside would be that the fuse module would then be enabled for all IPFire users, even if they are not using fuse. I think if people aren't using fuse on a firewall it is probably better to not load it automatically.
Yes, I would agree. I assumed fuse was a package. Maybe it should be one.
So I have had a look at this and it seems like both sshfs and fuse could be converted to addons. Fuse is only mentioned on three other addons, samba, openvmtools and borgbackup and not for any core programs.
I do not understand precisely why those add-ons need fuse. Any ideas?
Each of the addons rootfiles have the word fuse in at least one line that is not commented out. I had a quick look at the borgbackup website and it looks like you can have the possibility to backup to a fuse mounted filesystem. Similar with samba that you can have a fuse based system defined in some way. I am not sure about openvmtools.
Fuse would need to be added as a dependency to those addons. By having that dependency does it mean that any systems with one of those addons already installed will automatically have the fuse addon installed as part of the core update or will I need a separate script to check for that.
Should I look at doing this change now or wait till after the next core update has been released.
I think we can start working on this now. I do not see any reason to wait.
Will do so.
Regards,
Adolf.
-Michael
Regards,
Adolf
As there have been no questions on IPFire Community about fuse not being loaded or any problems with sshfs then either no one is using sshfs and fuse or they have been able to figure it out.
My preference would be to leave it as it is. I was going to say that I could update the wiki to mention about the need to run modprobe fuse but I found that sshfs is not mentioned anywhere in the wiki (at least the search came back with zero results).
Having found out about sshfs on IPFire, I will likely use it from time to time.
It is quite a nice tool :)
Regards, Adolf
-Michael
On 6 Jan 2021, at 19:21, Adolf Belka ahb.ipfire@gmail.com wrote:
Hi Michael,
I suddenly thought I should also check the old version on Core 153, so I did that and the same thing happens. The fuse module is not loaded automatically when sshfs command is run, but the error message is very helpful.
"fuse: device not found, try 'modprobe fuse' first"
So the new sshfs version operates the same as the old one, so I am no longer so worried about this.
Regards,
Adolf
On 06/01/2021 19:39, Adolf Belka wrote: > Hi, > > > On 06/01/2021 16:30, Michael Tremer wrote: >> Hi, >> >>> On 5 Jan 2021, at 14:28, Adolf Belka ahb.ipfire@gmail.com wrote: >>> >>> Dear all, >>> >>> Forgot to mention in the logs that I have also installed the built IPFire with new fuse and sshfs into my testbed system and was able to setup an sshfs mount from a remote computer into the IPFire system, so confirmed working. >>> >>> The only thing I had to do was run modprobe fuse as the fuse module was not loaded. Is that normal to need to do or did I miss something when I was building sshfs/fuse >> I would expect that sshfs is doing that automatically. > Then there may be a problem. When I ran the sshfs command I got a message that it could not find fuse and it suggested that I should run modprobe fuse, which I did, and then the same sshfs command worked. > > Not sure how to find out why sshfs did not have the modprobe command run automatically or how to make it do so. > >>> Regards, >>> Adolf. >>> >>> On 05/01/2021 15:20, Adolf Belka wrote: >>>> - Update sshfs from 2.2 to 3.7.1 >>>> - Changelog is available at https://github.com/libfuse/sshfs/releases >>>> - Build had to be changed from autotools to meson/ninja >>>> - Change in rootfiles >>>> Signed-off-by: Adolf Belka ahb.ipfire@gmail.com >>>> --- >>>> config/rootfiles/common/sshfs | 2 ++ >>>> lfs/sshfs | 14 ++++++-------- >>>> 2 files changed, 8 insertions(+), 8 deletions(-) >>>> diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs >>>> index 2cafa3e24..579b938f5 100644 >>>> --- a/config/rootfiles/common/sshfs >>>> +++ b/config/rootfiles/common/sshfs >>>> @@ -1,2 +1,4 @@ >>>> usr/bin/sshfs >>>> +#usr/sbin/mount.fuse.sshfs >>>> +#usr/sbin/mount.sshfs >>>> #usr/share/man/man1/sshfs.1 >>>> diff --git a/lfs/sshfs b/lfs/sshfs >>>> index 23fbd18ca..1e7706194 100644 >>>> --- a/lfs/sshfs >>>> +++ b/lfs/sshfs >>>> @@ -24,10 +24,10 @@ >>>> include Config >>>> -VER = 2.2 >>>> +VER = 3.7.1 >>>> -THISAPP = sshfs-fuse-$(VER) >>>> -DL_FILE = $(THISAPP).tar.gz >>>> +THISAPP = sshfs-$(VER) >>>> +DL_FILE = $(THISAPP).tar.xz >>>> DL_FROM = $(URL_IPFIRE) >>>> DIR_APP = $(DIR_SRC)/$(THISAPP) >>>> TARGET = $(DIR_INFO)/$(THISAPP) >>>> @@ -40,7 +40,7 @@ objects = $(DL_FILE) >>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>>> -$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f >>>> +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0 >>>> install : $(TARGET) >>>> @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) : >>>> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>>> @$(PREBUILD) >>>> - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >>>> - cd $(DIR_APP) && ./configure --prefix=/usr >>>> - cd $(DIR_APP) && make $(MAKETUNING) >>>> - cd $(DIR_APP) && make install >>>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) >>>> + cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install >>>> @rm -rf $(DIR_APP) >>>> @$(POSTBUILD)
Hi,
On 5 Jan 2021, at 14:20, Adolf Belka ahb.ipfire@gmail.com wrote:
- Update sshfs from 2.2 to 3.7.1
- Changelog is available at https://github.com/libfuse/sshfs/releases
- Build had to be changed from autotools to meson/ninja
- Change in rootfiles
Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
config/rootfiles/common/sshfs | 2 ++ lfs/sshfs | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@
include Config
-VER = 2.2 +VER = 3.7.1
-THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0
install : $(TARGET)
@@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install
You could have written those into separate lines instead of all in one. That would have been slightly easier to read and change.
@rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.30.0
Hi,
On 06/01/2021 16:22, Michael Tremer wrote:
Hi,
On 5 Jan 2021, at 14:20, Adolf Belka ahb.ipfire@gmail.com wrote:
- Update sshfs from 2.2 to 3.7.1
- Changelog is available at https://github.com/libfuse/sshfs/releases
- Build had to be changed from autotools to meson/ninja
- Change in rootfiles
Signed-off-by: Adolf Belka ahb.ipfire@gmail.com
config/rootfiles/common/sshfs | 2 ++ lfs/sshfs | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs index 2cafa3e24..579b938f5 100644 --- a/config/rootfiles/common/sshfs +++ b/config/rootfiles/common/sshfs @@ -1,2 +1,4 @@ usr/bin/sshfs +#usr/sbin/mount.fuse.sshfs +#usr/sbin/mount.sshfs #usr/share/man/man1/sshfs.1 diff --git a/lfs/sshfs b/lfs/sshfs index 23fbd18ca..1e7706194 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -24,10 +24,10 @@
include Config
-VER = 2.2 +VER = 3.7.1
-THISAPP = sshfs-fuse-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = sshfs-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f +$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0
install : $(TARGET)
@@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install
You could have written those into separate lines instead of all in one. That would have been slightly easier to read and change.
That makes sense to do it like that. Should I redo this patch as a v2.
When I split the parts onto different lines do I need to prefix each line with the cd $(DIR_APP) like the old .configure, make, make install sequence had.
@rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.30.0
-
Adolf Belka -
Adolf Belka (ipfire)
-
Michael Tremer