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:
@@ -0,0 +1,25 @@
|
||||
From 4221d54385b69d6c40eff2c67bc6bad7ed165a44 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Sat, 9 May 2020 03:04:02 +0200
|
||||
Subject: [PATCH] Fix build with boost-1.73
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/SuperTux/supertux/commit/4221d54385b69d6c40eff2c67bc6bad7ed165a44]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/editor/object_settings.hpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/editor/object_settings.hpp b/src/editor/object_settings.hpp
|
||||
index bc9049a94e..15b77b1e46 100644
|
||||
--- a/src/editor/object_settings.hpp
|
||||
+++ b/src/editor/object_settings.hpp
|
||||
@@ -22,6 +22,8 @@
|
||||
|
||||
#include "editor/object_option.hpp"
|
||||
|
||||
+#include <algorithm>
|
||||
+
|
||||
class Color;
|
||||
enum class Direction;
|
||||
enum class WalkMode;
|
||||
@@ -17,7 +17,6 @@ config BR2_PACKAGE_SUPERTUX
|
||||
select BR2_PACKAGE_FREETYPE
|
||||
select BR2_PACKAGE_LIBCURL
|
||||
select BR2_PACKAGE_LIBGLEW
|
||||
select BR2_PACKAGE_LIBGLU # GL/glu.h
|
||||
select BR2_PACKAGE_LIBOGG
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
select BR2_PACKAGE_LIBVORBIS
|
||||
|
||||
@@ -15,7 +15,7 @@ SUPERTUX_LICENSE_FILES = LICENSE.txt data/AUTHORS
|
||||
|
||||
# Use bundled squirrel, tinygettext sexp-cpp packages which are hardcoded in
|
||||
# the CMake build system.
|
||||
SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew libglu \
|
||||
SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew \
|
||||
libogg libpng libvorbis openal physfs sdl2 sdl2_image
|
||||
|
||||
# CMAKE_BUILD_TYPE=Release: disable profiling code (-pg)
|
||||
@@ -30,6 +30,7 @@ SUPERTUX_DEPENDENCIES = host-pkgconf boost freetype libcurl libgl libglew libglu
|
||||
# ENABLE_OPENGLES2=OFF: Disable opengles2 for now.
|
||||
SUPERTUX_CONF_OPTS += \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -DGLEW_NO_GLU" \
|
||||
-DENABLE_BOOST_STATIC_LIBS=OFF \
|
||||
-DBUILD_DOCUMENTATION=OFF \
|
||||
-DENABLE_OPENGL=ON \
|
||||
|
||||
Reference in New Issue
Block a user