From patchwork Wed Jan 13 18:20:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3800 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DGG5Q64BGz3whw for ; Wed, 13 Jan 2021 18:22:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DGG5P0C1Dz3By; Wed, 13 Jan 2021 18:22:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DGG5N5kJjz2xh3; Wed, 13 Jan 2021 18:22:48 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DGG5M6yYJz2xSn for ; Wed, 13 Jan 2021 18:22:47 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4DGG5M5Fsfz2Zk; Wed, 13 Jan 2021 18:22:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1610562167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ahnDgDoQi+6zjzc0Gk9qjpD1WeN+sOkgOPdBGTZsOy4=; b=9KP2+OR2gGpNtquR60dJJAGujiP5nu+WZZiIt/ZtgLxouyHTuIpjw5bGpmuY/8OtKYLkTF 9wd+psHiCQJFcWBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1610562167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ahnDgDoQi+6zjzc0Gk9qjpD1WeN+sOkgOPdBGTZsOy4=; b=LEbT4ubc5sEam5yNnqKcqg8j0X+zuPxGNfII9CnM/Q//5z9r9k/sc2BVdhrN/ICzJBxY+Y GSWcK4ZyyJsYsDzUBU5L18slDjcns1IcYV0aUurmGc8wyt+TglIwctg9uNrVeX2YcL7WOY 9WfLl61dwH14anpPUGB1brw24I66qfKIZPkf1gG2Co1SUpqdM4Qd7Wpwj4uBo27qp+pjGA x2zYn7+Inuu53hX65YxE761bU+D7fcSTU7UiwhdIotxO5/T832ByUuK1ZcgULaBnGaOwNV 6OcCBBZxHYQ6gdi9pGdl/r7SJRMgyxkBPFTwhQMnOHY8Q8siJCuK1k95p3lbKg== From: Adolf Belka 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 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adolf Belka Errors-To: development-bounces@lists.ipfire.org Sender: "Development" From: Adolf Belka - 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 --- 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) From patchwork Wed Jan 13 18:22:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3801 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DGG5t25CMz3whw for ; Wed, 13 Jan 2021 18:23:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DGG5t0Hr4z43C; Wed, 13 Jan 2021 18:23:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DGG5s6cwFz2xkX; Wed, 13 Jan 2021 18:23:13 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DGG5r70nyz2xSn for ; Wed, 13 Jan 2021 18:23:12 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4DGG5r5gngz2Zk; Wed, 13 Jan 2021 18:23:12 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1610562192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hUlwbN58zmDNJEXiSej3w14yzvvZniFSnZm/KOlMzr0=; b=Qtv5CE0eVQv7ObPAwi/o91KyvDFBgPKSKxH5XWQtUQ42lQTBImoNyaEzkqtRM57WyH6+/r 8wuVf2PpWS3yvoBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1610562192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hUlwbN58zmDNJEXiSej3w14yzvvZniFSnZm/KOlMzr0=; b=wuJAbNAzoa29tEtm4jyizz8tXXODx2dwvW/7JY1yKQ01LzklZJCaPfSVmUwcxMoYlGHANh Uq/Oz7liYN00mMUlL/XxdPWbEMrbcsPCT/rExZ7d7zLUOznyPbXWLtQDtLJjmKnShl26Sy rEQQag2R1HRrECGIcuHrsibHM1MsNhGdSAY9B2+yEDw/J56x9SFBaAi+Mbmu+l8DhEKdrm M+59fdzatdcOlM4rScWsRvcYfHgt3zIr8SlGG3SPmLoIhnkLqpK6sn5jLKqRtJxIbYe7nQ JjM51xWu7ksB7K/fm+VgEbtWR/IhbP+rUsveAwgWkFHJnuQVVXaTeLe3G5L0cw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 4/5] samba: add fuse as dependency Date: Wed, 13 Jan 2021 19:22:58 +0100 Message-Id: <20210113182258.3082-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adolf Belka Errors-To: development-bounces@lists.ipfire.org Sender: "Development" From: Adolf Belka - fuse added as dependency as it has been moved from core to addon - No change to rootfiles Signed-off-by: Adolf Belka --- lfs/samba | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/samba b/lfs/samba index f57a04737..8734cadce 100644 --- a/lfs/samba +++ b/lfs/samba @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 75 +PAK_VER = 76 -DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp +DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp fuse ############################################################################### # Top-level Rules