mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
Merge pull request #8263 from Cynerd/python-fix-collision
python,python3: do not package binary files to base packages
This commit is contained in:
@@ -106,6 +106,7 @@ define PyBasePackage
|
|||||||
-|/usr/lib/python$(PYTHON_VERSION)/*/tests
|
-|/usr/lib/python$(PYTHON_VERSION)/*/tests
|
||||||
endif
|
endif
|
||||||
endef
|
endef
|
||||||
|
PyPackage/$(1)/install?=:
|
||||||
endef
|
endef
|
||||||
|
|
||||||
include ./files/python-package-*.mk
|
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/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
PyPackage/python-light/install:=:
|
||||||
|
PyPackage/python/install:=:
|
||||||
|
|
||||||
define PyPackage/python/filespec
|
define PyPackage/python/filespec
|
||||||
-|$(PYTHON_PKG_DIR)
|
-|$(PYTHON_PKG_DIR)
|
||||||
endef
|
endef
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ define Py3BasePackage
|
|||||||
-|/usr/lib/python$(PYTHON_VERSION)/*/tests
|
-|/usr/lib/python$(PYTHON_VERSION)/*/tests
|
||||||
endif
|
endif
|
||||||
endef
|
endef
|
||||||
|
Py3Package/$(1)/install?=:
|
||||||
endef
|
endef
|
||||||
|
|
||||||
include ./files/python3-package-*.mk
|
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/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
Py3Package/python3-light/install:=:
|
||||||
|
Py3Package/python3/install:=:
|
||||||
|
|
||||||
define Py3Package/python3/filespec
|
define Py3Package/python3/filespec
|
||||||
-|$(PYTHON3_PKG_DIR)
|
-|$(PYTHON3_PKG_DIR)
|
||||||
endef
|
endef
|
||||||
|
|||||||
Reference in New Issue
Block a user