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

Move control program to br externals instead of submodule

Browse Source
This commit is contained in:
Lynn Ochs 2021-08-11 10:52:21 +02:00
parent b847a87b85
commit abf97102d2
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "buildroot"] [submodule "buildroot"]
path = buildroot path = buildroot
url = https://github.com/Telos4/buildroot.git url = https://github.com/Telos4/buildroot.git
[submodule "door_control"]
path = door_control
url = ssh://irgit@imaginaerraum.de:2201/apo/DoorControl.git

6
Makefile
View File

@ -7,7 +7,6 @@ sdcard.img: buildroot/.config
make -C buildroot all make -C buildroot all
cp buildroot/output/images/sdcard.img sdcard.img 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/door_tokens
root_overlay: root_overlay/etc/dropbear/dropbear_ecdsa_host_key root_overlay: root_overlay/etc/dropbear/dropbear_ecdsa_host_key
root_overlay: root_overlay/etc/wpa_supplicant/wpa_supplicant.conf root_overlay: root_overlay/etc/wpa_supplicant/wpa_supplicant.conf
@ -29,10 +28,6 @@ root_overlay/root/key:
mkdir -p `dirname $@` mkdir -p `dirname $@`
dd if=/dev/urandom of=$@ bs=1 count=16 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: 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' 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 make -C buildroot clean
rm -f sdcard.img rm -f sdcard.img
rm -f root_overlay/root/.ssh/authorized_keys rm -f root_overlay/root/.ssh/authorized_keys
rm -f root_overlay/bin/door.py
menuconfig: buildroot/.config menuconfig: buildroot/.config
make -C buildroot menuconfig make -C buildroot menuconfig

1
br_external/Config.in
View File

@ -1,3 +1,4 @@
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/python-door-admin/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"

7
br_external/package/door_pi_control/Config.in Normal file
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

8
br_external/package/door_pi_control/door_pi_control.mk Normal file
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))

1
config
View File

@ -4824,3 +4824,4 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
BR2_PACKAGE_POLL_DESFIRE=y BR2_PACKAGE_POLL_DESFIRE=y
BR2_PACKAGE_LIBFREEFARE_GIT=y BR2_PACKAGE_LIBFREEFARE_GIT=y
BR2_PACKAGE_PYTHON_DOOR_ADMIN=y BR2_PACKAGE_PYTHON_DOOR_ADMIN=y
BR2_PACKAGE_DOOR_PI_CONTROL=y

1
door_control

@ -1 +0,0 @@
Subproject commit 0982a213dd055f3a5dba18c08bf7b9a730386a95