[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 486112adf8d78b73d2fe639ff43f5d702d7eb4b6

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3340 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  486112adf8d78b73d2fe639ff43f5d702d7eb4b6 (commit)
       via  cde41c2e6f65cb16fc5e5466a6f78da46e30859b (commit)
      from  44cc9a3d57a01dd0ccaa10d4c95f29e86ca0816b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 486112adf8d78b73d2fe639ff43f5d702d7eb4b6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Dec 24 12:58:54 2019 +0000

    Go: Move the cache to the ccache directory
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit cde41c2e6f65cb16fc5e5466a6f78da46e30859b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Dec 24 12:58:53 2019 +0000

    Go: Cleanup Go Path after build
    
    Go leaves temporary build files in the directory
    which we do not need and we should clean up after
    every build.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/Config           | 4 ++++
 lfs/amazon-ssm-agent | 2 --
 make.sh              | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/lfs/Config b/lfs/Config
index 5f606f53f..3c552f3f0 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -115,6 +115,9 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 	GRUB_ARCH = arm64
 endif
 
+# Go
+export GOPATH = $(HOME)/gopath
+
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################
@@ -156,6 +159,7 @@ define POSTBUILD
 	@echo "Updating linker cache..."
 	@type -p ldconfig >/dev/null && ldconfig || :
 	@echo "Install done; saving file list to $(TARGET) ..."
+	@rm -rf $(GOPATH)
 	@$(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
diff --git a/lfs/amazon-ssm-agent b/lfs/amazon-ssm-agent
index da164ced8..b477690a4 100644
--- a/lfs/amazon-ssm-agent
+++ b/lfs/amazon-ssm-agent
@@ -37,8 +37,6 @@ PAK_VER    = 1
 
 DEPS       = ""
 
-export GOPATH = $(HOME)/gopath
-
 DIR_BUILD  = $(GOPATH)/src/github.com/aws/amazon-ssm-agent
 
 ###############################################################################
diff --git a/make.sh b/make.sh
index 538d94ace..88274eed0 100755
--- a/make.sh
+++ b/make.sh
@@ -556,6 +556,7 @@ enterchroot() {
 		CCACHE_DIR=/usr/src/ccache \
 		CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
 		CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
+		GOCACHE="/usr/src/ccache/go" \
 		KVER="${KVER}" \
 		XZ_OPT="${XZ_OPT}" \
 		DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \


hooks/post-receive
--
IPFire 2.x development tree