From c6cf2dadc0c81b78b1a737c32ff67f0e7ca383a1 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 4 Nov 2019 12:24:07 -0800 Subject: [PATCH] sysrepo: Switch to Python 3 Python 2 will be EOL by the end of the year. Switch to Python 3 as there is already support for it. Signed-off-by: Rosen Penev --- net/sysrepo/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/sysrepo/Makefile b/net/sysrepo/Makefile index a5578ef6b..c5ef604f3 100644 --- a/net/sysrepo/Makefile +++ b/net/sysrepo/Makefile @@ -26,7 +26,7 @@ PKG_BUILD_DEPENDS:=SYSREPO_BINDINGS:swig/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk ifeq ($(CONFIG_SYSREPO_PYTHON),y) -$(call include_mk, python-package.mk) +$(call include_mk, python3-package.mk) endif define Package/libsysrepo/config @@ -38,7 +38,7 @@ define Package/libsysrepo CATEGORY:=Libraries TITLE:=YANG-based data store library URL:=https://www.sysrepo.org/ - DEPENDS:=+libyang +libprotobuf-c +libev +libredblack +librt +libpthread +SYSREPO_BINDINGS:libstdcpp +SYSREPO_PYTHON:python-base +SYSREPO_LUA:lua + DEPENDS:=+libyang +libprotobuf-c +libev +libredblack +librt +libpthread +SYSREPO_BINDINGS:libstdcpp +SYSREPO_PYTHON:python3-base +SYSREPO_LUA:lua MENU:=1 endef @@ -98,7 +98,8 @@ endif ifeq ($(CONFIG_SYSREPO_PYTHON),y) CMAKE_OPTIONS += \ -DGEN_PYTHON_BINDINGS:BOOL=TRUE \ - -DGEN_PYTHON_VERSION=2 + -DGEN_PYTHON_VERSION=3 \ + -DGEN_PYTHON3_TESTS:BOOL=FALSE endif ifeq ($(CONFIG_SYSREPO_BINDINGS),y) @@ -136,8 +137,8 @@ ifeq ($(CONFIG_SYSREPO_PYTHON),y) $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/swig/libSysrepo-cpp.so* $(1)/usr/lib $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/swig/python2/libsysrepoPython2.py $(1)$(PYTHON_PKG_DIR) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/swig/python2/_libsysrepoPython2.so $(1)$(PYTHON_PKG_DIR) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/swig/python3/libsysrepoPython3.py $(1)$(PYTHON_PKG_DIR) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/swig/python3/_libsysrepoPython3.so $(1)$(PYTHON_PKG_DIR) endif ifeq ($(CONFIG_SYSREPO_LUA),y)