d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump buildroot to 2020.11-rc1 (#985)

Browse Source 
* 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
2020-11-13 18:25:44 +01:00
committed by GitHub
parent 25a0dd3082
commit a0871be6c0
4024 changed files with 68095 additions and 47900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
buildroot/package/solarus/Config.in
View File

@@ -1,17 +1,17 @@
config BR2_PACKAGE_SOLARUS
bool "solarus"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
depends on !BR2_STATIC_LIBS # SDL2
depends on BR2_PACKAGE_HAS_LIBGL
select BR2_PACKAGE_GLM
select BR2_PACKAGE_LIBMODPLUG
select BR2_PACKAGE_LIBOGG
select BR2_PACKAGE_LIBPNG # runtime
select BR2_PACKAGE_LIBVORBIS
select BR2_PACKAGE_LUAJIT if !BR2_PACKAGE_LUA_5_1
select BR2_PACKAGE_OPENAL
select BR2_PACKAGE_PHYSFS
select BR2_PACKAGE_SDL2
@@ -25,9 +25,9 @@ config BR2_PACKAGE_SOLARUS
http://www.solarus-games.org
https://github.com/solarus-games/solarus
comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library"
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS || BR2_PACKAGE_LUA_5_1
comment "solarus needs OpenGL and a toolchain w/ C++, gcc >= 4.9, NPTL, dynamic library, and luajit or lua 5.1"
depends on !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|| !BR2_PACKAGE_HAS_LIBGL

4
buildroot/package/solarus/solarus.hash
View File

@@ -1,4 +1,4 @@
# Locally calculated
sha256 c14cd97bad6e12310b938d90abd4e8ebdd0abb403cdcc015d5add82dfc5a085b solarus-v1.6.2.tar.bz2
sha256 b2e00a7df8953903ba022a8f392038e86f675cee714da19cf9a5f8535c42f349 solarus-v1.6.4.tar.bz2
sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt
sha256 309875d925041d909bc705473d6c4b7905272aea15c1c2389088c26c161bae1f license.txt

6
buildroot/package/solarus/solarus.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
SOLARUS_VERSION = 1.6.2
SOLARUS_VERSION = 1.6.4
SOLARUS_SITE = \
https://gitlab.com/solarus-games/solarus/-/archive/v$(SOLARUS_VERSION)
SOLARUS_SOURCE = solarus-v$(SOLARUS_VERSION).tar.bz2
@@ -16,8 +16,8 @@ SOLARUS_LICENSE_FILES = license.txt
# Install libsolarus.so
SOLARUS_INSTALL_STAGING = YES
SOLARUS_DEPENDENCIES = libgl libmodplug libogg libvorbis openal physfs sdl2 \
sdl2_image sdl2_ttf
SOLARUS_DEPENDENCIES = glm libgl libmodplug libogg libvorbis openal physfs \
sdl2 sdl2_image sdl2_ttf
# Disable launcher GUI (requires Qt5)
SOLARUS_CONF_OPTS = \