From 76da40fd640995adb41b47282bdf5b5d462404a6 Mon Sep 17 00:00:00 2001 From: Simon Pirkelmann Date: Tue, 9 Mar 2021 21:15:41 +0100 Subject: [PATCH 1/7] added submodule for door administration web interface --- .gitmodules | 3 +++ door_admin | 1 + 2 files changed, 4 insertions(+) create mode 160000 door_admin diff --git a/.gitmodules b/.gitmodules index 9324a37..bbb439c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "door_control"] path = door_control url = ssh://irgit@imaginaerraum.de:2201/apo/DoorControl.git +[submodule "door_admin"] + path = door_admin + url = ssh://irgit@imaginaerraum.de:2201/Telos4/DoorAdmin.git diff --git a/door_admin b/door_admin new file mode 160000 index 0000000..55c4f6e --- /dev/null +++ b/door_admin @@ -0,0 +1 @@ +Subproject commit 55c4f6ea7ffd0f0b8bf0c5afbb5f2cdb68722073 From 405dbd0b9f5f354760967a62770c2e45b1175964 Mon Sep 17 00:00:00 2001 From: Simon Pirkelmann Date: Tue, 9 Mar 2021 21:17:30 +0100 Subject: [PATCH 2/7] changed url for buildroot to forked repo with flask-security-too package + depedencies --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index bbb439c..5457669 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "buildroot"] path = buildroot - url = https://github.com/buildroot/buildroot.git + url = https://github.com/Telos4/buildroot.git [submodule "door_control"] path = door_control url = ssh://irgit@imaginaerraum.de:2201/apo/DoorControl.git From 0aad665b0edb1fc762da88cf8f3dcdc7b1ecfc41 Mon Sep 17 00:00:00 2001 From: Simon Pirkelmann Date: Fri, 12 Mar 2021 22:29:30 +0100 Subject: [PATCH 3/7] new buildroot packages for python modules --- buildroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot b/buildroot index 21eb777..1a18f2a 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 21eb7775510d76163c2159bca14d3802283119e3 +Subproject commit 1a18f2a06f1780d522d03e068b8dc75a0169dc73 From baad4190fe23ddcd3aa38d9235439cee779979d0 Mon Sep 17 00:00:00 2001 From: Simon Pirkelmann Date: Sun, 14 Mar 2021 14:49:46 +0100 Subject: [PATCH 4/7] created buildroot external package for door_admin web interface --- br_external/Config.in | 1 + br_external/package/door_admin/Config.in | 12 ++++++++++++ br_external/package/door_admin/door_admin.mk | 15 +++++++++++++++ buildroot | 2 +- door_admin | 2 +- 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 br_external/package/door_admin/Config.in create mode 100644 br_external/package/door_admin/door_admin.mk diff --git a/br_external/Config.in b/br_external/Config.in index 6cbca1d..9c74178 100644 --- a/br_external/Config.in +++ b/br_external/Config.in @@ -1,2 +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" diff --git a/br_external/package/door_admin/Config.in b/br_external/package/door_admin/Config.in new file mode 100644 index 0000000..4452789 --- /dev/null +++ b/br_external/package/door_admin/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_DOOR_ADMIN + bool "door_admin" + select BR2_PACKAGE_PYTHON_PAHO_MQTT + select BR2_PACKAGE_PYTHON_BLEACH + select BR2_PACKAGE_PYTHON_FLASK + select BR2_PACKAGE_PYTHON_FLASK_WTF + select BR2_PACKAGE_PYTHON_FLASK_SECURITY_TOO + select BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY + help + Simple web interface for door token adminstration + + https://git.imaginaerraum.de/Telos4/DoorAdmin diff --git a/br_external/package/door_admin/door_admin.mk b/br_external/package/door_admin/door_admin.mk new file mode 100644 index 0000000..85ab245 --- /dev/null +++ b/br_external/package/door_admin/door_admin.mk @@ -0,0 +1,15 @@ +DOOR_ADMIN_VERSION = 0.0.5 +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/buildroot b/buildroot index 1a18f2a..4b2a0a6 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 1a18f2a06f1780d522d03e068b8dc75a0169dc73 +Subproject commit 4b2a0a6e2b1373ae7f7eccb1e7ed05b442af22a0 diff --git a/door_admin b/door_admin index 55c4f6e..daed273 160000 --- a/door_admin +++ b/door_admin @@ -1 +1 @@ -Subproject commit 55c4f6ea7ffd0f0b8bf0c5afbb5f2cdb68722073 +Subproject commit daed27372bdbeb7d0fe5995b9c411b09a1e7b831 From 93b8e76565e712eca2a107880599efa90dadbd2e Mon Sep 17 00:00:00 2001 From: Simon Pirkelmann Date: Sun, 14 Mar 2021 17:28:18 +0100 Subject: [PATCH 5/7] new version of webinterface with navbar --- br_external/package/door_admin/Config.in | 2 ++ br_external/package/door_admin/door_admin.mk | 2 +- door_admin | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/br_external/package/door_admin/Config.in b/br_external/package/door_admin/Config.in index 4452789..4c52c7a 100644 --- a/br_external/package/door_admin/Config.in +++ b/br_external/package/door_admin/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_DOOR_ADMIN bool "door_admin" select BR2_PACKAGE_PYTHON_PAHO_MQTT + select BR2_PACKAGE_PYTHON_BCRYPT select BR2_PACKAGE_PYTHON_BLEACH select BR2_PACKAGE_PYTHON_FLASK + select BR2_PACKAGE_PYTHON_FLASK_MAIL select BR2_PACKAGE_PYTHON_FLASK_WTF select BR2_PACKAGE_PYTHON_FLASK_SECURITY_TOO select BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY diff --git a/br_external/package/door_admin/door_admin.mk b/br_external/package/door_admin/door_admin.mk index 85ab245..7afcdac 100644 --- a/br_external/package/door_admin/door_admin.mk +++ b/br_external/package/door_admin/door_admin.mk @@ -1,4 +1,4 @@ -DOOR_ADMIN_VERSION = 0.0.5 +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 diff --git a/door_admin b/door_admin index daed273..253db84 160000 --- a/door_admin +++ b/door_admin @@ -1 +1 @@ -Subproject commit daed27372bdbeb7d0fe5995b9c411b09a1e7b831 +Subproject commit 253db849fff70b602ad346734d9c3b03818cd1eb From 0abff3484c1c42c0428a88b7406db2e9e76e58cb Mon Sep 17 00:00:00 2001 From: Simon Pirkelmann Date: Sun, 14 Mar 2021 17:31:36 +0100 Subject: [PATCH 6/7] removed submodule (no longer necessary, since we are now using builtroot external package) --- .gitmodules | 3 --- door_admin | 1 - 2 files changed, 4 deletions(-) delete mode 160000 door_admin diff --git a/.gitmodules b/.gitmodules index 5457669..36dc482 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "door_control"] path = door_control url = ssh://irgit@imaginaerraum.de:2201/apo/DoorControl.git -[submodule "door_admin"] - path = door_admin - url = ssh://irgit@imaginaerraum.de:2201/Telos4/DoorAdmin.git diff --git a/door_admin b/door_admin deleted file mode 160000 index 253db84..0000000 --- a/door_admin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 253db849fff70b602ad346734d9c3b03818cd1eb From 15ce23ca53f7df327375dfd1dd66c021758b25ea Mon Sep 17 00:00:00 2001 From: Simon Pirkelmann Date: Mon, 15 Mar 2021 23:34:23 +0100 Subject: [PATCH 7/7] 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))