openwrt/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-04-17 03:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3: merge python3-email into python3-urllib

Browse Source 
As we're seeing in various test.sh scrip runs, importing 'email' fails
with not finding 'urllib' and vice-versa.

Then via a7e96ec91 ("python3-email: add python3-urllib as dependency")
I created a circular dependency.
So, might as well merge the two packages into one (named python3-urllib)
and updates all dependencies to pull python3-urllib.

Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
This commit is contained in:
Alexandru Ardelean
2026-04-02 19:16:31 +03:00
committed by Alexandru Ardelean
parent e85084314c
commit e0a12562b7
21 changed files with 31 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lang/python/python3/Makefile
View File

@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
include ../python3-version.mk
PKG_NAME:=python3
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz

22
lang/python/python3/files/python3-package-email.mk
View File

@@ -1,22 +0,0 @@
#
# Copyright (C) 2006-2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Package/python3-email
$(call Package/python3/Default)
TITLE+= email module
DEPENDS:=+python3-light +python3-urllib
endef
define Package/python3-email/description
$(call Package/python3/Default/description)
This package contains the email module.
endef
$(eval $(call Py3BasePackage,python3-email, \
/usr/lib/python$(PYTHON3_VERSION)/email \
))

3
lang/python/python3/files/python3-package-urllib.mk
View File

@@ -8,7 +8,7 @@
define Package/python3-urllib
$(call Package/python3/Default)
TITLE+= URL handling modules
DEPENDS:=+python3-light +python3-email
DEPENDS:=+python3-light
endef
define Package/python3-urllib/description
@@ -18,5 +18,6 @@ This package contains the URL handling modules.
endef
$(eval $(call Py3BasePackage,python3-urllib, \
/usr/lib/python$(PYTHON3_VERSION)/email \
/usr/lib/python$(PYTHON3_VERSION)/urllib \
))