From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 1/2] sshfs: Update to 3.7.1
Date: Wed, 06 Jan 2021 15:22:39 +0000
Message-ID: <B3BE08C0-DBFF-4F61-99DE-D779140FB51E@ipfire.org>
In-Reply-To: <20210105142057.5067-1-ahb.ipfire@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4067774206402368803=="
List-Id: <development.lists.ipfire.org>

--===============4067774206402368803==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

> On 5 Jan 2021, at 14:20, Adolf Belka <ahb.ipfire(a)gmail.com> wrote:
>=20
> - 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
>=20
> Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com>
> ---
> config/rootfiles/common/sshfs |  2 ++
> lfs/sshfs                     | 14 ++++++--------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>=20
> 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 @@
>=20
> include Config
>=20
> -VER        =3D 2.2
> +VER        =3D 3.7.1
>=20
> -THISAPP    =3D sshfs-fuse-$(VER)
> -DL_FILE    =3D $(THISAPP).tar.gz
> +THISAPP    =3D sshfs-$(VER)
> +DL_FILE    =3D $(THISAPP).tar.xz
> DL_FROM    =3D $(URL_IPFIRE)
> DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
> TARGET =3D $(DIR_INFO)/$(THISAPP)
> @@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
>=20
> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
>=20
> -$(DL_FILE)_MD5 =3D 26e9206eb5169e87e6f95f54bc005a4f
> +$(DL_FILE)_MD5 =3D 22ac23d05ca7c56fb568627f086374d0
>=20
> install : $(TARGET)
>=20
> @@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) :
>=20
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	@$(PREBUILD)
> -	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && ./configure --prefix=3D/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=3D/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)
> --=20
> 2.30.0
>=20


--===============4067774206402368803==--