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
@@ -0,0 +1,48 @@
|
||||
From b10c0e843dcb8148bbe869bb15261955b94ac98c Mon Sep 17 00:00:00 2001
|
||||
From: Denys Dmytriyenko <denys@ti.com>
|
||||
Date: Tue, 8 Sep 2020 19:37:42 -0400
|
||||
Subject: [PATCH] tests: include fcntl.h for open(), O_RDWR, O_CLOEXEC and
|
||||
O_CREAT
|
||||
|
||||
musl libc (unlike glibc) requires explicitly incuding fcntl.h to define open(),
|
||||
O_RDWR, O_CLOEXEC and O_CREAT. Otherwise the build fails with the errors:
|
||||
|
||||
| ../weston-9.0.0/tests/weston-test-fixture-compositor.c: In function 'wait_for_lock':
|
||||
| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:7: warning: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration]
|
||||
| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
|
||||
| | ^~~~
|
||||
| | popen
|
||||
| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: error: 'O_RDWR' undeclared (first use in this function)
|
||||
| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
|
||||
| | ^~~~~~
|
||||
| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:23: note: each undeclared identifier is reported only once for each function it appears in
|
||||
| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:32: error: 'O_CLOEXEC' undeclared (first use in this function)
|
||||
| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
|
||||
| | ^~~~~~~~~
|
||||
| ../weston-9.0.0/tests/weston-test-fixture-compositor.c:135:44: error: 'O_CREAT' undeclared (first use in this function)
|
||||
| 135 | fd = open(lock_path, O_RDWR | O_CLOEXEC | O_CREAT, 00700);
|
||||
| | ^~~~~~~
|
||||
|
||||
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
[james.hilliard1@gmail.com: backport from upstream commit
|
||||
b10c0e843dcb8148bbe869bb15261955b94ac98c]
|
||||
---
|
||||
tests/weston-test-fixture-compositor.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c
|
||||
index 1c32959c..c1eb26c4 100644
|
||||
--- a/tests/weston-test-fixture-compositor.c
|
||||
+++ b/tests/weston-test-fixture-compositor.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
+#include <fcntl.h>
|
||||
|
||||
#include "shared/helpers.h"
|
||||
#include "weston-test-fixture-compositor.h"
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 7b36f171d09354a2d3a48db0ae2d34d66aa4f1ae Mon Sep 17 00:00:00 2001
|
||||
From: James Hilliard <james.hilliard1@gmail.com>
|
||||
Date: Sat, 1 Feb 2020 20:02:29 -0700
|
||||
Subject: [PATCH] unconditionally include sys/mman.h in os-compatibility.c
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes:
|
||||
../shared/os-compatibility.c:273:25: error: ‘PROT_READ’ undeclared (first use in this function); did you mean ‘LOCK_READ’?
|
||||
map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, file->fd, 0);
|
||||
^~~~~~~~~
|
||||
LOCK_READ
|
||||
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
[james.hilliard1@gmail.com: backport from upstream commit
|
||||
7b36f171d09354a2d3a48db0ae2d34d66aa4f1ae]
|
||||
---
|
||||
shared/os-compatibility.c | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c
|
||||
index 5e1ce479..041c929f 100644
|
||||
--- a/shared/os-compatibility.c
|
||||
+++ b/shared/os-compatibility.c
|
||||
@@ -34,10 +34,7 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <libweston/zalloc.h>
|
||||
-
|
||||
-#ifdef HAVE_MEMFD_CREATE
|
||||
#include <sys/mman.h>
|
||||
-#endif
|
||||
|
||||
#include "os-compatibility.h"
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
From 4b93b71067949cc5efabb9b3d59278a3f362b11c Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
Date: Wed, 21 Oct 2020 13:33:25 +0200
|
||||
Subject: [PATCH] libweston/backend/drm: might need EGL
|
||||
|
||||
gbm-drm.c includes gl-renderer.h. When EGL is enabled, that in turns
|
||||
includes egl.h. As such, dependencies for drm should include EGL if
|
||||
it is available.
|
||||
|
||||
This condition is modelled after a similar one in libweston/meson.build
|
||||
|
||||
Reported-by: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
Reported-by: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
Cc: Refik Tuzakli <tuzakli.refik@gmail.com>
|
||||
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
---
|
||||
This patch should be a proper fix for the issue discribed in the patch from
|
||||
Gary [1].
|
||||
|
||||
Since the MR on weston upstream [2] is not merged now I add this patch
|
||||
to have working weston with imx in buildroot.
|
||||
|
||||
[1] https://patchwork.ozlabs.org/project/buildroot/patch/20200402130842.918696-3-gary.bisson@boundarydevices.com/
|
||||
[2] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508
|
||||
---
|
||||
libweston/backend-drm/meson.build | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build
|
||||
index 484c2702..e3e5b976 100644
|
||||
--- a/libweston/backend-drm/meson.build
|
||||
+++ b/libweston/backend-drm/meson.build
|
||||
@@ -53,6 +53,9 @@ if get_option('renderer-gl')
|
||||
config_h.set('HAVE_GBM_FD_IMPORT', '1')
|
||||
endif
|
||||
deps_drm += dep_gbm
|
||||
+ if dep_egl.found()
|
||||
+ deps_drm += dep_egl
|
||||
+ endif
|
||||
srcs_drm += 'drm-gbm.c'
|
||||
config_h.set('BUILD_DRM_GBM', '1')
|
||||
endif
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
From f0d3a6149158f682230ae9a1e69289431974f635 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Wick <sebastian@sebastianwick.net>
|
||||
Date: Wed, 5 Feb 2020 10:27:23 +0100
|
||||
Subject: [PATCH] shared: guard all the seal logic behind HAVE_MEMFD_CREATE
|
||||
|
||||
The initial version of os_ro_anonymous_file missed two guards around the
|
||||
seal logic which leads to a compilation error on older systems.
|
||||
|
||||
Also make the check for a read-only file symmetric in
|
||||
os_ro_anonymous_file_get_fd and os_ro_anonymous_file_put_fd.
|
||||
|
||||
Signed-off-by: Sebastian Wick <sebastian@sebastianwick.net>
|
||||
[james.hilliard1@gmail.com: backport from upstream commit
|
||||
f0d3a6149158f682230ae9a1e69289431974f635]
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
---
|
||||
shared/os-compatibility.c | 15 +++++++++------
|
||||
1 file changed, 9 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c
|
||||
index 041c929f..2e12b7cc 100644
|
||||
--- a/shared/os-compatibility.c
|
||||
+++ b/shared/os-compatibility.c
|
||||
@@ -340,6 +340,7 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file,
|
||||
void *src, *dst;
|
||||
int seals, fd;
|
||||
|
||||
+#ifdef HAVE_MEMFD_CREATE
|
||||
seals = fcntl(file->fd, F_GET_SEALS);
|
||||
|
||||
/* file was sealed for read-only and we don't have to support MAP_SHARED
|
||||
@@ -348,6 +349,7 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file,
|
||||
if (seals != -1 && mapmode == RO_ANONYMOUS_FILE_MAPMODE_PRIVATE &&
|
||||
(seals & READONLY_SEALS) == READONLY_SEALS)
|
||||
return file->fd;
|
||||
+#endif
|
||||
|
||||
/* for all other cases we create a new anonymous file that can be mapped
|
||||
* with MAP_SHARED and copy the contents to it and return that instead
|
||||
@@ -388,17 +390,18 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file,
|
||||
int
|
||||
os_ro_anonymous_file_put_fd(int fd)
|
||||
{
|
||||
+#ifdef HAVE_MEMFD_CREATE
|
||||
int seals = fcntl(fd, F_GET_SEALS);
|
||||
if (seals == -1 && errno != EINVAL)
|
||||
return -1;
|
||||
|
||||
- /* If the fd cannot be sealed seals is -1 at this point
|
||||
- * or the file can be sealed but has not been sealed for writing.
|
||||
- * In both cases we created a new anonymous file that we have to
|
||||
- * close.
|
||||
+ /* The only case in which we do NOT have to close the file is when the file
|
||||
+ * was sealed for read-only
|
||||
*/
|
||||
- if (seals == -1 || !(seals & F_SEAL_WRITE))
|
||||
- close(fd);
|
||||
+ if (seals != -1 && (seals & READONLY_SEALS) == READONLY_SEALS)
|
||||
+ return 0;
|
||||
+#endif
|
||||
|
||||
+ close(fd);
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -39,11 +39,11 @@ config BR2_PACKAGE_WESTON_DEFAULT_FBDEV
|
||||
|
||||
config BR2_PACKAGE_WESTON_DEFAULT_DRM
|
||||
bool "drm"
|
||||
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
|
||||
select BR2_PACKAGE_WESTON_DRM
|
||||
|
||||
comment "drm backend needs mesa3d w/ EGL driver"
|
||||
depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
|
||||
|
||||
config BR2_PACKAGE_WESTON_DEFAULT_X11
|
||||
bool "X11"
|
||||
@@ -63,11 +63,11 @@ config BR2_PACKAGE_WESTON_DEFAULT_COMPOSITOR
|
||||
|
||||
config BR2_PACKAGE_WESTON_DRM
|
||||
bool "DRM compositor"
|
||||
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
|
||||
|
||||
# Uses libgbm from mesa3d
|
||||
comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d"
|
||||
depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL
|
||||
|
||||
config BR2_PACKAGE_WESTON_FBDEV
|
||||
bool "fbdev compositor"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2020-January/041147.html
|
||||
md5 53e4810d852df0601d01fd986a5b22b3 weston-8.0.0.tar.xz
|
||||
sha1 80200a9c677d34c2de52230be444bd03ecd84229 weston-8.0.0.tar.xz
|
||||
sha256 7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848 weston-8.0.0.tar.xz
|
||||
sha512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c weston-8.0.0.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2020-September/041595.html
|
||||
md5 b406da0fe9139fd39653238fde22a6cf weston-9.0.0.tar.xz
|
||||
sha1 90b9540a0bd6d6f7a465817f1c696d4d393183c9 weston-9.0.0.tar.xz
|
||||
sha256 5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe weston-9.0.0.tar.xz
|
||||
sha512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90 weston-9.0.0.tar.xz
|
||||
sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WESTON_VERSION = 8.0.0
|
||||
WESTON_SITE = http://wayland.freedesktop.org/releases
|
||||
WESTON_VERSION = 9.0.0
|
||||
WESTON_SITE = https://wayland.freedesktop.org/releases
|
||||
WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
|
||||
WESTON_LICENSE = MIT
|
||||
WESTON_LICENSE_FILES = COPYING
|
||||
@@ -14,7 +14,6 @@ WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
|
||||
libxkbcommon pixman libpng jpeg udev cairo libinput libdrm
|
||||
|
||||
WESTON_CONF_OPTS = \
|
||||
-Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \
|
||||
-Dbackend-headless=false \
|
||||
-Dcolor-management-colord=false \
|
||||
-Dremoting=false
|
||||
@@ -57,9 +56,16 @@ endif
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGLES),yy)
|
||||
WESTON_CONF_OPTS += -Drenderer-gl=true
|
||||
WESTON_DEPENDENCIES += libegl libgles
|
||||
ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy)
|
||||
WESTON_CONF_OPTS += -Dpipewire=true
|
||||
WESTON_DEPENDENCIES += pipewire
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dpipewire=false
|
||||
endif
|
||||
else
|
||||
WESTON_CONF_OPTS += \
|
||||
-Drenderer-gl=false
|
||||
-Drenderer-gl=false \
|
||||
-Dpipewire=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_RDP),y)
|
||||
@@ -126,13 +132,6 @@ else
|
||||
WESTON_CONF_OPTS += -Dtest-junit-xml=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy)
|
||||
WESTON_CONF_OPTS += -Dpipewire=true
|
||||
WESTON_DEPENDENCIES += pipewire
|
||||
else
|
||||
WESTON_CONF_OPTS += -Dpipewire=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y)
|
||||
WESTON_CONF_OPTS += -Ddemo-clients=true
|
||||
WESTON_DEPENDENCIES += pango
|
||||
|
||||
Reference in New Issue
Block a user