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,33 @@
|
||||
From e18e48624cd45910917e5e4fb0aa16cef490bb6d Mon Sep 17 00:00:00 2001
|
||||
From: Bartosz Bilas <b.bilas@grinn-global.com>
|
||||
Date: Sun, 22 Mar 2020 14:25:53 +0100
|
||||
Subject: [PATCH] src/Exceptions.cpp: check if execinfo header is available
|
||||
|
||||
Fixes:
|
||||
fatal error: execinfo.h: No such file or directory
|
||||
compilation terminated.
|
||||
|
||||
Signed-off-by: Bartosz Bilas <bartosz.bilas@hotmail.com>
|
||||
---
|
||||
Upstream status: https://github.com/cegui/cegui/pull/1189
|
||||
|
||||
cegui/src/Exceptions.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/cegui/src/Exceptions.cpp b/cegui/src/Exceptions.cpp
|
||||
index 8e4890378..6a8420491 100644
|
||||
--- a/cegui/src/Exceptions.cpp
|
||||
+++ b/cegui/src/Exceptions.cpp
|
||||
@@ -46,7 +46,9 @@
|
||||
#elif (defined(__linux__) && !defined(__ANDROID__)) \
|
||||
|| defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) \
|
||||
|| defined(__HAIKU__)
|
||||
+#ifdef HAVE_EXECINFO_H
|
||||
# include <execinfo.h>
|
||||
+#endif
|
||||
# include <dlfcn.h>
|
||||
# include <cxxabi.h>
|
||||
# include <cstddef>
|
||||
--
|
||||
2.25.2
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 4561bac9dddad8fd79e746ea1ddd89c20647a162 Mon Sep 17 00:00:00 2001
|
||||
From: Bartosz Bilas <b.bilas@grinn-global.com>
|
||||
Date: Thu, 2 Apr 2020 18:04:28 +0200
|
||||
Subject: [PATCH] cegui/src/IconvStringTranscoder.cpp: use cast notation
|
||||
instead of reinterpret_cast
|
||||
|
||||
Fixes:
|
||||
IconvStringTranscoder.cpp:50:49: error: invalid cast from type 'int' to
|
||||
type 'iconv_t' {aka 'long int'}
|
||||
if (d_cd == reinterpret_cast<iconv_t>(-1))
|
||||
|
||||
Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
|
||||
---
|
||||
Upstream status: https://github.com/cegui/cegui/pull/1194
|
||||
|
||||
cegui/src/IconvStringTranscoder.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cegui/src/IconvStringTranscoder.cpp b/cegui/src/IconvStringTranscoder.cpp
|
||||
index 1a5df2995..f6b5aa816 100644
|
||||
--- a/cegui/src/IconvStringTranscoder.cpp
|
||||
+++ b/cegui/src/IconvStringTranscoder.cpp
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
d_toCode(tocode),
|
||||
d_cd(iconv_open(d_toCode.c_str(), d_fromCode.c_str()))
|
||||
{
|
||||
- if (d_cd == reinterpret_cast<iconv_t>(-1))
|
||||
+ if (d_cd == (iconv_t)(-1))
|
||||
CEGUI_THROW(InvalidRequestException(String(
|
||||
"Failed to create conversion descriptor from \"") +
|
||||
d_fromCode.c_str() + "\" to \"" + d_toCode.c_str() + "\"."));
|
||||
--
|
||||
2.26.0
|
||||
|
||||
22
buildroot/package/cegui/Config.in
Normal file
22
buildroot/package/cegui/Config.in
Normal file
@@ -0,0 +1,22 @@
|
||||
comment "cegui needs a toolchain w/ C++, threads, dynamic library, wchar"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \
|
||||
|| BR2_STATIC_LIBS || !BR2_USE_WCHAR
|
||||
|
||||
config BR2_PACKAGE_CEGUI
|
||||
bool "cegui"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_WCHAR
|
||||
select BR2_PACKAGE_GLM
|
||||
select BR2_PACKAGE_LIBGLFW if BR2_PACKAGE_HAS_LIBGL # SampleBrowser dependency
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
Crazy Eddie's GUI System is a free library providing windowing
|
||||
and widgets for graphics APIs / engines where such
|
||||
functionality is not natively available, or severely lacking.
|
||||
The library is object orientated, written in C++, and targeted
|
||||
at games developers who should be spending their time creating
|
||||
great games, not building GUI sub-systems!
|
||||
|
||||
http://www.cegui.org.uk/
|
||||
3
buildroot/package/cegui/cegui.hash
Normal file
3
buildroot/package/cegui/cegui.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 7be289d2d8562e7d20bd155d087d6ccb0ba62f7e99cc25d20684b8edf2ba15cd cegui-0-8-7.tar.gz
|
||||
sha256 cc869e2ece8ad039f6d7fd17259db4ea0ae0a502d02a1bb506c0168deb12e40d COPYING
|
||||
102
buildroot/package/cegui/cegui.mk
Normal file
102
buildroot/package/cegui/cegui.mk
Normal file
@@ -0,0 +1,102 @@
|
||||
################################################################################
|
||||
#
|
||||
# cegui
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CEGUI_VERSION = 0-8-7
|
||||
CEGUI_SITE = $(call github,cegui,cegui,v$(CEGUI_VERSION))
|
||||
CEGUI_LICENSE = MIT
|
||||
CEGUI_LICENSE_FILES = COPYING
|
||||
CEGUI_INSTALL_STAGING = YES
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \
|
||||
-DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF \
|
||||
-DCEGUI_BUILD_RENDERER_OGRE=OFF
|
||||
CEGUI_DEPENDENCIES = glm \
|
||||
$(if $(BR2_PACKAGE_LIBGLFW),libglfw) \
|
||||
$(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \
|
||||
$(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
|
||||
# libepoxy support cannot be enabled together with libglew
|
||||
ifeq ($(BR2_PACKAGE_LIBGLEW)$(BR2_PACKAGE_LIBGLU),yy)
|
||||
CEGUI_DEPENDENCIES += libglew libglu
|
||||
CEGUI_CONF_OPTS += -DCEGUI_USE_GLEW=ON -DCEGUI_USE_EPOXY=OFF \
|
||||
-DCEGUI_BUILD_RENDERER_OPENGL=ON \
|
||||
-DCEGUI_BUILD_RENDERER_OPENGL3=ON
|
||||
else ifeq ($(BR2_PACKAGE_LIBEPOXY),y)
|
||||
CEGUI_DEPENDENCIES += libepoxy
|
||||
# old OpenGL renderer module is only supported using GLEW
|
||||
CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=ON -DCEGUI_USE_GLEW=OFF \
|
||||
-DCEGUI_BUILD_RENDERER_OPENGL=OFF \
|
||||
-DCEGUI_BUILD_RENDERER_OPENGL3=ON
|
||||
else
|
||||
CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=OFF -DCEGUI_USE_GLEW=OFF \
|
||||
-DCEGUI_BUILD_RENDERER_OPENGL=OFF \
|
||||
-DCEGUI_BUILD_RENDERER_OPENGL3=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EXPAT),y)
|
||||
CEGUI_DEPENDENCIES += expat
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=ON
|
||||
else
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_IRRLICHT),y)
|
||||
CEGUI_DEPENDENCIES += irrlicht
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=ON
|
||||
else
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SDL2)$(BR2_PACKAGE_SDL2_IMAGE),yy)
|
||||
CEGUI_DEPENDENCIES += sdl2 sdl2_image
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=ON
|
||||
else
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PCRE),y)
|
||||
CEGUI_DEPENDENCIES += pcre
|
||||
CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=ON
|
||||
else
|
||||
CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FREETYPE),y)
|
||||
CEGUI_DEPENDENCIES += freetype
|
||||
CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=ON
|
||||
else
|
||||
CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBXML2),y)
|
||||
CEGUI_DEPENDENCIES += libxml2
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
|
||||
else
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_RAPIDXML),y)
|
||||
CEGUI_DEPENDENCIES += rapidxml
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON
|
||||
else
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_TINYXML),y)
|
||||
CEGUI_DEPENDENCIES += tinyxml
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=ON
|
||||
else
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBFREEIMAGE),y)
|
||||
CEGUI_DEPENDENCIES += libfreeimage
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
|
||||
else
|
||||
CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user