Browse Source

Merge pull request #8263 from Cynerd/python-fix-collision

python,python3: do not package binary files to base packages
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
e3e139d927
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
  1. +4
    -0
      lang/python/python/Makefile
  2. +4
    -0
      lang/python/python3/Makefile

+ 4
- 0
lang/python/python/Makefile View File

@ -106,6 +106,7 @@ define PyBasePackage
-|/usr/lib/python$(PYTHON_VERSION)/*/tests
endif
endef
PyPackage/$(1)/install?=:
endef
include ./files/python-package-*.mk
@ -263,6 +264,9 @@ define PyPackage/python-base/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/
endef
PyPackage/python-light/install:=:
PyPackage/python/install:=:
define PyPackage/python/filespec
-|$(PYTHON_PKG_DIR)
endef


+ 4
- 0
lang/python/python3/Makefile View File

@ -110,6 +110,7 @@ define Py3BasePackage
-|/usr/lib/python$(PYTHON_VERSION)/*/tests
endif
endef
Py3Package/$(1)/install?=:
endef
include ./files/python3-package-*.mk
@ -264,6 +265,9 @@ define Py3Package/python3-base/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/
endef
Py3Package/python3-light/install:=:
Py3Package/python3/install:=:
define Py3Package/python3/filespec
-|$(PYTHON3_PKG_DIR)
endef


Loading…
Cancel
Save