diff options
| author | Karel Kočí <karel.koci@nic.cz> | 2018-03-07 14:50:35 +0100 |
|---|---|---|
| committer | Karel Kočí <karel.koci@nic.cz> | 2018-03-07 14:50:35 +0100 |
| commit | fee9a06a282f549688a102fd2a7aa60503193e35 (patch) | |
| tree | e09a91ed0df05a1a9746e7c1af2fe19ec35e1dd8 | |
| parent | e606dc3a3eba85e6b68b48324ca74e71b97a7ebe (diff) | |
| download | turris-myrepo-fee9a06a282f549688a102fd2a7aa60503193e35.tar.gz turris-myrepo-fee9a06a282f549688a102fd2a7aa60503193e35.tar.bz2 turris-myrepo-fee9a06a282f549688a102fd2a7aa60503193e35.zip | |
Merge python-uci packages
| -rw-r--r-- | python-uci/Makefile | 29 | ||||
| -rw-r--r-- | python3-uci/Makefile | 39 |
2 files changed, 24 insertions, 44 deletions
diff --git a/python-uci/Makefile b/python-uci/Makefile index c09c762..eaf551f 100644 --- a/python-uci/Makefile +++ b/python-uci/Makefile @@ -16,24 +16,43 @@ PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz> include $(INCLUDE_DIR)/pkgauto.mk include $(INCLUDE_DIR)/package.mk $(call include_mk, python-package.mk) +$(call include_mk, python3-package.mk) -define Package/$(PKG_NAME) - TITLE:=$(PKG_NAME) +define Package/Common SUBMENU:=Python SECTION:=lang CATEGORY:=Languages URL:=https://gitlab.labs.nic.cz/turris/pyuci/ MAINTAINER:=CZ.NIC <packaging@turris.cz> +endef + +define Package/python-uci + $(call Package/Common) + TITLE:=python-uci DEPENDS:=+python-light +libuci endef +define Package/python3-uci + $(call Package/Common) + TITLE:=python3-uci + DEPENDS:=+python3-light +libuci +endef + define Package/$(PKG_NAME)/description Python bindings for Unified Configuration Interface. endef define Build/Compile - $(call Build/Compile/PyMod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) + $(call Build/Compile/PyMod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)/py2) + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)/py3) endef -$(eval $(call PyPackage,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) +PKG_INSTALL_DIR_ORIG:="$(PKG_INSTALL_DIR)" +PKG_INSTALL_DIR:="$(PKG_INSTALL_DIR_ORIG)/py2" +$(eval $(call PyPackage,python-uci)) +PKG_INSTALL_DIR:="$(PKG_INSTALL_DIR_ORIG)/py3" +$(eval $(call Py3Package,python3-uci)) +PKG_INSTALL_DIR:="$(PKG_INSTALL_DIR_ORIG)" + +$(eval $(call BuildPackage,python-uci)) +$(eval $(call BuildPackage,python3-uci)) diff --git a/python3-uci/Makefile b/python3-uci/Makefile deleted file mode 100644 index d6ee062..0000000 --- a/python3-uci/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2018 CZ.NIC, z. s. p. o. (https://www.nic.cz/) -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=python3-uci -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/pyuci.git -PKG_SOURCE_BRANCH:=master -PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz> - -include $(INCLUDE_DIR)/pkgauto.mk -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python3-package.mk) - -define Package/$(PKG_NAME) - TITLE:=$(PKG_NAME) - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - URL:=https://gitlab.labs.nic.cz/turris/pyuci/ - MAINTAINER:=CZ.NIC <packaging@turris.cz> - DEPENDS:=+python3-light +libuci -endef - -define Package/$(PKG_NAME)/description - Python bindings for Unified Configuration Interface. -endef - -define Build/Compile - $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) -endef - -$(eval $(call Py3Package,$(PKG_NAME))) -$(eval $(call BuildPackage,$(PKG_NAME))) |