Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/guysoft/OctoPi.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Sheffer <guysoft@gmail.com>2022-07-17 10:31:39 +0300
committerGuy Sheffer <guysoft@gmail.com>2022-07-17 10:31:39 +0300
commitec90e9a892710ee59652970c68b9aea14029e77e (patch)
tree7ab374155c497a72913eabf6e26487f5a386b02d
parent86f398c133e78e8023047a94ea343379ea4b1549 (diff)
Fix building for armv7 on a arm64 kernel adn 32bit userspace #784 Fixes #787
-rwxr-xr-xsrc/modules/octopi/start_chroot_script6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/octopi/start_chroot_script b/src/modules/octopi/start_chroot_script
index 91e08e9..87bb515 100755
--- a/src/modules/octopi/start_chroot_script
+++ b/src/modules/octopi/start_chroot_script
@@ -124,6 +124,11 @@ EOT
then
apt-get install -y --force-yes --no-install-recommends nginx
+ ARCH=arm
+ if [ "${BASE_ARCH}" == "aarch64"]; then
+ ARCH=aarch64
+ fi
+
FFMPEG_BUILD_DIR=$(mktemp -d)
pushd ${FFMPEG_BUILD_DIR}
FFMPEG_ARCHIVE=ffmpeg.tar.gz
@@ -131,6 +136,7 @@ EOT
tar xvzf ${FFMPEG_ARCHIVE}
cd FFmpeg*
./configure \
+ --arch="${ARCH}" \
--disable-doc \
--disable-htmlpages \
--disable-manpages \