python,python3: undo egg-info removal

This reverts commits 4333d1dcbfd67dde4ca7d08717bc345cc424fbf8 and
074d2863be48c1a9093fffcda91f7a328bc7d0cb, making Python packages
discoverable again by pkg_resources.

Fixes #5361.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>

diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile
index 5bab469e74640054acbb53607a1552373559d007..e7500f66d3b3d85b2c0f1677945024da050123b2 100644 (file)
--- a/lang/python/python/Makefile
+++ b/lang/python/python/Makefile
@@ -12,7 +12,7 @@ include ./files/python-version.mk
 
 PKG_NAME:=python
 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)

diff --git a/lang/python/python/files/python-package-install.sh b/lang/python/python/files/python-package-install.sh
index cefbce376a857aedaef5bc464ef99d6c941c3efb..60c1e273c7dd21c85d7005da9afca715c4e21b17 100644 (file)
--- a/lang/python/python/files/python-package-install.sh
+++ b/lang/python/python/files/python-package-install.sh
@@ -46,10 +46,6 @@ process_filespec "$src_dir" "$dst_dir" "$filespec" || {
        exit 1
 }
 
-# delete egg-info directories
-[ "$PYTHON_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/python/files/python-package.mk b/lang/python/python/files/python-package.mk
index 7e3cb2ce83698c3f786abaaddd6268ba7dccaf24..9c231f6ecfa0f8c8edc74ab3baa40fd85e4b634f 100644 (file)
--- a/lang/python/python/files/python-package.mk
+++ b/lang/python/python/files/python-package.mk
@@ -32,8 +32,6 @@ ifdef CONFIG_USE_MIPS16
   TARGET_CFLAGS += -mno-mips16 -mno-interlink-mips16
 endif
 
-PYTHON_KEEP_EGGINFO ?= 0
-
 define PyPackage
 
   define Package/$(1)-src
@@ -70,13 +68,11 @@ define PyPackage
        $(call PyPackage/$(1)/install,$$(1))
        find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
        if [ -e files/python-package-install.sh ] ; then \
-               PYTHON_KEEP_EGGINFO="$(PYTHON_KEEP_EGGINFO)" \
                $(SHELL) files/python-package-install.sh \
                        "$(PKG_INSTALL_DIR)" "$$(1)" \
                        "$(HOST_PYTHON_BIN)" "$$(2)" \
                        "$$$$$$$$$$(call shvar,PyPackage/$(1)/filespec)" ; \
        elif [ -e $(STAGING_DIR)/mk/python-package-install.sh ] ; then \
-               PYTHON_KEEP_EGGINFO="$(PYTHON_KEEP_EGGINFO)" \
                $(SHELL) $(STAGING_DIR)/mk/python-package-install.sh \
                        "$(PKG_INSTALL_DIR)" "$$(1)" \
                        "$(HOST_PYTHON_BIN)" "$$(2)" \

diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index 5c10442f3ac36483e6da1c71d52b897ce8476614..7ab3c51dacc770170f409e681cb8d3f6f3c6094d 100644 (file)
--- 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 0b68dd245c71696799c05692f9a7e2f6e7764c18..373f315a1094747cc62aa1ff31d09ae55476bec1 100644 (file)
--- 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 1d42b6dc3478a3cd5d92d81088f8ffcfae213089..93b14fac23b25ade106bf2ea55ec1a2b0d362278 100644 (file)
--- 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)" \