[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 590f879b342e8f960464b0650dbf179ab082c749

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 590f879b342e8f960464b0650dbf179ab082c749

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 3343 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  590f879b342e8f960464b0650dbf179ab082c749 (commit)
      from  34ae42da0f2b25c2dc89313dcf0adb3ed88a4ae1 (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 590f879b342e8f960464b0650dbf179ab082c749
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jan 11 21:22:07 2020 +0100

    python3: exclude __pycache__ from iso, core and packages
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 lfs/Config       | 2 +-
 lfs/cdrom        | 3 ++-
 lfs/core-updates | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/lfs/Config b/lfs/Config
index 8a3ed5227..5f606f53f 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -241,7 +241,7 @@ define PAK
 	sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(BUILD_ARCH)/g' -i /install/packages/package/ROOTFILES
 	sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
 	chmod 755 /install/packages/package/{{,un}install,update}.sh
-	cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclude='#*' --files-from=/install/packages/package/ROOTFILES
+	cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclude='#*' --exclude='__pycache__' --files-from=/install/packages/package/ROOTFILES
 	# Double tar to remove double files
 	tar xfp /install/packages/package/files.tmp --numeric-owner -C /install/packages/package/tmp/
 	rm -f /install/packages/package/files.tmp
diff --git a/lfs/cdrom b/lfs/cdrom
index 56d1fa8fe..b26db754b 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -162,7 +162,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Compress root filesystem
 	# Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
-	tar -c --exclude='#*' --exclude='proc/*' --exclude='dev/pts/*' --exclude='tmp/ROOTFILES' \
+	tar -c --exclude='#*' --exclude='proc/*' --exclude='dev/pts/*' \
+		--exclude='__pycache__' --exclude='tmp/ROOTFILES' \
 		-C / --files-from=/tmp/ROOTFILES -f /$(SNAME).tar
 	rm -f /tmp/ROOTFILES
 	tar -x -C /tmp -f /$(SNAME).tar
diff --git a/lfs/core-updates b/lfs/core-updates
index 3cd8c0785..fe4fb837c 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -72,7 +72,7 @@ core/%:
 	sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
 
 	#Remove doubled files with tar/untar/tar to save space
-	tar -c --exclude='proc/*' --exclude='tmp/ROOTFILES' --exclude='#*' --exclude='dev/pts/*' \
+	tar -c --exclude='proc/*' --exclude='tmp/ROOTFILES' --exclude='__pycache__' --exclude='#*' --exclude='dev/pts/*' \
 		--exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude \
 		-C / --files-from=/tmp/ROOTFILES -f /$(SNAME).tar
 	mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES


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