From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 11 Jan 2020 20:22:07 +0000 (+0100)
Subject: python3: exclude __pycache__ from iso, core and packages
X-Git-Tag: v2.25-core141~78
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=590f879b342e8f960464b0650dbf179ab082c749

python3: exclude __pycache__ from iso, core and packages

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/Config b/lfs/Config
index 8a3ed52276..5f606f53fc 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 56d1fa8fe1..b26db754bd 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 3cd8c07853..fe4fb837cf 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