From c75c98e25251325b679472596330c234af2bb697 Mon Sep 17 00:00:00 2001 From: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> Date: Tue, 15 Mar 2022 20:41:28 +0100 Subject: [PATCH] Update flatbuffers submodule --- .gitignore | 3 +++ dependencies/external/flatbuffers | 2 +- doc/development/CompileHowto.md | 16 ++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 40563443..f86f420b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ CMakeSettings.json # LedDevice 'File' output NULL + +# Docker deploy folder +deploy/* diff --git a/dependencies/external/flatbuffers b/dependencies/external/flatbuffers index 97a30171..8468eab8 160000 --- a/dependencies/external/flatbuffers +++ b/dependencies/external/flatbuffers @@ -1 +1 @@ -Subproject commit 97a30171cb8a772741a9a58f92b9df47e9ca21d6 +Subproject commit 8468eab83bacc8bbd6cb5ae22197af06a9437b2d diff --git a/doc/development/CompileHowto.md b/doc/development/CompileHowto.md index 312a70f1..45b3b846 100644 --- a/doc/development/CompileHowto.md +++ b/doc/development/CompileHowto.md @@ -9,7 +9,7 @@ Note: call the script with `./docker-compile.sh -h` for more options. **Raspbian Stretch** ```console -wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i rpi-raspbian +wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i rpi-raspbian -t stretch ``` **Raspbian Buster/Raspberry Pi OS** ```console @@ -17,14 +17,14 @@ wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/ ``` **Raspberry Pi OS Bullseye** ```console -wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i rpi-raspbian -t bullseye +wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i rpi-raspbian ``` ## Cross compilation on x86_64 for: **x86_64 (Debian Stretch):** ```console -wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i x86_64 +wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i x86_64 -t stretch ``` **x86_64 (Debian Buster):** ```console @@ -32,11 +32,11 @@ wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/ ``` **x86_64 (Debian Bullseye):** ```console -wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i x86_64 -t bullseye +wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i x86_64 ``` **Raspberry Pi v1 & ZERO (Debian Stretch)** ```console -wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i armv6l +wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i armv6l -t stretch ``` **Raspberry Pi v1 & ZERO (Debian Buster)** ```console @@ -44,11 +44,11 @@ wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/ ``` **Raspberry Pi v1 & ZERO (Debian Bullseye)** ```console -wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i armv6l -t bullseye +wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i armv6l ``` **Raspberry Pi 2/3/4 (Debian Stretch)** ```console -wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i armv7l +wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i armv7l -t stretch ``` **Raspberry Pi 2/3/4 (Debian Buster)** ```console @@ -56,7 +56,7 @@ wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/ ``` **Raspberry Pi 2/3/4 (Debian Bullseye)** ```console -wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i armv7l -t bullseye +wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh -i armv7l ``` ## Cross compilation on x86_64 for developers Using additional options you can cross compile locally