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
30 lines
997 B
Diff
30 lines
997 B
Diff
From a8fd4b1f563d24d4296c3e8225c8404e2724d4c2 Mon Sep 17 00:00:00 2001
|
|
From: Jordan Christiansen <xordspar0@gmail.com>
|
|
Date: Sun, 15 Mar 2020 16:55:33 -0500
|
|
Subject: [PATCH] Remove redundant demoextend definition
|
|
|
|
GCC 10 enables -fno-common by default, which causes the linker to fail when
|
|
there are multple definitions of a global variable.
|
|
|
|
See https://gcc.gnu.org/gcc-10/porting_to.html
|
|
|
|
[Retrieved from:
|
|
https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
src/hexen/mn_menu.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
|
|
index 059f45b3e..a97b7fcd1 100644
|
|
--- a/src/hexen/mn_menu.c
|
|
+++ b/src/hexen/mn_menu.c
|
|
@@ -131,7 +131,6 @@ boolean MenuActive;
|
|
int InfoType;
|
|
int messageson = true;
|
|
boolean mn_SuicideConsole;
|
|
-boolean demoextend; // from h2def.h
|
|
|
|
// PRIVATE DATA DEFINITIONS ------------------------------------------------
|
|
|