django: split django1 package and update to 2.2.6

After many failed attempts at upgrading Django to 2.2.6, the solution seems
to be to split a `python-django1` package that works with Python2 and
upgrade `python3-django` to the latest 2.2[.6] LTS release.

This also means that all Python2 Django packages will be stuck & based on
Django 1.11[.24] LTS release. But, it's currently the sanest approach I
could find to be able to perform an upgrade of Django to 2.2, and not break
Seafile.

Upgrading Seafile is also pretty difficult, as their Python3 support is not
yet finished & released. And in the meantime, we want to allow people to
use newer Django versions.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean
2019-10-11 09:29:46 +03:00
committed by Eneas U de Queiroz
parent b38c9a01e2
commit c21a453ffd
15 changed files with 107 additions and 61 deletions

View File

@@ -1,5 +1,5 @@
#
# Copyright (C) 2007-2017 OpenWrt.org
# Copyright (C) Alexandru Ardelean <ardeleanalex@gmail.com>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=django
PKG_VERSION:=1.11.24
PKG_VERSION:=2.2.6
PKG_RELEASE:=1
PKG_SOURCE:=Django-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/D/Django
PKG_HASH:=215c27453f775b6b1add83a185f76c2e2ab711d17786a6704bd62eabd93f89e3
PKG_HASH:=a8ca1033acac9f33995eb2209a6bf18a4681c3e5269a878e9a7e0b7384ed1ca3
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-django-$(PKG_VERSION)
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
@@ -22,7 +22,6 @@ PKG_LICENSE_FILES:=LICENSE LICENSE.python
PKG_CPE_ID:=cpe:/a:djangoproject:django
include $(INCLUDE_DIR)/package.mk
include ../python-package.mk
include ../python3-package.mk
PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
@@ -36,18 +35,6 @@ define Package/django/Default
MENU:=1
endef
define Package/python-django
$(call Package/django/Default)
DEPENDS:= \
+PACKAGE_python-django:python \
+PACKAGE_python-django:python-pytz
VARIANT:=python
endef
define Package/python-django/description
The web framework for perfectionists with deadlines.
endef
define Package/python3-django
$(call Package/django/Default)
DEPENDS:= \
@@ -57,13 +44,10 @@ $(call Package/django/Default)
endef
define Package/python3-django/description
$(call Package/python-django/description)
.
(Variant for Python3)
The web framework for perfectionists with deadlines (LTS 2.2 series).
Python3 only.
endef
$(eval $(call PyPackage,python-django))
$(eval $(call BuildPackage,python-django))
$(eval $(call Py3Package,python3-django))
$(eval $(call BuildPackage,python3-django))
$(eval $(call BuildPackage,python3-django-src))