Skip to content
Snippets Groups Projects
Verified Commit d08fc8b7 authored by Karel Koci's avatar Karel Koci :metal:
Browse files

patches: packages: backport PyPackageInstall not being called

parent 6ec27d38
No related branches found
No related tags found
No related merge requests found
From 925c5df30c3ca117dc1c6fd90589ede59a40c16a Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Mon, 18 Feb 2019 16:23:45 +0800
Subject: [PATCH 1/2] python,python3: Fix calling default PyPackage/install
This fixes Package/*/install to call PyPackage/*/install correctly.
Previously, if a package used the default PyPackage/*/install, then it
would not called. (A custom-defined PyPackage/*/install would be called
with no issue.)
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---
lang/python/python-package.mk | 2 +-
lang/python/python3-package.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lang/python/python-package.mk b/lang/python/python-package.mk
index 66a492983..648c6ee68 100644
--- a/lang/python/python-package.mk
+++ b/lang/python/python-package.mk
@@ -68,7 +68,7 @@ define PyPackage
$(call shexport,PyPackage/$(1)/filespec)
define Package/$(1)/install
- $(call PyPackage/$(1)/install,$$(1))
+ $$(call PyPackage/$(1)/install,$$(1))
find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
$(SHELL) $(python_mk_path)python-package-install.sh "2" \
"$(PKG_INSTALL_DIR)" "$$(1)" \
diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk
index 9e473b5c5..a84880dff 100644
--- a/lang/python/python3-package.mk
+++ b/lang/python/python3-package.mk
@@ -67,7 +67,7 @@ define Py3Package
$(call shexport,Py3Package/$(1)/filespec)
define Package/$(1)/install
- $(call Py3Package/$(1)/install,$$(1))
+ $$(call Py3Package/$(1)/install,$$(1))
find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
$(SHELL) $(python3_mk_path)python-package-install.sh "3" \
"$(PKG_INSTALL_DIR)" "$$(1)" \
--
2.21.0
From 7c71a355c3bacd80f3b476d9f1f0a8d4063f4973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Wed, 20 Feb 2019 12:51:05 +0100
Subject: [PATCH 2/2] python,python3: do not package binary files to base
packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Thanks to fix 200a5a2eec896b2d34f1114d14df66d810c1f4bd all base packages
now contain all binaries that are generated as part of python
installation. That causes collision between those packages with package
managers that consider this such as Turris updater-ng. This is also just
wrong. Those binaries were not included and should not be after
mentioned fix as well.
This just adds empty install definition. The idea is to override the
default one that is otherwise used.
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
---
lang/python/python/Makefile | 4 ++++
lang/python/python3/Makefile | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile
index b0e367748..dd4d07369 100644
--- a/lang/python/python/Makefile
+++ b/lang/python/python/Makefile
@@ -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
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index fc96c319b..8086e52eb 100644
--- a/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@ -110,6 +110,7 @@ define Py3BasePackage
-|/usr/lib/python$(PYTHON_VERSION)/*/tests
endif
endef
+ Py3Package/$(1)/install?=:
endef
include ./files/python3-package-*.mk
@@ -259,6 +260,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
--
2.21.0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment