idek

Makefile

@@ -17,7 +17,7 @@ root_overlay/root/.ssh/authorized_keys: ~/.ssh/id_rsa.pub
 	mkdir -p `dirname $@`
 	cp $< $@
 
-buildroot/.config: config
+buildroot/.config:
 	ln -sf ../config $@
 
 root_overlay/etc/door_tokens:
@@ -42,7 +42,7 @@ clean:
 	rm -f root_overlay/root/.ssh/authorized_keys
 
 menuconfig: buildroot/.config
-	make -C buildroot menuconfig
+	make -C buildroot BR2_EXTERNAL=../br_external 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

br_external/Config.in

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

br_external/package/door_pi_control/Config.in

@@ -3,5 +3,6 @@ config BR2_PACKAGE_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 +1,8 @@
-DOOR_PI_CONTROL_VERSION = 6f7e8eab79c728bd807a285b647710f60181caf7
+DOOR_PI_CONTROL_VERSION = 1ef8bd828cb149e2bdaedf5779bba8a6269fbc5d
 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
-
+DOOR_PI_CONTROL_SETUP_TYPE = pep517
+DOOR_PI_CONTROL_DEPENDENCIES = host-python_wheel
 $(eval $(python-package))

br_external/package/python_wheel/Config.in.host

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

@@ -0,0 +1,7 @@
+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 f14ba5c1a49f9e67942ecc745eb5be068da9f681
+Subproject commit 4ffa34edc1b26ff038c95bf62eccada4bf0c1492

root_overlay/bin/door.py

@@ -1,3 +0,0 @@
-#!/usr/bin/python3
-from door_pi_control import main
-main()

root_overlay/bin/watcher

@@ -1,7 +1,7 @@
 #!/bin/sh
 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/fcpy.pid -S -b -m -v -x /usr/bin/python -- /usr/bin/door_pi_control
+	#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

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

root_overlay/etc/nfc/libnfc.conf

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

root_overlay/root/.config/htop/htoprc

@@ -0,0 +1,37 @@
+# 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