Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to buildroot 2024.02.5 #299

Merged
merged 12 commits into from
Jan 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion board/fischertechnik/TXT/rootfs/etc/fw-ver.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.5
1.1.0
2 changes: 1 addition & 1 deletion buildroot
Submodule buildroot updated 5180 files
38 changes: 19 additions & 19 deletions configs/fischertechnik_TXT_rootfs_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH)/board/fischer
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.14.97"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.14.336"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH)/board/fischertechnik/TXT/patches/linux"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH)/board/fischertechnik/TXT/linux_defconfig"
Expand Down Expand Up @@ -57,6 +57,7 @@ BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
BR2_PACKAGE_PSPLASH=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5BASE_WIDGETS=y
BR2_PACKAGE_QT5BASE_XCB=y
BR2_PACKAGE_QT5BASE_DEFAULT_QPA="xcb"
BR2_PACKAGE_QT5BASE_FONTCONFIG=y
Expand Down Expand Up @@ -111,22 +112,24 @@ BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_GNUTLS=y
BR2_PACKAGE_GNUTLS_TOOLS=y
BR2_PACKAGE_LIBSYSFS=y
BR2_PACKAGE_ATK=y
BR2_PACKAGE_CAIRO_PS=y
BR2_PACKAGE_CAIRO_XML=y
BR2_PACKAGE_OPENCV3=y
BR2_PACKAGE_OPENCV3_WITH_QT5=y
BR2_PACKAGE_OPENCV3_LIB_PYTHON=y
BR2_PACKAGE_OPENCV3_LIB_SHAPE=y
BR2_PACKAGE_OPENCV3_LIB_STITCHING=y
BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y
BR2_PACKAGE_OPENCV3_LIB_TS=y
BR2_PACKAGE_OPENCV3_LIB_VIDEOSTAB=y
BR2_PACKAGE_OPENCV3_BUILD_TESTS=y
BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS=y
BR2_PACKAGE_OPENCV3_WITH_JPEG=y
BR2_PACKAGE_OPENCV3_WITH_PNG=y
BR2_PACKAGE_OPENCV3_WITH_V4L=y
BR2_PACKAGE_OPENCV4=y
BR2_PACKAGE_OPENCV4_LIB_PYTHON=y
BR2_PACKAGE_OPENCV4_LIB_SHAPE=y
BR2_PACKAGE_OPENCV4_LIB_STITCHING=y
BR2_PACKAGE_OPENCV4_LIB_SUPERRES=y
BR2_PACKAGE_OPENCV4_LIB_TS=y
BR2_PACKAGE_OPENCV4_LIB_VIDEOSTAB=y
BR2_PACKAGE_OPENCV4_WITH_JPEG=y
BR2_PACKAGE_OPENCV4_WITH_PNG=y
BR2_PACKAGE_OPENCV4_WITH_TIFF=y
BR2_PACKAGE_OPENCV4_WITH_V4L=y
BR2_PACKAGE_OPENCV4_CONTRIB=y
BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ARUCO=y
BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BARCODE=y
BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STEREO=y
BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XFEATURES2D=y
BR2_PACKAGE_PANGO=y
BR2_PACKAGE_ZBAR=y
BR2_PACKAGE_LIBV4L_UTILS=y
Expand All @@ -136,10 +139,8 @@ BR2_PACKAGE_LIBNETFILTER_CTHELPER=y
BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT=y
BR2_PACKAGE_LIBNETFILTER_QUEUE=y
BR2_PACKAGE_LIBNFTNL=y
BR2_PACKAGE_LIBCAP_NG=y
BR2_PACKAGE_LINUX_PAM=y
BR2_PACKAGE_NCURSES_TARGET_PROGS=y
BR2_PACKAGE_PCRE_16=y
BR2_PACKAGE_AESPIPE=y
BR2_PACKAGE_ARPTABLES=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
Expand Down Expand Up @@ -201,8 +202,7 @@ BR2_PACKAGE_PYTHON_FTTXPY=y
BR2_PACKAGE_PYTHON_LIBROBOINT=y
BR2_PACKAGE_PYTHON_LUMALED_MATRIX=y
BR2_PACKAGE_PYTHON_LUMAOLED=y
BR2_PACKAGE_PYTHON_PANDAS=n
BR2_PACKAGE_PYTHON_ROBOLT=y
BR2_PACKAGE_PYTHON_SEMANTIC_VERSION1=y
BR2_PACKAGE_PYTHON_SIP_QT5=y
BR2_PACKAGE_PYTHON_ZBARLIGHT=y
BR2_PACKAGE_PYTHON_SIP_QT5=y
26 changes: 26 additions & 0 deletions install_ssh.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/bash
set -e

[[ $# == 1 ]] || { echo "$0 hostname"; exit 1; }

txt=$1

files="am335x-kno_txt.dtb uImage rootfs.img"
boot=/media/sdcard/boot

read -s -p "Password for root@$txt?" p
echo

cd output/images/

echo "Preparing"
export SSHPASS=$p
sshpass -e ssh root@$txt mkdir -p $boot/new $boot/old

echo "Copying"
sshpass -e rsync -tv --progress $files root@$txt:$boot/new

echo "Activating"
sshpass -e ssh root@$txt "cd $boot && mv $files old && mv new/* ."
echo "Success, rebooting"
sshpass -e ssh root@$txt reboot
1 change: 0 additions & 1 deletion package/libroboint/libroboint.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ LIBROBOINT_VERSION = cf25fdba52ad1343317afca683d8b272682f0077
LIBROBOINT_SITE = $(call gitlab,Humpelstilzchen,libroboint,$(LIBROBOINT_VERSION))
LIBROBOINT_LICENSE = LGPLv2.1
LIBROBOINT_DEPENDENCIES = libusb host-libusb libusb-compat host-libusb-compat binutils
LIBROBOINT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install

$(eval $(cmake-package))
44 changes: 0 additions & 44 deletions patches/python-sip/0001-fixframe.patch

This file was deleted.

45 changes: 45 additions & 0 deletions patches/x11vnc/0003-Fix-multi-definition.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <[email protected]>
Date: Tue, 28 Jan 2020 22:21:01 +0300
Subject: [PATCH] Fix build with -fno-common

GCC 10 defaults to -fno-common
---
src/util.c | 3 +++
src/util.h | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/util.c b/src/util.c
index a82a1a4..6a52ebf 100644
--- a/src/util.c
+++ b/src/util.c
@@ -47,6 +47,9 @@ int hxl = 0;
#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
MUTEX(x11Mutex);
MUTEX(scrollMutex);
+MUTEX(clientMutex);
+MUTEX(inputMutex);
+MUTEX(pointerMutex);
#endif

int nfix(int i, int n);
diff --git a/src/util.h b/src/util.h
index 35c1afd..99b5dd1 100644
--- a/src/util.h
+++ b/src/util.h
@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
#ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
extern MUTEX(x11Mutex);
extern MUTEX(scrollMutex);
-MUTEX(clientMutex);
-MUTEX(inputMutex);
-MUTEX(pointerMutex);
+extern MUTEX(clientMutex);
+extern MUTEX(inputMutex);
+extern MUTEX(pointerMutex);
#endif

#define X_INIT INIT_MUTEX(x11Mutex)
--
2.24.1