a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From dfa9555010535003eac69788597f53d3ff44168f Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Thu, 29 Nov 2018 23:33:10 +0100
|
|
Subject: [PATCH] qsgtexture: fix debug build with uclibc
|
|
|
|
Debug build of gsgtexture fails on uclibc since version 5.11 and
|
|
https://github.com/qt/qtdeclarative/commit/7c507eaac3f848f92f2ebdafe8ded4a064d68351:
|
|
|
|
scenegraph/util/qsgtexture.cpp:69:22: fatal error: execinfo.h: No such file or directory
|
|
#include <execinfo.h>
|
|
|
|
Indeed, !defined(__UCLIBC__) has been replaced by defined(__GBLIBC__) to
|
|
fix build on musl but as a result, build fails on uclibc because uclibc
|
|
also defines __GLIBC__ (and it does not have execinfo like musl)
|
|
|
|
This error is raised only when building in debug mode because
|
|
CAN_BACKTRACE_EXECINFO is undefined if QT_NO_DEBUG is set
|
|
|
|
So keep defined(__GLIBC__), but put back !defined(__UCLIBC__)
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/6fce0ce5aea943e097532efbbc8d1e28f41e5866
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/qt/qtdeclarative/pull/4]
|
|
[Rebased for Qt5.14.0]
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
src/quick/scenegraph/coreapi/qsgtexture.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp
|
|
index dfbe4d3f..6a7bc79b 100644
|
|
--- a/src/quick/scenegraph/coreapi/qsgtexture.cpp
|
|
+++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp
|
|
@@ -46,7 +46,7 @@
|
|
#include <private/qsgmaterialshader_p.h>
|
|
#include <QtGui/private/qrhi_p.h>
|
|
|
|
-#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__)
|
|
+#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) && !defined(__UCLIBC__)
|
|
#define CAN_BACKTRACE_EXECINFO
|
|
#endif
|
|
|
|
--
|
|
2.23.0
|
|
|