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
70 lines
1.8 KiB
Diff
70 lines
1.8 KiB
Diff
From ccf93148aa3587dd98a02e253cdc42a7af14df1e Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
Date: Sat, 29 Aug 2020 16:04:15 +0200
|
|
Subject: [PATCH] Provide replacement function for strerror_l()
|
|
|
|
strerror_l() is not implemented in some C libraries, such as uClibc,
|
|
so let's provide a simple replacement function that falls back on
|
|
strerror().
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
configure.ac | 2 ++
|
|
src/plugins/crypto.c | 7 +++++++
|
|
src/utils/module.c | 8 ++++++++
|
|
3 files changed, 17 insertions(+)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index c2d22c2..36aeb51 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -137,6 +137,8 @@ AC_CHECK_HEADERS([dlfcn.h string.h unistd.h sys/fcntl.h sys/ioctl.h linux/random
|
|
[LIBBLOCKDEV_SOFT_FAILURE([Header file $ac_header not found.])],
|
|
[])
|
|
|
|
+AC_CHECK_FUNCS([strerror_l])
|
|
+
|
|
AC_ARG_WITH([bcache],
|
|
AS_HELP_STRING([--with-bcache], [support bcache @<:@default=yes@:>@]),
|
|
[],
|
|
diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c
|
|
index f4a2e8f..c1bd7b5 100644
|
|
--- a/src/plugins/crypto.c
|
|
+++ b/src/plugins/crypto.c
|
|
@@ -52,6 +52,13 @@
|
|
|
|
#define UNUSED __attribute__((unused))
|
|
|
|
+#if !defined(HAVE_STRERROR_L)
|
|
+static char *strerror_l(int errnum, locale_t locale UNUSED)
|
|
+{
|
|
+ return strerror(errnum);
|
|
+}
|
|
+#endif
|
|
+
|
|
/**
|
|
* SECTION: crypto
|
|
* @short_description: plugin for operations with encrypted devices
|
|
diff --git a/src/utils/module.c b/src/utils/module.c
|
|
index 9750e24..086bec0 100644
|
|
--- a/src/utils/module.c
|
|
+++ b/src/utils/module.c
|
|
@@ -27,6 +27,14 @@
|
|
|
|
#include "module.h"
|
|
|
|
+#define UNUSED __attribute__((unused))
|
|
+
|
|
+#if !defined(HAVE_STRERROR_L)
|
|
+static char *strerror_l(int errnum, locale_t locale UNUSED)
|
|
+{
|
|
+ return strerror(errnum);
|
|
+}
|
|
+#endif
|
|
|
|
/**
|
|
* bd_utils_module_error_quark: (skip)
|
|
--
|
|
2.26.2
|
|
|