mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
seafile: Remove Python variants, update Python packaging
This removes Python build variants and adds PYTHON3_PKG_BUILD:=0 (where appropriate) for the Seafile packages. This also updates the way the Python bindings packages are packaged, using automake installation instead of manual install recipes. Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=seafile-ccnet
|
||||
PKG_VERSION:=7.1.3
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/haiwen/ccnet-server/tar.gz/v$(PKG_VERSION)-server?
|
||||
@@ -25,6 +25,7 @@ PKG_BUILD_DEPENDS:=vala/host
|
||||
PKG_FIXUP:=autoreconf
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_INSTALL:=1
|
||||
PYTHON3_PKG_BUILD:=0
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/nls.mk
|
||||
@@ -58,7 +59,6 @@ define Package/python3-seafile-ccnet
|
||||
SUBMENU:=Python
|
||||
TITLE:=Python bindings for Seafile Ccnet
|
||||
DEPENDS:=+seafile-ccnet +python3-light +python3-searpc
|
||||
VARIANT:=python3
|
||||
endef
|
||||
|
||||
define Package/python3-seafile-ccnet/description
|
||||
@@ -73,6 +73,9 @@ CONFIGURE_ARGS += \
|
||||
--enable-python \
|
||||
--with-mysql="$(STAGING_DIR)/usr/bin/mysql_config"
|
||||
|
||||
CONFIGURE_VARS += \
|
||||
PYTHON="$(HOST_PYTHON3_BIN)"
|
||||
|
||||
define Package/seafile-ccnet/install
|
||||
$(INSTALL_DIR) $(1)/usr/{lib,libexec}
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/libexec/
|
||||
@@ -88,12 +91,6 @@ define Build/InstallDev
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libccnet.{a,la,so*} $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
define Py3Build/Compile
|
||||
rm -rf $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/ccnet
|
||||
$(INSTALL_DIR) $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/ccnet
|
||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/python/ccnet/*.py $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/ccnet/
|
||||
endef
|
||||
|
||||
Py3Package/python3-seafile-ccnet/install:=:
|
||||
|
||||
$(eval $(call BuildPackage,seafile-ccnet))
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
--- a/python/ccnet/Makefile.am
|
||||
+++ b/python/ccnet/Makefile.am
|
||||
@@ -1,2 +1,2 @@
|
||||
ccnetdir=${pyexecdir}/ccnet
|
||||
-ccnet_PYTHON = __init__.py rpc.py
|
||||
+ccnet_DATA = __init__.py rpc.py
|
||||
Reference in New Issue
Block a user