cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

django: move django* packages under django submenu

Browse Source 
This changes the python[3]-django dependencies in packages to be
non-selecting, and adds an MDEPENDS line so that the *-src packages get
placed inside the django menu as well.

Added MENU:= to the src-package definitions in python[3]-package.mk,
so it does not import that setting from the binary package.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
This commit is contained in:
Eneas U de Queiroz
2019-07-09 09:12:06 -03:00
parent 7965dc48f5
commit 90527d75af
15 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/python/django-appconf/Makefile
+4 -2
View File
@@ -39,8 +39,9 @@ define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-django python-django
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -51,8 +52,9 @@ define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-django python3-django
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django-compressor/Makefile
+4 -2
View File
@@ -39,10 +39,11 @@ define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-django \ python-django \
+PACKAGE_python-$(PKG_NAME):python-django-appconf \ +PACKAGE_python-$(PKG_NAME):python-django-appconf \
+PACKAGE_python-$(PKG_NAME):python-rcssmin +PACKAGE_python-$(PKG_NAME):python-rcssmin
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -56,10 +57,11 @@ define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-django \ python3-django \
+PACKAGE_python3-$(PKG_NAME):python3-django-appconf \ +PACKAGE_python3-$(PKG_NAME):python3-django-appconf \
+PACKAGE_python3-$(PKG_NAME):python3-rcssmin +PACKAGE_python3-$(PKG_NAME):python3-rcssmin
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django-constance/Makefile
+4 -2
View File
@@ -37,8 +37,9 @@ define Package/python-django-constance
$(call Package/python-django-constance/Default) $(call Package/python-django-constance/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-django-constance:python \ +PACKAGE_python-django-constance:python \
+PACKAGE_python-django-constance:python-django python-django
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-django-constance/description define Package/python-django-constance/description
@@ -49,8 +50,9 @@ define Package/python3-django-constance
$(call Package/python-django-constance/Default) $(call Package/python-django-constance/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-django-constance:python3 \ +PACKAGE_python3-django-constance:python3 \
+PACKAGE_python3-django-constance:python3-django python3-django
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-django-constance/description define Package/python3-django-constance/description
lang/python/django-formtools/Makefile
+4 -2
View File
@@ -37,8 +37,9 @@ define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-django python-django
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -50,8 +51,9 @@ define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-django python3-django
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django-jsonfield/Makefile
+4 -2
View File
@@ -39,8 +39,9 @@ define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-django python-django
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -51,8 +52,9 @@ define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-django python3-django
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django-picklefield/Makefile
+4 -2
View File
@@ -39,8 +39,9 @@ define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-django python-django
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -51,8 +52,9 @@ define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-django python3-django
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django-postoffice/Makefile
+4 -2
View File
@@ -39,9 +39,10 @@ define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-django \ python-django \
+PACKAGE_python-$(PKG_NAME):python-django-jsonfield +PACKAGE_python-$(PKG_NAME):python-django-jsonfield
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -53,9 +54,10 @@ define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-django \ python3-django \
+PACKAGE_python3-$(PKG_NAME):python3-django-jsonfield +PACKAGE_python3-$(PKG_NAME):python3-django-jsonfield
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django-ranged-response/Makefile
+4 -2
View File
@@ -37,8 +37,9 @@ define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-django python-django
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -49,8 +50,9 @@ define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-django python3-django
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django-restframework/Makefile
+4 -2
View File
@@ -39,8 +39,9 @@ define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-django python-django
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -51,8 +52,9 @@ define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-django python3-django
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django-simple-captcha/Makefile
+4 -2
View File
@@ -40,10 +40,11 @@ $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-six \ +PACKAGE_python-$(PKG_NAME):python-six \
+PACKAGE_python-$(PKG_NAME):python-django \ python-django \
+PACKAGE_python-$(PKG_NAME):python-pillow \ +PACKAGE_python-$(PKG_NAME):python-pillow \
+PACKAGE_python-$(PKG_NAME):python-django-ranged-response +PACKAGE_python-$(PKG_NAME):python-django-ranged-response
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -56,10 +57,11 @@ $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-six \ +PACKAGE_python3-$(PKG_NAME):python3-six \
+PACKAGE_python3-$(PKG_NAME):python3-django \ python3-django \
+PACKAGE_python3-$(PKG_NAME):python3-pillow \ +PACKAGE_python3-$(PKG_NAME):python3-pillow \
+PACKAGE_python3-$(PKG_NAME):python3-django-ranged-response +PACKAGE_python3-$(PKG_NAME):python3-django-ranged-response
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django-statici18n/Makefile
+4 -2
View File
@@ -39,8 +39,9 @@ define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-django python-django
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -51,8 +52,9 @@ define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-django python3-django
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django-webpack-loader/Makefile
+4 -2
View File
@@ -37,8 +37,9 @@ define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \ +PACKAGE_python-$(PKG_NAME):python \
+PACKAGE_python-$(PKG_NAME):python-django python-django
VARIANT:=python VARIANT:=python
MDEPENDS:=python-django
endef endef
define Package/python-$(PKG_NAME)/description define Package/python-$(PKG_NAME)/description
@@ -49,8 +50,9 @@ define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default) $(call Package/$(PKG_NAME)/Default)
DEPENDS:= \ DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \ +PACKAGE_python3-$(PKG_NAME):python3 \
+PACKAGE_python3-$(PKG_NAME):python3-django python3-django
VARIANT:=python3 VARIANT:=python3
MDEPENDS:=python3-django
endef endef
define Package/python3-$(PKG_NAME)/description define Package/python3-$(PKG_NAME)/description
lang/python/django/Makefile
+1
View File
@@ -35,6 +35,7 @@ define Package/django/Default
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=The web framework for perfectionists with deadlines. TITLE:=The web framework for perfectionists with deadlines.
URL:=https://www.djangoproject.com/ URL:=https://www.djangoproject.com/
MENU:=1
endef endef
define Package/python-django define Package/python-django
lang/python/python-package.mk
+1
View File
@@ -45,6 +45,7 @@ define PyPackage
EXTRA_DEPENDS:= EXTRA_DEPENDS:=
TITLE+= (sources) TITLE+= (sources)
USERID:= USERID:=
MENU:=
endef endef
define Package/$(1)-src/description define Package/$(1)-src/description
lang/python/python3-package.mk
+1
View File
@@ -44,6 +44,7 @@ define Py3Package
EXTRA_DEPENDS:= EXTRA_DEPENDS:=
TITLE+= (sources) TITLE+= (sources)
USERID:= USERID:=
MENU:=
endef endef
define Package/$(1)-src/description define Package/$(1)-src/description