mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-15 21:59:27 +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
69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
From e4788a0f9d820574a165b2609ff16b717ce0baba Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sat, 19 Sep 2020 18:51:15 +0200
|
|
Subject: [PATCH] fix build without mbstate_t
|
|
|
|
Commit 41911aac46d69df6a205af59d60f23a418b0e875 tried to fix build
|
|
without wchar by checking for the availability of wchar.h however some
|
|
toolchains have wchar.h but does not define mbstate_t and mbsrtowcs so
|
|
replace HAVE_WCHAR_H by HAVE_MBSRTOWCS
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/27f184af35468941173628e5e847a284c0b80d73
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status:
|
|
https://github.com/rpm-software-management/popt/pull/51]
|
|
---
|
|
configure.ac | 4 ++--
|
|
src/popthelp.c | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 1fce6df..442086b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -18,7 +18,7 @@ LT_INIT
|
|
|
|
AC_SYS_LARGEFILE
|
|
|
|
-AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h wchar.h])
|
|
+AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h])
|
|
|
|
# For some systems we know that we have ld_version scripts.
|
|
# Use it then as default.
|
|
@@ -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 glob_pattern_p])
|
|
+AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p mbsrtowcs])
|
|
|
|
AM_GNU_GETTEXT_VERSION([0.18.2])
|
|
AM_GNU_GETTEXT([external])
|
|
diff --git a/src/popthelp.c b/src/popthelp.c
|
|
index f604516..b4ab9b4 100644
|
|
--- a/src/popthelp.c
|
|
+++ b/src/popthelp.c
|
|
@@ -15,7 +15,7 @@
|
|
#include <sys/ioctl.h>
|
|
#endif
|
|
|
|
-#ifdef HAVE_WCHAR_H
|
|
+#ifdef HAVE_MBSRTOWCS
|
|
#include <wchar.h> /* for mbsrtowcs */
|
|
#endif
|
|
#include "poptint.h"
|
|
@@ -117,7 +117,7 @@ static size_t maxColumnWidth(FILE *fp)
|
|
static inline size_t stringDisplayWidth(const char *s)
|
|
{
|
|
size_t n = strlen(s);
|
|
-#ifdef HAVE_WCHAR_H
|
|
+#ifdef HAVE_MBSRTOWCS
|
|
mbstate_t t;
|
|
|
|
memset ((void *)&t, 0, sizeof (t)); /* In initial state. */
|
|
--
|
|
2.28.0
|
|
|