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
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
From 8b0ae49c8bea78df73c3ecae0059d54a95c561fa Mon Sep 17 00:00:00 2001
|
|
From: Romain Naour <romain.naour@gmail.com>
|
|
Date: Sun, 24 Dec 2017 00:11:45 +0100
|
|
Subject: [PATCH] cmake: forward cflags from *.pc files to waffle cflags
|
|
|
|
When building mesa egl without x11 and gles2 the headers need a
|
|
EGL_NO_X11 define to avoid including X11 headers.
|
|
|
|
This define EGL_NO_X11 is lost while building waffle
|
|
since CFLAGS defined by pc files are not used.
|
|
|
|
EGL_NO_X11 is defined in CFLAGS from egl.pc.
|
|
|
|
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
---
|
|
src/waffle/CMakeLists.txt | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
|
|
index d76e029..2ff72c8 100644
|
|
--- a/src/waffle/CMakeLists.txt
|
|
+++ b/src/waffle/CMakeLists.txt
|
|
@@ -5,6 +5,14 @@
|
|
add_definitions(
|
|
-DWAFFLE_API_VERSION=${waffle_api_version}
|
|
-DWAFFLE_API_EXPERIMENTAL
|
|
+ ${egl_CFLAGS}
|
|
+ ${gbm_CFLAGS}
|
|
+ ${gl_CFLAGS}
|
|
+ ${GLEXT_CFLAGS}
|
|
+ ${libudev_CFLAGS}
|
|
+ ${wayland-client_CFLAGS}
|
|
+ ${wayland-egl_CFLAGS}
|
|
+ ${x11-xcb_CFLAGS}
|
|
)
|
|
|
|
include_directories(
|
|
--
|
|
2.14.3
|
|
|