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
@@ -1,29 +0,0 @@
|
||||
From ef1cffc526d3cf9562d50efbf8addc2aa4c06b52 Mon Sep 17 00:00:00 2001
|
||||
From: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
Date: Sun, 30 Jul 2017 18:23:23 -0300
|
||||
Subject: [PATCH 1/2] Add cross-compilation support
|
||||
|
||||
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
---
|
||||
configure | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index c2f304729651..b05321aac3da 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -499,8 +499,9 @@ if test -n "$_host"; then
|
||||
_host_os=win32
|
||||
;;
|
||||
*)
|
||||
- echo "Cross-compiling to unknown target, please add your target to configure."
|
||||
- exit 1
|
||||
+ echo "Cross-compiling to $_host target"
|
||||
+ DEFINES="$DEFINES -DUNIX"
|
||||
+ _host_os=unix
|
||||
;;
|
||||
esac
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From d506a586b299682a425d3c3de68baefb7221fa9a Mon Sep 17 00:00:00 2001
|
||||
From: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
Date: Sun, 30 Jul 2017 18:25:12 -0300
|
||||
Subject: [PATCH 2/2] Do not strip when installing
|
||||
|
||||
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 346640e53bea..fedaed05a4d6 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -173,7 +173,7 @@ config.mak: $(srcdir)/configure
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
|
||||
- $(INSTALL) -c -s -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)"
|
||||
+ $(INSTALL) -c -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)"
|
||||
$(INSTALL) -d "$(DESTDIR)$(DOCDIR)"
|
||||
$(INSTALL) -c -m 644 "$(srcdir)/Announce.txt" "$(srcdir)/Changes.txt" "$(srcdir)/Copyright.txt" "$(srcdir)/License.txt" "$(srcdir)/README-SDL.txt" "$(srcdir)/Readme.txt" "$(srcdir)/Todo.txt" "$(srcdir)/docs/index.html" "$(srcdir)/docs/debugger.html" "$(DESTDIR)$(DOCDIR)/"
|
||||
$(INSTALL) -d "$(DESTDIR)$(DOCDIR)/graphics"
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
From d14065257b24a9e4a722d1fa1125f26f6599006d Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 9 Mar 2019 20:47:27 +0100
|
||||
Subject: [PATCH] undef PAGE_SIZE
|
||||
|
||||
PAGE_SIZE is sometimes already defined by the toolchain so undef it:
|
||||
|
||||
/home/naourr/work/instance-3/output/host/bin/x86_64-linux-g++ -MMD -MF "src/debugger/.deps/CpuDebug.d" -MQ "src/debugger/CpuDebug.o" -MP -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -x c++ -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++14 -fomit-frame-pointer -D_GLIBCXX_USE_CXX11_ABI=1 -DUNIX -DBSPF_UNIX -DWINDOWED_SUPPORT -DSOUND_SUPPORT -DDEBUGGER_SUPPORT -DJOYSTICK_SUPPORT -DCHEATCODE_SUPPORT -Isrc/emucore -Isrc/common -Isrc/common/tv_filters -Isrc/gui -Isrc/emucore/tia -Isrc/emucore/tia/frame-manager -I/home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/SDL2 -D_REENTRANT -Isrc/unix -Isrc/debugger -Isrc/debugger/gui -Isrc/yacc -Isrc/cheat -c src/debugger/CpuDebug.cxx -o src/debugger/CpuDebug.o
|
||||
In file included from /home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/include/limits.h:8:0,
|
||||
from /home/naourr/work/instance-3/output/host/opt/ext-toolchain/x86_64-buildroot-linux-musl/include/c++/7.4.0/climits:42,
|
||||
from src/common/bspf.hxx:28,
|
||||
from src/debugger/CartDebug.cxx:18:
|
||||
src/emucore/System.hxx:64:29: error: expected unqualified-id before numeric constant
|
||||
static constexpr uInt16 PAGE_SIZE = (1 << PAGE_SHIFT);
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/22a9b009749af2a0862750a1fb2b2dc7167cd589
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/emucore/MT24LC256.hxx | 2 ++
|
||||
src/emucore/System.hxx | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/emucore/MT24LC256.hxx b/src/emucore/MT24LC256.hxx
|
||||
index fc5d6a49..bb7468b4 100644
|
||||
--- a/src/emucore/MT24LC256.hxx
|
||||
+++ b/src/emucore/MT24LC256.hxx
|
||||
@@ -23,6 +23,8 @@ class System;
|
||||
#include "Control.hxx"
|
||||
#include "bspf.hxx"
|
||||
|
||||
+#undef PAGE_SIZE
|
||||
+
|
||||
/**
|
||||
Emulates a Microchip Technology Inc. 24LC256, a 32KB Serial Electrically
|
||||
Erasable PROM accessed using the I2C protocol. Thanks to J. Payson
|
||||
diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx
|
||||
index e31202df..85a54f28 100644
|
||||
--- a/src/emucore/System.hxx
|
||||
+++ b/src/emucore/System.hxx
|
||||
@@ -30,6 +30,8 @@ class NullDevice;
|
||||
#include "Random.hxx"
|
||||
#include "Serializable.hxx"
|
||||
|
||||
+#undef PAGE_SIZE
|
||||
+
|
||||
/**
|
||||
This class represents a system consisting of a 6502 microprocessor
|
||||
and a set of devices. The devices are mapped into an addressing
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -3,7 +3,7 @@ config BR2_PACKAGE_STELLA
|
||||
depends on !BR2_STATIC_LIBS # sdl2
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
|
||||
select BR2_PACKAGE_SDL2
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
@@ -13,10 +13,10 @@ config BR2_PACKAGE_STELLA
|
||||
|
||||
https://stella-emu.github.io/
|
||||
|
||||
comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 5"
|
||||
comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 6"
|
||||
depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_5
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_6
|
||||
|
||||
comment "stella needs a toolchain not affected by GCC bug 64735"
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally computed:
|
||||
sha256 bcbd82294f97d00457fdb727e9b08ff73b685dc7f77704cea1eceb58d8967387 stella-6.0.2-src.tar.xz
|
||||
sha256 062e708b8b88ea911b5c08000f1c4a5588235aa0c303bc893b5d92fb45cafd04 Copyright.txt
|
||||
sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt
|
||||
sha256 59ee35a3e49f52e64fa15e0217ecda90ccb768dcb075d997e72d5e5a3198f82e stella-6.3-src.tar.xz
|
||||
sha256 d207ee9e563fdd062582df8cbb6c8303b9879bd107692c0db2a32477e47dfa35 Copyright.txt
|
||||
sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
STELLA_VERSION = 6.0.2
|
||||
STELLA_VERSION = 6.3
|
||||
STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz
|
||||
STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION)
|
||||
STELLA_LICENSE = GPL-2.0+
|
||||
|
||||
Reference in New Issue
Block a user