apo/DoorPi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: apo:baad4190fe23ddcd3aa38d9235439cee779979d0
Branches Tags
apo:main
apo:new-webinterface
apo:devel-webiface
...
compare: apo:15ce23ca53f7df327375dfd1dd66c021758b25ea
Branches Tags
apo:main
apo:new-webinterface
apo:devel-webiface

3 Commits
baad4190fe ... 15ce23ca53

Author SHA1 Message Date
Simon Pirkelmann
15ce23ca53 use setuptools build system for python package for web interface 2021-03-15 23:34:23 +01:00
Simon Pirkelmann
0abff3484c removed submodule (no longer necessary, since we are now using builtroot external package) 2021-03-14 17:31:36 +01:00
Simon Pirkelmann
93b8e76565 new version of webinterface with navbar 2021-03-14 17:28:18 +01:00
6 changed files with 13 additions and 21 deletions
Show Stats Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,6 +4,3 @@
[submodule "door_control"] [submodule "door_control"]
path = door_control path = door_control
url = ssh://irgit@imaginaerraum.de:2201/apo/DoorControl.git url = ssh://irgit@imaginaerraum.de:2201/apo/DoorControl.git
[submodule "door_admin"]
path = door_admin
url = ssh://irgit@imaginaerraum.de:2201/Telos4/DoorAdmin.git

2
br_external/Config.in
View File

@ -1,3 +1,3 @@
source "$BR2_EXTERNAL_DOOR_PI_PATH/package/poll_desfire/Config.in" 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/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"

15
br_external/package/door_admin/door_admin.mk
View File

@ -1,15 +0,0 @@
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))

4
br_external/package/door_admin/Config.in → br_external/package/python-door-admin/Config.in
View File

@ -1,8 +1,10 @@
config BR2_PACKAGE_DOOR_ADMIN config BR2_PACKAGE_PYTHON_DOOR_ADMIN
bool "door_admin" bool "door_admin"
select BR2_PACKAGE_PYTHON_PAHO_MQTT select BR2_PACKAGE_PYTHON_PAHO_MQTT
select BR2_PACKAGE_PYTHON_BCRYPT
select BR2_PACKAGE_PYTHON_BLEACH select BR2_PACKAGE_PYTHON_BLEACH
select BR2_PACKAGE_PYTHON_FLASK select BR2_PACKAGE_PYTHON_FLASK
select BR2_PACKAGE_PYTHON_FLASK_MAIL
select BR2_PACKAGE_PYTHON_FLASK_WTF select BR2_PACKAGE_PYTHON_FLASK_WTF
select BR2_PACKAGE_PYTHON_FLASK_SECURITY_TOO select BR2_PACKAGE_PYTHON_FLASK_SECURITY_TOO
select BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY select BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY

9
br_external/package/python-door-admin/door_admin.mk Normal file
View File

@ -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))

1
door_admin

@ -1 +0,0 @@
Subproject commit daed27372bdbeb7d0fe5995b9c411b09a1e7b831