From: Adolf Belka ahb.ipfire@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@gmail.com --- config/rootfiles/{common => packages}/sshfs | 0 lfs/sshfs | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) rename config/rootfiles/{common => 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 = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = sshfs +PAK_VER = 1 + +DEPS = fuse
############################################################################### # 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=/usr builddir && cd builddir && ninja && ninja install + cd $(DIR_APP) && meson --prefix=/usr builddir/ + cd $(DIR_APP) && ninja -C builddir/ + cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD)
Hi All,
I have noticed that the last two patches of this series that I sent have the series marked as untitled. I suspect this is a consequence of my change of email address in the development mailing list during the sending of these patches.
Should I resent the last two patches with the "Signed by" line updated to my current email address or should I resend the whole series again with the updated "Signed by" line or should I leave things as they are.
Thanks for your advice and sorry for the mess-up.
Adolf.
On 13/01/2021 19:20, Adolf Belka wrote:
From: Adolf Belka ahb.ipfire@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@gmail.com
config/rootfiles/{common => packages}/sshfs | 0 lfs/sshfs | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) rename config/rootfiles/{common => 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 = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = sshfs +PAK_VER = 1
+DEPS = fuse
############################################################################### # 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=/usr builddir && cd builddir && ninja && ninja install
- cd $(DIR_APP) && meson --prefix=/usr builddir/
- cd $(DIR_APP) && ninja -C builddir/
- cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD)
-
Adolf Belka