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
141 lines
4.0 KiB
Diff
141 lines
4.0 KiB
Diff
From 72324e9415d2757a5f0f028865f841de70e1d0c4 Mon Sep 17 00:00:00 2001
|
|
From: Heiko Thiery <heiko.thiery@gmail.com>
|
|
Date: Sun, 12 Jul 2020 14:18:09 +0200
|
|
Subject: [PATCH] fix build issue with gcc 10
|
|
|
|
This patch is created on top of tagged version v2.1.0.
|
|
An upstream fix commit [1] for this issue is already in upstream master but
|
|
does not apply on current used version in buildroot.
|
|
|
|
[1] https://github.com/Arkq/bluez-alsa/commit/30a23dd7ce9b00c702fa48545f6b03038f9e17c6
|
|
|
|
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
|
|
[Fabrice: also update src/ofono-iface.h]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
src/bluealsa-dbus.c | 4 ++++
|
|
src/bluealsa-iface.c | 2 ++
|
|
src/bluealsa-iface.h | 4 ----
|
|
src/bluealsa.c | 3 +++
|
|
src/bluez-a2dp.h | 3 ---
|
|
src/bluez-iface.h | 3 ---
|
|
src/bluez.c | 3 +++
|
|
7 files changed, 12 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/bluealsa-dbus.c b/src/bluealsa-dbus.c
|
|
index 5e748e3..4c9cd3d 100644
|
|
--- a/src/bluealsa-dbus.c
|
|
+++ b/src/bluealsa-dbus.c
|
|
@@ -33,6 +33,10 @@
|
|
#include "shared/defs.h"
|
|
#include "shared/log.h"
|
|
|
|
+extern const GDBusInterfaceInfo bluealsa_iface_manager;
|
|
+extern const GDBusInterfaceInfo bluealsa_iface_pcm;
|
|
+extern const GDBusInterfaceInfo bluealsa_iface_rfcomm;
|
|
+
|
|
static GVariant *ba_variant_new_device_path(const struct ba_device *d) {
|
|
return g_variant_new_object_path(d->bluez_dbus_path);
|
|
}
|
|
diff --git a/src/bluealsa-iface.c b/src/bluealsa-iface.c
|
|
index 71810c7..55b79c9 100644
|
|
--- a/src/bluealsa-iface.c
|
|
+++ b/src/bluealsa-iface.c
|
|
@@ -10,6 +10,8 @@
|
|
|
|
#include "bluealsa-iface.h"
|
|
|
|
+#define BLUEALAS_IFACE_C
|
|
+
|
|
static const GDBusArgInfo arg_codec = {
|
|
-1, "codec", "q", NULL
|
|
};
|
|
diff --git a/src/bluealsa-iface.h b/src/bluealsa-iface.h
|
|
index 262fb76..4f3e85b 100644
|
|
--- a/src/bluealsa-iface.h
|
|
+++ b/src/bluealsa-iface.h
|
|
@@ -32,8 +32,4 @@
|
|
#define BLUEALSA_RFCOMM_MODE_HSP_AG "HSP-AG"
|
|
#define BLUEALSA_RFCOMM_MODE_HSP_HS "HSP-HS"
|
|
|
|
-const GDBusInterfaceInfo bluealsa_iface_manager;
|
|
-const GDBusInterfaceInfo bluealsa_iface_pcm;
|
|
-const GDBusInterfaceInfo bluealsa_iface_rfcomm;
|
|
-
|
|
#endif
|
|
diff --git a/src/bluealsa.c b/src/bluealsa.c
|
|
index 929f9ed..690c407 100644
|
|
--- a/src/bluealsa.c
|
|
+++ b/src/bluealsa.c
|
|
@@ -20,6 +20,9 @@
|
|
#include "bluez-a2dp.h"
|
|
#include "hfp.h"
|
|
|
|
+/* NULL-terminated list of available A2DP codecs */
|
|
+extern const struct bluez_a2dp_codec **bluez_a2dp_codecs;
|
|
+
|
|
/* Initialize global configuration variable. */
|
|
struct ba_config config = {
|
|
|
|
diff --git a/src/bluez-a2dp.h b/src/bluez-a2dp.h
|
|
index 7c0e33b..127dbd9 100644
|
|
--- a/src/bluez-a2dp.h
|
|
+++ b/src/bluez-a2dp.h
|
|
@@ -57,7 +57,4 @@ struct bluez_a2dp_codec {
|
|
size_t samplings_size;
|
|
};
|
|
|
|
-/* NULL-terminated list of available A2DP codecs */
|
|
-const struct bluez_a2dp_codec **bluez_a2dp_codecs;
|
|
-
|
|
#endif
|
|
diff --git a/src/bluez-iface.h b/src/bluez-iface.h
|
|
index 34269c5..250267e 100644
|
|
--- a/src/bluez-iface.h
|
|
+++ b/src/bluez-iface.h
|
|
@@ -27,7 +27,4 @@
|
|
#define BLUEZ_TRANSPORT_STATE_PENDING "pending"
|
|
#define BLUEZ_TRANSPORT_STATE_ACTIVE "active"
|
|
|
|
-const GDBusInterfaceInfo bluez_iface_endpoint;
|
|
-const GDBusInterfaceInfo bluez_iface_profile;
|
|
-
|
|
#endif
|
|
diff --git a/src/bluez.c b/src/bluez.c
|
|
index cfdbff8..190101e 100644
|
|
--- a/src/bluez.c
|
|
+++ b/src/bluez.c
|
|
@@ -45,6 +45,9 @@
|
|
# define G_DBUS_ERROR_UNKNOWN_OBJECT G_DBUS_ERROR_FAILED
|
|
#endif
|
|
|
|
+extern const GDBusInterfaceInfo bluez_iface_endpoint;
|
|
+extern const GDBusInterfaceInfo bluez_iface_profile;
|
|
+
|
|
/**
|
|
* Structure describing registered D-Bus object. */
|
|
struct dbus_object_data {
|
|
diff --git a/src/ofono-iface.h b/src/ofono-iface.h
|
|
index d5a6715..d5b9065 100644
|
|
--- a/src/ofono-iface.h
|
|
+++ b/src/ofono-iface.h
|
|
@@ -1,6 +1,6 @@
|
|
/*
|
|
* BlueALSA - ofono-iface.h
|
|
- * Copyright (c) 2016-2019 Arkadiusz Bokowy
|
|
+ * Copyright (c) 2016-2020 Arkadiusz Bokowy
|
|
* 2018 Thierry Bultel
|
|
*
|
|
* This file is a part of bluez-alsa.
|
|
@@ -27,6 +27,6 @@
|
|
#define OFONO_AUDIO_CODEC_CVSD 0x01
|
|
#define OFONO_AUDIO_CODEC_MSBC 0x02
|
|
|
|
-const GDBusInterfaceInfo ofono_iface_hf_audio_agent;
|
|
+extern const GDBusInterfaceInfo ofono_iface_hf_audio_agent;
|
|
|
|
#endif
|
|
--
|
|
2.20.1
|
|
|