django: move django* packages under django submenu

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>
(cherry-picked from commit 90527d75af)
This commit is contained in:
Eneas U de Queiroz
2019-07-09 09:12:06 -03:00
committed by Josef Schlehofer
parent 19e137162d
commit db4cbf71a5
15 changed files with 129 additions and 22 deletions

View File

@@ -26,14 +26,50 @@ define Package/django-webpack-loader
CATEGORY:=Languages
TITLE:=Transparently use webpack in django
URL:=https://github.com/owais/django-webpack-loader
<<<<<<< HEAD
DEPENDS:=+python +python-django
=======
endef
define Package/python-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default)
DEPENDS:= \
+PACKAGE_python-$(PKG_NAME):python \
python-django
>>>>>>> 90527d75a... django: move django* packages under django submenu
VARIANT:=python
MDEPENDS:=python-django
endef
define Package/django-webpack-loader/description
Use webpack to generate your static bundles without djangos staticfiles or opaque wrappers.
endef
<<<<<<< HEAD
$(eval $(call PyPackage,django-webpack-loader))
$(eval $(call BuildPackage,django-webpack-loader))
$(eval $(call BuildPackage,django-webpack-loader-src))
=======
define Package/python3-$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default)
DEPENDS:= \
+PACKAGE_python3-$(PKG_NAME):python3 \
python3-django
VARIANT:=python3
MDEPENDS:=python3-django
endef
define Package/python3-$(PKG_NAME)/description
$(call define Package/python-$(PKG_NAME)/description)
.
(Variant for Python3)
endef
$(eval $(call PyPackage,python-$(PKG_NAME)))
$(eval $(call BuildPackage,python-$(PKG_NAME)))
$(eval $(call BuildPackage,python-$(PKG_NAME)-src))
$(eval $(call Py3Package,python3-$(PKG_NAME)))
$(eval $(call BuildPackage,python3-$(PKG_NAME)))
$(eval $(call BuildPackage,python3-$(PKG_NAME)-src))
>>>>>>> 90527d75a... django: move django* packages under django submenu