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
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 49456e0a37fac7bc9d1f01bc1519fb0d699956db Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Fri, 27 Dec 2019 23:33:37 +0100
|
|
Subject: [PATCH] hw/xfree86/common/xf86Init.c: fix build without glx
|
|
|
|
Since commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b, an include on
|
|
glxvndabi.h has been added to hw/xfree86/common/xf86Init.c
|
|
|
|
However, if glx is disabled through --disable-glx and GLX headers are
|
|
not installed in the build's environment, build fails on:
|
|
|
|
In file included from xf86Init.c:81:
|
|
../../../include/glxvndabi.h:64:10: fatal error: GL/glxproto.h: No such file or directory
|
|
64 | #include <GL/glxproto.h>
|
|
| ^~~~~~~~~~~~~~~
|
|
|
|
Fix this failure by removing this include which does not seem to be
|
|
needed (an other option would have been to keep it under an ifdef GLXEXT
|
|
block)
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/de838a843f97673d1381a55fd4e9b07164693913
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Retrieved from:
|
|
https://gitlab.freedesktop.org/xorg/xserver/commit/49456e0a37fac7bc9d1f01bc1519fb0d699956db]
|
|
---
|
|
hw/xfree86/common/xf86Init.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
|
|
index 0631c7237..e6fb11398 100644
|
|
--- a/hw/xfree86/common/xf86Init.c
|
|
+++ b/hw/xfree86/common/xf86Init.c
|
|
@@ -78,7 +78,6 @@
|
|
#include "xf86InPriv.h"
|
|
#include "picturestr.h"
|
|
#include "randrstr.h"
|
|
-#include "glxvndabi.h"
|
|
#include "xf86Bus.h"
|
|
#ifdef XSERVER_LIBPCIACCESS
|
|
#include "xf86VGAarbiter.h"
|
|
--
|
|
2.24.1
|
|
|