mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-16 06:09:26 +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
52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
From 552474a477989d0d3514f126b8e314dccc27878c Mon Sep 17 00:00:00 2001
|
|
From: Kamel Bouhara <kamel.bouhara@bootlin.com>
|
|
Date: Wed, 1 Jul 2020 08:58:24 +0200
|
|
Subject: [PATCH] mariadb FTBFS fix
|
|
|
|
From: https://sources.debian.org/patches/libodb-mysql/2.4.0-4/mariadb_FTBFS_fix.patch/
|
|
|
|
Description: fix FTBFS with recent MariaDB versions
|
|
Don't include internal an header, only the main one.
|
|
Bug-Debian: https://bugs.debian.org/919374
|
|
Forwarded: no
|
|
Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
|
|
|
|
Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
|
|
---
|
|
odb/mysql/mysql-types.hxx | 4 ++--
|
|
odb/mysql/version.hxx | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx
|
|
index 1254ccd..0e8f9a8 100644
|
|
--- a/odb/mysql/mysql-types.hxx
|
|
+++ b/odb/mysql/mysql-types.hxx
|
|
@@ -11,9 +11,9 @@ typedef char my_bool;
|
|
typedef struct st_mysql_bind MYSQL_BIND;
|
|
|
|
#ifdef LIBODB_MYSQL_INCLUDE_SHORT
|
|
-# include <mysql_time.h>
|
|
+# include <mysql.h>
|
|
#else
|
|
-# include <mysql/mysql_time.h>
|
|
+# include <mysql/mysql.h>
|
|
#endif
|
|
|
|
#endif // ODB_MYSQL_MYSQL_TYPES_HXX
|
|
diff --git a/odb/mysql/version.hxx b/odb/mysql/version.hxx
|
|
index 05b4ba5..e711c2e 100644
|
|
--- a/odb/mysql/version.hxx
|
|
+++ b/odb/mysql/version.hxx
|
|
@@ -12,7 +12,7 @@
|
|
#ifdef LIBODB_MYSQL_INCLUDE_SHORT
|
|
# include <mysql_version.h>
|
|
#else
|
|
-# include <mysql/mysql_version.h>
|
|
+# include <mysql/mysql.h>
|
|
#endif
|
|
|
|
#include <odb/version.hxx>
|
|
--
|
|
2.26.2
|
|
|