mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-21 16:46:11 +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
56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
From 1fa70eaf24d75e84625f22779ec347fd29bf1ae6 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Thu, 24 Sep 2020 08:47:37 +0200
|
|
Subject: [PATCH] fix build without wchar
|
|
|
|
Disable wencode without wchar or the build will fail on:
|
|
|
|
odbcappender.cpp: In static member function 'static void log4cxx::db::ODBCAppender::encode(wchar_t**, const LogString&, log4cxx::helpers::Pool&)':
|
|
odbcappender.cpp:362:22: error: 'wencode' is not a member of 'log4cxx::helpers::Transcoder'
|
|
*dest = Transcoder::wencode(src, p);
|
|
^~~~~~~
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/bab5329fdeb894471bfd5192ce04d3fbd2f9be5c
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Retrieved from:
|
|
https://github.com/apache/logging-log4cxx/commit/f171f818c798d48631d5b45851e4593953f31d9c]
|
|
---
|
|
src/main/cpp/odbcappender.cpp | 2 ++
|
|
src/main/include/log4cxx/db/odbcappender.h | 2 ++
|
|
2 files changed, 4 insertions(+)
|
|
|
|
diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp
|
|
index 6bfa519e..218df132 100644
|
|
--- a/src/main/cpp/odbcappender.cpp
|
|
+++ b/src/main/cpp/odbcappender.cpp
|
|
@@ -357,10 +357,12 @@ void ODBCAppender::setSql(const LogString& s)
|
|
}
|
|
}
|
|
|
|
+#if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32)
|
|
void ODBCAppender::encode(wchar_t** dest, const LogString& src, Pool& p)
|
|
{
|
|
*dest = Transcoder::wencode(src, p);
|
|
}
|
|
+#endif
|
|
|
|
void ODBCAppender::encode(unsigned short** dest,
|
|
const LogString& src, Pool& p)
|
|
diff --git a/src/main/include/log4cxx/db/odbcappender.h b/src/main/include/log4cxx/db/odbcappender.h
|
|
index a26bc35b..fdc144ff 100644
|
|
--- a/src/main/include/log4cxx/db/odbcappender.h
|
|
+++ b/src/main/include/log4cxx/db/odbcappender.h
|
|
@@ -300,8 +300,10 @@ class LOG4CXX_EXPORT ODBCAppender : public AppenderSkeleton
|
|
private:
|
|
ODBCAppender(const ODBCAppender&);
|
|
ODBCAppender& operator=(const ODBCAppender&);
|
|
+#if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32)
|
|
static void encode(wchar_t** dest, const LogString& src,
|
|
log4cxx::helpers::Pool& p);
|
|
+#endif
|
|
static void encode(unsigned short** dest, const LogString& src,
|
|
log4cxx::helpers::Pool& p);
|
|
}; // class ODBCAppender
|