From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/5] sshfs: Convert from core to addon
Date: Wed, 13 Jan 2021 19:20:40 +0100
Message-ID: <20210113182040.2974-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0644575971646514103=="
List-Id: <development.lists.ipfire.org>

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

From: Adolf Belka <ahb.ipfire(a)gmail.com>

- Convert the sshfs package from core to addon
- Modify lfs to include package version number
- Move the rootfile from common to packages
- No change to rootfile
- Split meson/ninja build statements into individual steps
- fuse added as dependency as it has been moved from core to addon

Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com>
---
 config/rootfiles/{common =3D> packages}/sshfs | 0
 lfs/sshfs                                   | 8 +++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 rename config/rootfiles/{common =3D> packages}/sshfs (100%)

diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/packages/sshfs
similarity index 100%
rename from config/rootfiles/common/sshfs
rename to config/rootfiles/packages/sshfs
diff --git a/lfs/sshfs b/lfs/sshfs
index 1e7706194..efb8d7537 100644
--- a/lfs/sshfs
+++ b/lfs/sshfs
@@ -31,6 +31,10 @@ DL_FILE    =3D $(THISAPP).tar.xz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET =3D $(DIR_INFO)/$(THISAPP)
+PROG       =3D sshfs
+PAK_VER    =3D 1
+
+DEPS       =3D fuse
=20
 ############################################################################=
###
 # Top-level Rules
@@ -73,6 +77,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@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
+	cd $(DIR_APP) && meson --prefix=3D/usr builddir/
+	cd $(DIR_APP) && ninja -C builddir/
+	cd $(DIR_APP) && ninja -C builddir/ install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--=20
2.30.0


--===============0644575971646514103==--