Bump buildroot to 2020.11-rc1 (#985)
* 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
This commit is contained in:
Stefan Agner
@@ -1,35 +0,0 @@
|
||||
From cb51ec369186628e016a10ccf25b2b26d5d2ef85 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 10 Feb 2020 21:31:36 +0100
|
||||
Subject: [PATCH] src/core/linux/SDL_threadprio.c: fix build without threads
|
||||
|
||||
Add an include on SDL_error.h to avoid the following build failure
|
||||
without threads:
|
||||
|
||||
/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: build/.libs/SDL_threadprio.o: in function `SDL_LinuxSetThreadPriority_REAL':
|
||||
SDL_threadprio.c:(.text+0x0): undefined reference to `SDL_Unsupported'
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/7f7712c5bd47de4a3fcec1e0d0526fd5a3ecd532
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://bugzilla.libsdl.org/show_bug.cgi?id=4971]
|
||||
---
|
||||
src/core/linux/SDL_threadprio.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/core/linux/SDL_threadprio.c b/src/core/linux/SDL_threadprio.c
|
||||
index 162b1a3f1..2cbc4cb48 100644
|
||||
--- a/src/core/linux/SDL_threadprio.c
|
||||
+++ b/src/core/linux/SDL_threadprio.c
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
#ifdef __LINUX__
|
||||
|
||||
+#include "SDL_error.h"
|
||||
#include "SDL_stdinc.h"
|
||||
|
||||
#if !SDL_THREADS_DISABLED
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 7c6d466d98910a2896680351cc5cea1b7fb37ab9 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 24 Mar 2020 13:33:40 +0100
|
||||
Subject: [PATCH] src/video/directfb/SDL_DirectFB_render.c: fix build
|
||||
|
||||
Build with directfb is broken due to a spurious '}' and a missing 'E'
|
||||
since version 2.0.12 and https://hg.libsdl.org/SDL/rev/2d5b5a5ccbfb:
|
||||
|
||||
/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c: In function 'SetBlendMode':
|
||||
/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c:202:9: error: case label not within a switch statement
|
||||
202 | case SDL_BLENDMODE_MUL:
|
||||
| ^~~~
|
||||
|
||||
/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c:205:67: error: 'DSBF_DSTCOLOR' undeclared (first use in this function); did you mean 'DSBF_DESTCOLOR'?
|
||||
205 | SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR));
|
||||
| ^~~~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/83ccefee68c2800c0544e6f40fa8bc8ee6b67b77
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from: https://hg.libsdl.org/SDL/rev/769f80095217]
|
||||
---
|
||||
src/video/directfb/SDL_DirectFB_render.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/video/directfb/SDL_DirectFB_render.c b/src/video/directfb/SDL_DirectFB_render.c
|
||||
index 618009850..cc31fb8f4 100644
|
||||
--- a/src/video/directfb/SDL_DirectFB_render.c
|
||||
+++ b/src/video/directfb/SDL_DirectFB_render.c
|
||||
@@ -198,11 +198,10 @@ SetBlendMode(DirectFB_RenderData * data, int blendMode,
|
||||
SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_SRCCOLOR));
|
||||
|
||||
break;
|
||||
- }
|
||||
case SDL_BLENDMODE_MUL:
|
||||
data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
|
||||
data->drawFlags = DSDRAW_BLEND;
|
||||
- SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR));
|
||||
+ SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DESTCOLOR));
|
||||
SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA));
|
||||
|
||||
break;
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User Paul Cercueil <paul@crapouillou.net>
|
||||
# Date 1576820863 28800
|
||||
# Node ID 4f5bef55183c677d12a7da8f3392879ed50670a3
|
||||
# Parent 01f16d7f36cb9f4fa02016e57fbe915fdea71cc8
|
||||
kmsdrm: Fix busy-loop within libc's dlopen()
|
||||
For some obscure reason, the order in which the libdrm/libgbm libraries
|
||||
are loaded matters.
|
||||
|
||||
Without this fix, the first call to check_modesetting() will work and
|
||||
load then unload all symbols properly, but the second call to this
|
||||
function will lock up as soon as dlopen() is called on libdrm.
|
||||
|
||||
Swapping the order in which the libdrm and libgbm libraries are loaded
|
||||
is enough to fix (or work around?) this issue.
|
||||
|
||||
Fixes #4891:
|
||||
https://bugzilla.libsdl.org/show_bug.cgi?id=4891
|
||||
|
||||
Upstream: https://hg.libsdl.org/SDL/rev/4f5bef55183c
|
||||
|
||||
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
|
||||
[yann.morin.1998@free.fr: add upstream commit URL]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
|
||||
diff -r 01f16d7f36cb -r 4f5bef55183c src/video/kmsdrm/SDL_kmsdrmdyn.c
|
||||
--- a/src/video/kmsdrm/SDL_kmsdrmdyn.c Thu Dec 19 21:45:44 2019 -0800
|
||||
+++ b/src/video/kmsdrm/SDL_kmsdrmdyn.c Thu Dec 19 21:47:43 2019 -0800
|
||||
@@ -50,8 +50,8 @@
|
||||
#endif
|
||||
|
||||
static kmsdrmdynlib kmsdrmlibs[] = {
|
||||
- {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC},
|
||||
- {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM}
|
||||
+ {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM},
|
||||
+ {NULL, SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC}
|
||||
};
|
||||
|
||||
static void *
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From d265b1ee94aa4faf5fa405f14cc731a25d7a00ab Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 24 Mar 2020 14:11:14 +0100
|
||||
Subject: [PATCH] src/video/kmsdrm/SDL_kmsdrmvideo.c: fix build
|
||||
|
||||
Build is broken without EGL since version 2.0.12 and
|
||||
https://hg.libsdl.org/SDL/rev/9761858bd6a3:
|
||||
|
||||
/home/giuliobenetti/autobuild/run/instance-1/output-1/build/sdl2-2.0.12/src/video/kmsdrm/SDL_kmsdrmvideo.c: In function 'KMSDRM_CreateSurfaces':
|
||||
/home/giuliobenetti/autobuild/run/instance-1/output-1/build/sdl2-2.0.12/src/video/kmsdrm/SDL_kmsdrmvideo.c:394:5: error: unknown type name 'EGLContext'
|
||||
EGLContext egl_context;
|
||||
^
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/fafd20a01591032662f9ca025fcea3478239cf3c
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream: https://hg.libsdl.org/SDL/rev/389ce8cfa2a3]
|
||||
---
|
||||
src/video/kmsdrm/SDL_kmsdrmvideo.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
|
||||
index 216c45dab..459f96537 100644
|
||||
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
|
||||
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
|
||||
@@ -391,7 +391,9 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)
|
||||
Uint32 height = dispdata->mode.vdisplay;
|
||||
Uint32 surface_fmt = GBM_FORMAT_XRGB8888;
|
||||
Uint32 surface_flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING;
|
||||
+#if SDL_VIDEO_OPENGL_EGL
|
||||
EGLContext egl_context;
|
||||
+#endif
|
||||
|
||||
if (!KMSDRM_gbm_device_is_format_supported(viddata->gbm, surface_fmt, surface_flags)) {
|
||||
SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "GBM surface format not supported. Trying anyway.");
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.10.tar.gz.sig
|
||||
sha256 b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57 SDL2-2.0.10.tar.gz
|
||||
# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.12.tar.gz.sig
|
||||
sha256 349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863 SDL2-2.0.12.tar.gz
|
||||
# Locally calculated
|
||||
sha256 a7c8d0b3167c502921192585a582eb8477ad9862330f4d8b9e4a8bb4c1a9d29e COPYING.txt
|
||||
sha256 ae4df3759a726538607b84c00ab8f8a5567d9f38ad5397486eb9b5c5f626caef COPYING.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SDL2_VERSION = 2.0.10
|
||||
SDL2_VERSION = 2.0.12
|
||||
SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
|
||||
SDL2_SITE = http://www.libsdl.org/release
|
||||
SDL2_LICENSE = Zlib
|
||||
|
||||
Reference in New Issue
Block a user