From patchwork Fri Nov 19 17:44:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4845 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 ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Hwkb61Ssvz3wsg for ; Fri, 19 Nov 2021 17:45:22 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Hwkb20q34z2f6; Fri, 19 Nov 2021 17:45:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Hwkb168jNz30HK; Fri, 19 Nov 2021 17:45:17 +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 ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Hwkb06Jlyz2yXQ for ; Fri, 19 Nov 2021 17:45:16 +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 4Hwkb04kyBz15N; Fri, 19 Nov 2021 17:45:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1637343916; 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: in-reply-to:in-reply-to:references:references; bh=fRbo7SyxKs/jFNALPJEATAVgV4J/Evgy9CYoCkp0QoE=; b=lmdz45OsyZXtydwgoRLquJaqcyy1Zs9qjk8Itq2zqwLwSvQXabbCC+Z0QWAapS0xfvtB7Z O7+PYldCTTaTm7DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1637343916; 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: in-reply-to:in-reply-to:references:references; bh=fRbo7SyxKs/jFNALPJEATAVgV4J/Evgy9CYoCkp0QoE=; b=gOxJD9aB5/khxs74kji1VLJEFuMUhTsqkPEChLbdqvgSyWReRFtTYUzBczpue5fYpp0gLA lVlMAXsXaEBLjdBmHu3+Js29mhvVOVTkKbCW/r5WqjVrCCmeaVrQYU/L5YyY91a0B8ubQZ Q85dmzSQ6IxVe5Xzq8Hq5aP0ekMtDqJk5PHHVg2/xu0k/O6pLZUQCS5F/NRBZepCSkGTEm WRB1hug6UTCKjRR9c8ZnECDcEswkWjntjcN0C0cQp4EY21uCLsIE0EU11z+f07lP7P6ElH s48UvNpugz+VI78pCHp6Pksx/C58RIY/BywBaBD3HAdzanbkVD1hgJ5ecu4U4g== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/7] rust: Drop Cargo home directory after build Date: Fri, 19 Nov 2021 17:44:53 +0000 Message-Id: <20211119174458.789486-2-michael.tremer@ipfire.org> In-Reply-To: <20211119174458.789486-1-michael.tremer@ipfire.org> References: <20211119174458.789486-1-michael.tremer@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: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/suricata | 2 -- lfs/Config | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata index 21dbeae64..7c512b033 100644 --- a/config/rootfiles/common/suricata +++ b/config/rootfiles/common/suricata @@ -1,7 +1,5 @@ etc/suricata etc/suricata/suricata.yaml -#root/.cargo -#root/.cargo/.package-cache usr/bin/suricata #usr/share/doc/suricata #usr/share/doc/suricata/AUTHORS diff --git a/lfs/Config b/lfs/Config index a2d3cddc5..8b2e5dabb 100644 --- a/lfs/Config +++ b/lfs/Config @@ -143,6 +143,9 @@ ifeq "$(BUILD_ARCH)" "aarch64" GOARCH = arm64 endif +# Rust +export CARGOPATH = $(HOME)/.cargo + ############################################################################### # Common Macro Definitions ############################################################################### @@ -184,7 +187,7 @@ define POSTBUILD @echo "Updating linker cache..." @type -p ldconfig >/dev/null && ldconfig || : @echo "Install done; saving file list to $(TARGET) ..." - @rm -rf $(GOPATH) + @rm -rf $(GOPATH) $(CARGOPATH) @$(FIND_FILES) > $(DIR_SRC)/lsalrnew @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr