lede-packages-rs

commit c6aa2450596edcb7436bccd68bfa49570a0d7c10
parent d775032d387f67aa10769c5c606e64f5cbf92467
Author: champtar <champetier.etienne@gmail.com>
Date:   Sat,  2 Jul 2016 14:46:08 +0200

Merge pull request #2902 from commodo/python3-win-exe-files-remove

python3: do not allow packaging of windows exe files
Diffstat:
M
lang/python3/Makefile
 | 
2
+-
M
lang/python3/files/python3-package.mk
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lang/python3/Makefile b/lang/python3/Makefile
@@ -14,7 +14,7 @@ PYTHON_VERSION:=$(PYTHON3_VERSION)
 PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
 
 PKG_NAME:=python3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk
@@ -62,7 +62,7 @@ define Py3Package
   $(call shexport,Py3Package/$(1)/filespec)
 
   define Package/$(1)/install
-	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
+	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" -o -name "*\.exe" | xargs rm -f
 	@echo "$$$$$$$$$$(call shvar,Py3Package/$(1)/filespec)" | ( \
 		IFS='|'; \
 		while read fop fspec fperm; do \
@@ -117,6 +117,6 @@ define Build/Compile/Py3Mod
 		, \
 		./setup.py $(2) \
 	)
-	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
+	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" -o -name "*\.exe" | xargs rm -f
 endef