From 15ce23ca53f7df327375dfd1dd66c021758b25ea Mon Sep 17 00:00:00 2001 From: Simon Pirkelmann Date: Mon, 15 Mar 2021 23:34:23 +0100 Subject: [PATCH] use setuptools build system for python package for web interface --- br_external/Config.in | 2 +- br_external/package/door_admin/door_admin.mk | 15 --------------- .../{door_admin => python-door-admin}/Config.in | 2 +- .../package/python-door-admin/door_admin.mk | 9 +++++++++ 4 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 br_external/package/door_admin/door_admin.mk rename br_external/package/{door_admin => python-door-admin}/Config.in (92%) create mode 100644 br_external/package/python-door-admin/door_admin.mk diff --git a/br_external/Config.in b/br_external/Config.in index 9c74178..e10c460 100644 --- a/br_external/Config.in +++ b/br_external/Config.in @@ -1,3 +1,3 @@ source "$BR2_EXTERNAL_DOOR_PI_PATH/package/poll_desfire/Config.in" source "$BR2_EXTERNAL_DOOR_PI_PATH/package/libfreefare_git/Config.in" -source "$BR2_EXTERNAL_DOOR_PI_PATH/package/door_admin/Config.in" +source "$BR2_EXTERNAL_DOOR_PI_PATH/package/python-door-admin/Config.in" diff --git a/br_external/package/door_admin/door_admin.mk b/br_external/package/door_admin/door_admin.mk deleted file mode 100644 index 7afcdac..0000000 --- a/br_external/package/door_admin/door_admin.mk +++ /dev/null @@ -1,15 +0,0 @@ -DOOR_ADMIN_VERSION = 0.0.2 -DOOR_ADMIN_SOURCE = door_admin_v$(DOOR_ADMIN_VERSION).tar.gz -DOOR_ADMIN_SITE = https://git.imaginaerraum.de/Telos4/DoorAdmin/archive -DOOR_ADMIN_DEPENDENCIES = python-flask-security-too python-flask-wtf python-flask-sqlalchemy -DOOR_ADMIN_LICENSE = GPL-3.0 - -define DOOR_ADMIN_INSTALL_STAGING_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=$(STAGING_DIR) install -endef - -define DOOR_ADMIN_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/br_external/package/door_admin/Config.in b/br_external/package/python-door-admin/Config.in similarity index 92% rename from br_external/package/door_admin/Config.in rename to br_external/package/python-door-admin/Config.in index 4c52c7a..b9d918f 100644 --- a/br_external/package/door_admin/Config.in +++ b/br_external/package/python-door-admin/Config.in @@ -1,4 +1,4 @@ -config BR2_PACKAGE_DOOR_ADMIN +config BR2_PACKAGE_PYTHON_DOOR_ADMIN bool "door_admin" select BR2_PACKAGE_PYTHON_PAHO_MQTT select BR2_PACKAGE_PYTHON_BCRYPT diff --git a/br_external/package/python-door-admin/door_admin.mk b/br_external/package/python-door-admin/door_admin.mk new file mode 100644 index 0000000..245de2e --- /dev/null +++ b/br_external/package/python-door-admin/door_admin.mk @@ -0,0 +1,9 @@ +PYTHON_DOOR_ADMIN_VERSION = 0.0.3 +PYTHON_DOOR_ADMIN_SOURCE = door_admin_v$(PYTHON_DOOR_ADMIN_VERSION).tar.gz +PYTHON_DOOR_ADMIN_SITE = https://git.imaginaerraum.de/Telos4/DoorAdmin/archive +PYTHON_DOOR_ADMIN_LICENSE = GPL-3.0 +PYTHON_DOOR_ADMIN_LICENSE_FILES = LICENSE +PYTHON_DOOR_ADMIN_SETUP_TYPE = setuptools +#PYTHON_DOOR_ADMIN_DEPENDENCIES = python-flask-security-too, python-flask-wtf, python-flask-mail, python-paho-mqtt, python-flask-sqlalchemy + +$(eval $(python-package))