br_external/package/door_pi_control/door_pi_control.mk

@@ -1,4 +1,4 @@
-DOOR_PI_CONTROL_VERSION = 9358dfc74b119840c868157c075a53302263a958
+DOOR_PI_CONTROL_VERSION = 082460389067519886b27bdcbfa88903e0451cf2
 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

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

config

@@ -512,7 +512,7 @@ BR2_SYSTEM_DHCP="wlan0"
 BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST="C en_US en_US.UTF-8"
-BR2_GENERATE_LOCALE="en_US.UTF-8"
+BR2_GENERATE_LOCALE=""
 # BR2_SYSTEM_ENABLE_NLS is not set
 # BR2_TARGET_TZ_INFO is not set
 BR2_ROOTFS_USERS_TABLES=""
@@ -605,24 +605,7 @@ BR2_PACKAGE_SKELETON_INIT_SYSV=y
 #
 # Audio and video applications
 #
-BR2_PACKAGE_ALSA_UTILS=y
+# BR2_PACKAGE_ALSA_UTILS is not set
-BR2_PACKAGE_ALSA_UTILS_ALSACONF=y
-# BR2_PACKAGE_ALSA_UTILS_ACONNECT is not set
-BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
-# BR2_PACKAGE_ALSA_UTILS_ALSALOOP is not set
-BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
-# BR2_PACKAGE_ALSA_UTILS_ALSAUCM is not set
-# BR2_PACKAGE_ALSA_UTILS_ALSATPLG is not set
-# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_AMIXER is not set
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-# BR2_PACKAGE_ALSA_UTILS_APLAYMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
-# BR2_PACKAGE_ALSA_UTILS_BAT is not set
-# BR2_PACKAGE_ALSA_UTILS_IECSET is not set
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 # BR2_PACKAGE_ATEST is not set
 # BR2_PACKAGE_AUMIX is not set
 # BR2_PACKAGE_BLUEZ_ALSA is not set
@@ -672,7 +655,7 @@ BR2_PACKAGE_KODI_ARCH_SUPPORTS=y
 # BR2_PACKAGE_PIPEWIRE is not set
 BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC=y
 # BR2_PACKAGE_PULSEAUDIO is not set
-BR2_PACKAGE_SOX=y
+# BR2_PACKAGE_SOX is not set
 # BR2_PACKAGE_SQUEEZELITE is not set
 # BR2_PACKAGE_TOVID is not set
 # BR2_PACKAGE_TSTOOLS is not set
@@ -1800,21 +1783,7 @@ BR2_PACKAGE_PYTHON_WTFORMS=y
 #
 # Audio/Sound
 #
-BR2_PACKAGE_ALSA_LIB=y
+# BR2_PACKAGE_ALSA_LIB is not set
-# BR2_PACKAGE_ALSA_LIB_PYTHON is not set
-BR2_PACKAGE_ALSA_LIB_DEVDIR="/dev/snd"
-BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_ALOAD=y
-BR2_PACKAGE_ALSA_LIB_MIXER=y
-BR2_PACKAGE_ALSA_LIB_PCM=y
-BR2_PACKAGE_ALSA_LIB_RAWMIDI=y
-BR2_PACKAGE_ALSA_LIB_HWDEP=y
-BR2_PACKAGE_ALSA_LIB_SEQ=y
-BR2_PACKAGE_ALSA_LIB_UCM=y
-BR2_PACKAGE_ALSA_LIB_ALISP=y
-BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
-# BR2_PACKAGE_ALSA_PLUGINS is not set
 # BR2_PACKAGE_ALURE is not set
 # BR2_PACKAGE_AUBIO is not set
 # BR2_PACKAGE_BCG729 is not set

kernel.config

@@ -20,28 +20,3 @@ CONFIG_WLAN=y
 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,7 @@
 #!/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
-		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 -- /usr/bin/door_pi_control
-	fi
-	if [ ! -f /tmp/debugging_door_pi_control ]; then
-		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