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
61 lines
1.6 KiB
Diff
61 lines
1.6 KiB
Diff
From d38254c2cfdfa2baceef9e4fa553b74ed2e0247e Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sat, 25 Jul 2020 14:36:11 +0200
|
|
Subject: [PATCH] mz.h: fix build with gcc 4.8
|
|
|
|
gcc 4.8 does not support __has_include directive as a result the build
|
|
will fail on:
|
|
|
|
/home/naourr/work/instance-1/output-1/build/minizip-2.10.0/mz.h:162:44: error: missing binary operator before token "("
|
|
(defined(__has_include) && __has_include(<stdint.h>))
|
|
^
|
|
|
|
Fix it by appling:
|
|
https://gcc.gnu.org/onlinedocs/gcc-10.1.0/cpp/_005f_005fhas_005finclude.html
|
|
|
|
Fix #510
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/nmoinvaz/minizip/pull/515]
|
|
---
|
|
mz.h | 14 ++++++++++----
|
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/mz.h b/mz.h
|
|
index 4d3732b..83662e0 100644
|
|
--- a/mz.h
|
|
+++ b/mz.h
|
|
@@ -158,9 +158,12 @@
|
|
#include <string.h> /* memset, strncpy, strlen */
|
|
#include <limits.h>
|
|
|
|
-#if defined(HAVE_STDINT_H) || \
|
|
- (defined(__has_include) && __has_include(<stdint.h>))
|
|
+#if defined(HAVE_STDINT_H)
|
|
# include <stdint.h>
|
|
+#elif defined(__has_include)
|
|
+# if __has_include(<stdint.h>)
|
|
+# include <stdint.h>
|
|
+# endif
|
|
#endif
|
|
|
|
#ifndef __INT8_TYPE__
|
|
@@ -188,9 +191,12 @@ typedef unsigned int uint32_t;
|
|
typedef unsigned long long uint64_t;
|
|
#endif
|
|
|
|
-#if defined(HAVE_INTTYPES_H) || \
|
|
- (defined(__has_include) && __has_include(<inttypes.h>))
|
|
+#if defined(HAVE_INTTYPES_H)
|
|
# include <inttypes.h>
|
|
+#elif defined(__has_include)
|
|
+# if __has_include(<inttypes.h>)
|
|
+# include <inttypes.h>
|
|
+# endif
|
|
#endif
|
|
|
|
#ifndef PRId8
|
|
--
|
|
2.27.0
|
|
|