Compare commits

...

2 Commits

Author SHA1 Message Date
Valentin Ochs 842408501f Move control program to br externals instead of submodule 2021-08-11 10:52:21 +02:00
Valentin Ochs b847a87b85 Fix indentation 2021-08-11 08:22:36 +02:00
5 changed files with 17 additions and 7 deletions

View File

@ -7,7 +7,6 @@ sdcard.img: buildroot/.config
make -C buildroot all
cp buildroot/output/images/sdcard.img sdcard.img
root_overlay: root_overlay/bin/door.py
root_overlay: root_overlay/etc/door_tokens
root_overlay: root_overlay/etc/dropbear/dropbear_ecdsa_host_key
root_overlay: root_overlay/etc/wpa_supplicant/wpa_supplicant.conf
@ -29,10 +28,6 @@ root_overlay/root/key:
mkdir -p `dirname $@`
dd if=/dev/urandom of=$@ bs=1 count=16
root_overlay/bin/door.py: door_control/door.py
mkdir -p `dirname $@`
cp $< $@
root_overlay/etc/dropbear/dropbear_ecdsa_host_key:
sh -c 'if [[ ! -f $@ && ! -f $@.openssh ]]; then mkdir -p `dirname $@` && ssh-keygen -t ecdsa -f $@.openssh; fi'
@ -45,7 +40,6 @@ clean:
make -C buildroot clean
rm -f sdcard.img
rm -f root_overlay/root/.ssh/authorized_keys
rm -f root_overlay/bin/door.py
menuconfig: buildroot/.config
make -C buildroot menuconfig

View File

@ -1,3 +1,4 @@
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/python-door-admin/Config.in"
source "$BR2_EXTERNAL_DOOR_PI_PATH/package/door_pi_control/Config.in"

View File

@ -0,0 +1,7 @@
config BR2_PACKAGE_DOOR_PI_CONTROL
bool "door_pi_control"
select BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_PAHO_MQTT
select BR2_PACKAGE_PYTHON_SERIAL
help
https://git.imaginaerraum.de/apo/DoorControl

View File

@ -0,0 +1,8 @@
DOOR_PI_CONTROL_VERSION = d7fc4e366bf2354700b86c0cd0d8319ed9ce37fd
DOOR_PI_CONTROL_SOURCE = $(DOOR_PI_CONTROL_VERSION).tar.gz
DOOR_PI_CONTROL_SITE = https://git.imaginaerraum.de/apo/DoorControl/archive
DOOR_PI_CONTROL_LICENSE = GPL-3.0
DOOR_PI_CONTROL_LICENSE_FILES = LICENSE
DOOR_PI_CONTROL_SETUP_TYPE = setuptools
$(eval $(python-package))

View File

@ -2,6 +2,6 @@
while true; do
start-stop-daemon -S -m -p /tmp/poll_desfire.pid -x /bin/poll_desfire -b -- /root/key /tmp/nfc_fifo
start-stop-daemon -v -p /tmp/fcpy.pid -S -b -m -v -x /usr/bin/python -- /bin/door.py
start-stop-daemon -v -p /tmp/webiface.pid -S -b -m -v -x /usr/bin/python -- /usr/bin/launch_webadmin
start-stop-daemon -v -p /tmp/webiface.pid -S -b -m -v -x /usr/bin/python -- /usr/bin/launch_webadmin
sleep 30
done