mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-27 11:27:19 +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
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From 3938da1286534e4b280340411336eed5b6311d1b Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Wed, 15 Jul 2020 23:21:32 +0200
|
|
Subject: [PATCH] Detect glob_pattern_p()
|
|
|
|
The current popt build system tests the existence of <glob.h>, and
|
|
then assumes that if __GLIBC__ is defined, then glob_pattern_p() must
|
|
be available. Unfortunately, that's not true with uClibc: <glob.h> may
|
|
be installed, but not necessarily the GNU glob extensions... and
|
|
uClibc defines __GLIBC__. This is causing build issues with certain
|
|
uClibc toolchains that do not have GNU glob extensions enabled.
|
|
|
|
To fix this, this patch adds an AC_CHECK_FUNCS() test for
|
|
glob_pattern_p, and uses that to find out whether glob_pattern_p() is
|
|
available or not.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
[Retrieved (and slightly updated) from:
|
|
https://git.buildroot.net/buildroot/tree/package/popt/0003-glob-detection.patch]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Retrieved from:
|
|
https://github.com/rpm-software-management/popt/commit/3938da1286534e4b280340411336eed5b6311d1b]
|
|
---
|
|
configure.ac | 2 +-
|
|
src/poptconfig.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index a5568c4..3b71d1a 100755
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -50,7 +50,7 @@ AC_ARG_ENABLE(build-gcov,
|
|
])
|
|
|
|
AC_SEARCH_LIBS(setreuid, [ucb])
|
|
-AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom)
|
|
+AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p)
|
|
|
|
AM_GNU_GETTEXT_VERSION([0.18.2])
|
|
AM_GNU_GETTEXT([external])
|
|
diff --git a/src/poptconfig.c b/src/poptconfig.c
|
|
index 9d97ccd..b4d1b76 100644
|
|
--- a/src/poptconfig.c
|
|
+++ b/src/poptconfig.c
|
|
@@ -21,7 +21,7 @@
|
|
#if defined(HAVE_GLOB_H)
|
|
#include <glob.h>
|
|
|
|
-#if !defined(__GLIBC__)
|
|
+#if !defined(HAVE_GLOB_PATTERN_P)
|
|
/* Return nonzero if PATTERN contains any metacharacters.
|
|
Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
|
|
static int
|