diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-01-08 13:59:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 13:59:29 +0200 |
| commit | bc631e861c742191465df09912dd959dff2626b2 (patch) | |
| tree | fafd10cf77000d843f32328fa1e1707ab9679c80 /lang/python/python3 | |
| parent | f25da592f12e7967876cf7dc416a64d0a7feafcc (diff) | |
| parent | c5cbd44cea99c5abe7317833d0671828abb6e108 (diff) | |
Merge pull request #5376 from jefferyto/python-egg-info
python,python3: undo egg-info removal
Diffstat (limited to 'lang/python/python3')
| -rw-r--r-- | lang/python/python3/Makefile | 2 | ||||
| -rw-r--r-- | lang/python/python3/files/python3-package-install.sh | 4 | ||||
| -rw-r--r-- | lang/python/python3/files/python3-package.mk | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 5c10442f3..7ab3c51da 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -14,7 +14,7 @@ PYTHON_VERSION:=$(PYTHON3_VERSION) PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO) PKG_NAME:=python3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz diff --git a/lang/python/python3/files/python3-package-install.sh b/lang/python/python3/files/python3-package-install.sh index 0b68dd245..373f315a1 100644 --- a/lang/python/python3/files/python3-package-install.sh +++ b/lang/python/python3/files/python3-package-install.sh @@ -46,10 +46,6 @@ process_filespec "$src_dir" "$dst_dir" "$filespec" || { exit 1 } -# delete egg-info directories -[ "$PYTHON3_KEEP_EGGINFO" == "1" ] || \ - find "$dst_dir" -name "*.egg-info" | xargs rm -rf - if [ "$mode" == "sources" ] ; then # Copy only python source files find $dst_dir -not -type d -not -name "*\.py" | xargs rm -f diff --git a/lang/python/python3/files/python3-package.mk b/lang/python/python3/files/python3-package.mk index 1d42b6dc3..93b14fac2 100644 --- a/lang/python/python3/files/python3-package.mk +++ b/lang/python/python3/files/python3-package.mk @@ -32,8 +32,6 @@ ifdef CONFIG_USE_MIPS16 TARGET_CFLAGS += -mno-mips16 -mno-interlink-mips16 endif -PYTHON3_KEEP_EGGINFO ?= 0 - define Py3Package define Package/$(1)-src @@ -70,13 +68,11 @@ define Py3Package $(call Py3Package/$(1)/install,$$(1)) find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f if [ -e files/python3-package-install.sh ] ; then \ - PYTHON3_KEEP_EGGINFO="$(PYTHON3_KEEP_EGGINFO)" \ $(SHELL) files/python3-package-install.sh \ "$(PKG_INSTALL_DIR)" "$$(1)" \ "$(HOST_PYTHON3_BIN)" "$$(2)" \ "$$$$$$$$$$(call shvar,Py3Package/$(1)/filespec)" ; \ elif [ -e $(STAGING_DIR)/mk/python3-package-install.sh ] ; then \ - PYTHON3_KEEP_EGGINFO="$(PYTHON3_KEEP_EGGINFO)" \ $(SHELL) $(STAGING_DIR)/mk/python3-package-install.sh \ "$(PKG_INSTALL_DIR)" "$$(1)" \ "$(HOST_PYTHON3_BIN)" "$$(2)" \ |