From: Michael Tremer <michael.tremer@ipfire.org>
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 [thread overview]
Message-ID: <20211119174458.789486-2-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20211119174458.789486-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1450 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
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
--
2.30.2
next prev parent reply other threads:[~2021-11-19 17:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-19 17:44 [PATCH 1/7] suricata: Include all default rules Michael Tremer
2021-11-19 17:44 ` Michael Tremer [this message]
2021-11-19 17:44 ` [PATCH 3/7] suricata: Drop extra rootfiles Michael Tremer
2021-11-19 17:44 ` [PATCH 4/7] suricata: This package is supported on all architectures Michael Tremer
2021-11-24 14:54 ` Arne Fitzenreiter
2021-11-24 16:53 ` Michael Tremer
2021-11-19 17:44 ` [PATCH 5/7] suricata: Load *.config files from default location Michael Tremer
2021-11-22 4:21 ` Stefan Schantl
2021-11-22 9:52 ` Michael Tremer
2021-11-19 17:44 ` [PATCH 6/7] IPS: Do not try to show rules when stat on rules tarball fails Michael Tremer
2021-11-19 17:44 ` [PATCH 7/7] suricata: Handle retransmitted SYN with TSval Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211119174458.789486-2-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox