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
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
From 3ccbb67c71aa13b9a37a58363d37a18b8fdbf300 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Thu, 29 Oct 2020 13:36:00 +0100
|
|
Subject: [PATCH] src/schedule.c: fix build with gcc 4.8
|
|
|
|
Fix the following build failure with gcc 4.8:
|
|
|
|
schedule.c:19:2: error: 'for' loop initial declarations are only allowed in C99 mode
|
|
for (int i = 0; i < 4; ++i) {
|
|
^
|
|
schedule.c:19:2: note: use option -std=c99 or -std=gnu99 to compile your code
|
|
schedule.c: In function 'pms2_read_block':
|
|
schedule.c:39:2: error: 'for' loop initial declarations are only allowed in C99 mode
|
|
for (int i = 0; i < 4; ++i) {
|
|
^
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/079f1454121d38a83c49529c0f6cc8ed61fd5abb
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status:
|
|
https://sourceforge.net/p/sispmctl/git/merge-requests/1]
|
|
---
|
|
src/schedule.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/schedule.c b/src/schedule.c
|
|
index 4dd908d..1725421 100644
|
|
--- a/src/schedule.c
|
|
+++ b/src/schedule.c
|
|
@@ -15,8 +15,9 @@
|
|
static unsigned char
|
|
*pms2_write_block(uint8_t action, uint32_t time, unsigned char *ptr)
|
|
{
|
|
+ int i;
|
|
*ptr++ = action;
|
|
- for (int i = 0; i < 4; ++i) {
|
|
+ for (i = 0; i < 4; ++i) {
|
|
*ptr++ = (uint8_t)time;
|
|
time >>= 8;
|
|
}
|
|
@@ -34,9 +35,10 @@ static unsigned char
|
|
static const unsigned char
|
|
*pms2_read_block(uint8_t *action, uint32_t *time, const unsigned char *ptr)
|
|
{
|
|
+ int i;
|
|
*action = *ptr++;
|
|
*time = 0;
|
|
- for (int i = 0; i < 4; ++i) {
|
|
+ for (i = 0; i < 4; ++i) {
|
|
*time >>= 8;
|
|
*time += (uint32_t)*ptr++ << 24;
|
|
}
|
|
--
|
|
2.28.0
|
|
|