mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-29 04:17:16 +00:00
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
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 5e600ae2ad370ddbb759e84ce55a7dfaa9a0bdd7 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sun, 6 Sep 2020 14:17:23 +0200
|
|
Subject: [PATCH] src/netlink.c: remove REG_NOERROR
|
|
|
|
REG_NOERROR is used since version 5.12.0 and
|
|
https://github.com/collectd/collectd/commit/f7fd32e5209e188db7985a42054252fc4cbfe7c1
|
|
|
|
However, REG_NOERROR is not defined by musl, even GNU regex do not
|
|
mention REG_NOERROR, so just remove it to avoid the following build
|
|
failure:
|
|
|
|
src/netlink.c: In function 'check_ignorelist':
|
|
src/netlink.c:243:51: error: 'REG_NOERROR' undeclared (first use in this function); did you mean 'REG_NOTBOL'?
|
|
if (regexec(i->rdevice, dev, 0, NULL, 0) != REG_NOERROR)
|
|
^~~~~~~~~~~
|
|
REG_NOTBOL
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/cd4d75888b5259b028132dd224be34f69bcbb702
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/collectd/collectd/pull/3569]
|
|
---
|
|
src/netlink.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/netlink.c b/src/netlink.c
|
|
index 7a5da762..fac2fb1e 100644
|
|
--- a/src/netlink.c
|
|
+++ b/src/netlink.c
|
|
@@ -240,7 +240,7 @@ static int check_ignorelist(const char *dev, const char *type,
|
|
for (ir_ignorelist_t *i = ir_ignorelist_head; i != NULL; i = i->next) {
|
|
#if HAVE_REGEX_H
|
|
if (i->rdevice != NULL) {
|
|
- if (regexec(i->rdevice, dev, 0, NULL, 0) != REG_NOERROR)
|
|
+ if (regexec(i->rdevice, dev, 0, NULL, 0))
|
|
continue;
|
|
} else
|
|
#endif
|
|
--
|
|
2.28.0
|
|
|