switched to new version of buildroot fork

.gitignore

@@ -2,5 +2,5 @@
 /root_overlay/etc/door_tokens
 /root_overlay/etc/dropbear
 /root_overlay/root/key
-/root_overlay/etc/wpa_supplicant
+/root_overlay/bin/test.py
-/root_overlay/root/.ssh/authorized_keys
+/root_overlay/bin/poll_desfire

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "buildroot"]
 	path = buildroot
 	url = https://github.com/Telos4/buildroot.git
+[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

Makefile

@@ -7,17 +7,16 @@ sdcard.img: buildroot/.config
 	make -C buildroot all
 	cp buildroot/output/images/sdcard.img sdcard.img
 
+root_overlay: root_overlay/bin/test.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
 root_overlay: root_overlay/root/.ssh/authorized_keys
 root_overlay: root_overlay/root/key
 
 root_overlay/root/.ssh/authorized_keys: ~/.ssh/id_rsa.pub
-	mkdir -p `dirname $@`
+	cp ^< $@
-	cp $< $@
 
-buildroot/.config:
+buildroot/.config: config
 	ln -sf ../config $@
 
 root_overlay/etc/door_tokens:
@@ -28,21 +27,21 @@ root_overlay/root/key:
 	mkdir -p `dirname $@`
 	dd if=/dev/urandom of=$@ bs=1 count=16
 
-root_overlay/etc/dropbear/dropbear_ecdsa_host_key:
+root_overlay/bin/test.py: door_control/door.py
-	sh -c 'if [[ ! -f $@ && ! -f $@.openssh ]]; then mkdir -p `dirname $@` && ssh-keygen -t ecdsa -f $@.openssh; fi'
-
-root_overlay/etc/wpa_supplicant/wpa_supplicant.conf:
 	mkdir -p `dirname $@`
-	@echo "Please enter the passphrase for the space wifi:"
+	cp $< $@
-	wpa_passphrase Space > $@
+
+root_overlay/etc/dropbear/dropbear_ecdsa_host_key:
+	mkdir -p `dirname $@`
+	ssh-keygen -t ecdsa -f $@
 
 clean:
 	make -C buildroot clean
 	rm -f sdcard.img
 	rm -f root_overlay/root/.ssh/authorized_keys
+	rm -f root_overlay/bin/test.py
 
-menuconfig: buildroot/.config
+menuconfig:
-	make -C buildroot BR2_EXTERNAL=../br_external menuconfig
+	make -C buildroot menuconfig
-	if [[ ! -L buildroot/.config ]]; then mv buildroot/.config config && ln -s ../config buildroot/.config; fi
 
-.PHONY: all clean sdcard.img menuconfig root_overlay root_overlay/etc/dropbear/dropbear_ecdsa_host_key
+.PHONY: all clean sdcard.img menuconfig root_overlay

br_external/Config.in

@@ -1,5 +1,2 @@
 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"
-source "$BR2_EXTERNAL_DOOR_PI_PATH/package/python_wheel/Config.in.host"

br_external/package/door_pi_control/Config.in

@@ -1,8 +0,0 @@
-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
-    select BR2_PACKAGE_HOST_PYTHON_WHEEL
-    help
-        https://git.imaginaerraum.de/apo/DoorControl

br_external/package/door_pi_control/door_pi_control.mk

@@ -1,8 +0,0 @@
-DOOR_PI_CONTROL_VERSION = 9358dfc74b119840c868157c075a53302263a958
-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 = pep517
-DOOR_PI_CONTROL_DEPENDENCIES = host-python_wheel
-$(eval $(python-package))

br_external/package/poll_desfire/poll_desfire.mk

@@ -1,5 +1,5 @@
-POLL_DESFIRE_VERSION = e39aa4abb0f8cd635d9f88f8a750ad00ca3546b5
+POLL_DESFIRE_VERSION = 0.0.1
-POLL_DESFIRE_SOURCE = $(POLL_DESFIRE_VERSION).tar.gz
+POLL_DESFIRE_SOURCE = poll_desfire_v$(POLL_DESFIRE_VERSION).tar.gz
 POLL_DESFIRE_SITE = https://git.imaginaerraum.de/apo/PollDesfire/archive
 POLL_DESFIRE_DEPENDENCIES = libfreefare_git host-pkgconf
 POLL_DESFIRE_LICENSE = GPL-3.0

br_external/package/python-door-admin/Config.in

@@ -1,17 +0,0 @@
-config BR2_PACKAGE_PYTHON_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
-	select BR2_PACKAGE_PYTHON_LDAP3
-	select BR2_PACKAGE_PYTHON_EMAIL_VALIDATOR
-	select BR2_PACKAGE_PYTHON3_SSL
-	help
-	    Simple web interface for door token adminstration
-	    
-	    https://git.imaginaerraum.de/Telos4/DoorAdmin

br_external/package/python-door-admin/door_admin.mk

@@ -1,9 +0,0 @@
-PYTHON_DOOR_ADMIN_VERSION = 8e868f16747fc56daa29a0cdcd77d9b7fff10711
-PYTHON_DOOR_ADMIN_SOURCE = $(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))

br_external/package/python_wheel/Config.in.host

@@ -1,5 +0,0 @@
-config BR2_PACKAGE_HOST_PYTHON_WHEEL
-    bool "host python-wheel"
-    select BR2_PACKAGE_PYTHON3
-    help
-        https://github.com/pypa/wheel

br_external/package/python_wheel/python_wheel.mk

@@ -1,7 +0,0 @@
-PYTHON_WHEEL_VERSION = 0.38.2
-PYTHON_WHEEL_SOURCE = $(PYTHON_WHEEL_VERSION).tar.gz
-PYTHON_WHEEL_SITE = https://github.com/pypa/wheel/archive/refs/tags
-PYTHON_WHEEL_LICENSE = GPL-3.0
-PYTHON_WHEEL_LICENSE_FILES = LICENSE
-PYTHON_WHEEL_SETUP_TYPE = distutils
-$(eval $(host-python-package))

buildroot

@@ -1 +1 @@
-Subproject commit 4ffa34edc1b26ff038c95bf62eccada4bf0c1492
+Subproject commit 1a18f2a06f1780d522d03e068b8dc75a0169dc73

door_admin

@@ -0,0 +1 @@
+Subproject commit 55c4f6ea7ffd0f0b8bf0c5afbb5f2cdb68722073

door_control

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

kernel.config

@@ -1,47 +0,0 @@
-# spidev
-CONFIG_SPI_SPIDEV=y
-
-# spi nor
-CONFIG_MTD=y
-CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_MTD_M25P80=y
-
-# wireless core
-CONFIG_WIRELESS=y
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
-CONFIG_CFG80211_WEXT=y
-
-# wireless drivers
-CONFIG_WLAN=y
-
-# ondemand cpufreq governor
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-
-CONFIG_USB_ACM=y
-
-CONFIG_OF_LIBFDT_OVERLAY=y
-
-CONFIG_ARM=y
-CONFIG_SOUND=y
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_ARM=y
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_DMAENGINE_PCM=y
-CONFIG_SND_SUNXI_SOC_AUDIOCODEC=y
-CONFIG_SND_SUNXI_SOC_PUBLUC_MACHINE=y
-CONFIG_SND_SUN8IW7_SNDCODEC=y
-CONFIG_SND_SUNXI_SOC_DAUDIO0_INTERFACE=y
-CONFIG_SND_SUNXI_SOC_DAUDIO1_INTERFACE=y
-CONFIG_SND_SUNXI_SOC_SPDIF=y
-CONFIG_SND_SUNXI_SOC_AUDIOHUB_INTERFACE=y
-CONFIG_SND_SUN8IW7_AUDIOHUB=y
-CONFIG_SND_SOC_I2C_AND_SPI=y

root_overlay/bin/exec_cmd.py

@@ -1,13 +0,0 @@
-#!/usr/bin/python
-import socket
-import sys
-sock = socket.socket(socket.AF_UNIX)
-sock.connect("/tmp/nfc.sock")
-sock.settimeout(1)
-
-for cmd in sys.argv[1:]:
-	sock.send(cmd.encode('utf-8') + b'\n')
-	try:
-		print(sock.recv(1024))
-	except socket.timeout:
-		continue

root_overlay/bin/watcher

@@ -1,11 +1,6 @@
 #!/bin/sh
 while true; do
-	if [ ! -f /tmp/debugging_poll_desfire ]; then
 	start-stop-daemon -S -m -p /tmp/poll_desfire.pid -x /bin/poll_desfire -b -- /root/key /tmp/nfc_fifo
-	fi
+	start-stop-daemon -v -p /tmp/fcpy.pid -S -b -m -v -x /usr/bin/python -- /bin/test.py
-	if [ ! -f /tmp/debugging_door_pi_control ]; then
+	sleep 30
-		start-stop-daemon -v -p /tmp/fcpy.pid -S -b -m -v -x /usr/bin/python -- /usr/bin/door_pi_control --log_host 10.11.1.1:5556
-	fi
-	#start-stop-daemon -v -p /tmp/webiface.pid -S -b -m -v -x /usr/bin/python -- /usr/bin/launch_webadmin
-	sleep 5
 done

root_overlay/etc/admins.conf

@@ -1,2 +0,0 @@
-Telos4 simon.pirkelmann@gmail.com LDAP
-apo a@0au.de LDAP

root_overlay/etc/init.d/S40dropbearkey.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-[[ ! -f /etc/dropbear/dropbear_ecdsa_host_key && -f /etc/dropbear/host_key ]] && dropbearconvert openssh dropbear /etc/dropbear/host_key /etc/dropbear/dropbear_ecdsa_host_key

root_overlay/etc/init.d/S99nfc.sh

@@ -1,3 +1,3 @@
-rm /tmp/nfc_fifo
+mkfifo /var/nfc_fifo
-mkfifo /tmp/nfc_fifo
+start-stop-daemon -S -m -p /tmp/watcher.pid      -x /bin/watcher -b
-start-stop-daemon -v -p /tmp/watcher.pid -S -b -m -v -x /bin/sh -- /bin/watcher
+

root_overlay/etc/nfc/libnfc.conf

@@ -1,3 +1,2 @@
 device.name="reader"
-device.connstring="pn532_uart:/dev/serial/by-id/usb-Imaginaerraum.de_DoorControl_433632201350535727003F0-if03"
+device.connstring="pn532_uart:/dev/serial/by-id/usb-Imaginaerraum.de_DoorControl_43363220195053573A002C0-if03"
-

root_overlay/root/.config/htop/htoprc

@@ -1,37 +0,0 @@
-# Beware! This file is rewritten by htop when settings are changed in the interface.
-# The parser is also very primitive, and not human-friendly.
-fields=0 48 17 18 38 39 40 2 46 47 49 1
-sort_key=46
-sort_direction=1
-tree_sort_key=0
-tree_sort_direction=1
-hide_kernel_threads=1
-hide_userland_threads=1
-shadow_other_users=0
-show_thread_names=0
-show_program_path=1
-highlight_base_name=0
-highlight_megabytes=1
-highlight_threads=1
-highlight_changes=0
-highlight_changes_delay_secs=5
-find_comm_in_cmdline=1
-strip_exe_from_cmdline=1
-show_merged_command=0
-tree_view=1
-tree_view_always_by_pid=0
-header_margin=1
-detailed_cpu_time=0
-cpu_count_from_one=0
-show_cpu_usage=1
-show_cpu_frequency=0
-update_process_names=0
-account_guest_in_cpu_meter=0
-color_scheme=0
-enable_mouse=1
-delay=15
-left_meters=AllCPUs Memory Swap
-left_meter_modes=1 1 1
-right_meters=Tasks LoadAverage Uptime
-right_meter_modes=2 2 2
-hide_function_bar=0

root_overlay/root/.ssh/authorized_keys

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5pAEc3dFnR7zDtdIaH3ICBQincnxs7HlIi+JEfl3M23S/wkQASE9hDpNwAF/CRu9u2cjnXgHNqVG0TkKyjWgfXk9tTpyVBNw8QkHQ75TpbKsuhWQm/LgYb874j4+2pDGxLLdVVuY1c73vNQqkHL0xS3aG/dtvCc7XMNg5VRWdwL3WPhkmuBQK7JYUkUnf+dZWS91oJWZHd/OEU/H9p147UGw3ffLQ9H+IKxl3pvEMKz8Aeca1sDtSS0Z2LXzh3au5KynMR6KHBX9QUM3Bkoy20QqnNZz/sQX04NrOigoPDOFRlOaeIXeZvecZRP7LnTy7JviWFylMwziwzEJslDLN apo@mae