mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-17 14:49: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
110 lines
3.7 KiB
Diff
110 lines
3.7 KiB
Diff
From 1ce739649b4d66339a03fc0ec9ee7a2f7c141780 Mon Sep 17 00:00:00 2001
|
|
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
|
|
Date: Fri, 24 Jan 2020 13:33:00 +0900
|
|
Subject: [PATCH] Support gcc10 compilation
|
|
|
|
gcc10 now defaults to -fno-common, and with gcc10 menu-cache compilation fails like
|
|
|
|
/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:167: multiple definition of `DirDirs'; main.o:menu-cache-gen/menu-tags.h:167: first defined here
|
|
/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:164: multiple definition of `AppDirs'; main.o:menu-cache-gen/menu-tags.h:164: first defined here
|
|
/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:52: multiple definition of `menuTag_Layout'; main.o:menu-cache-gen/menu-tags.h:52: first defined here
|
|
....
|
|
|
|
This patch fixes compilation with gcc10: properly declaring variables in header with "extern", and also removing some unneeded variables in header files.
|
|
|
|
[Retrieved from:
|
|
https://github.com/lxde/menu-cache/pull/19/commits/1ce739649b4d66339a03fc0ec9ee7a2f7c141780]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
menu-cache-gen/menu-tags.h | 55 ++++++++++++--------------------------
|
|
1 file changed, 17 insertions(+), 38 deletions(-)
|
|
|
|
diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
|
|
index f3fd7d3..f71c0bc 100644
|
|
--- a/menu-cache-gen/menu-tags.h
|
|
+++ b/menu-cache-gen/menu-tags.h
|
|
@@ -22,38 +22,17 @@
|
|
#include <libfm/fm-extra.h>
|
|
#include <menu-cache.h>
|
|
|
|
-FmXmlFileTag menuTag_Menu;
|
|
-FmXmlFileTag menuTag_AppDir;
|
|
-FmXmlFileTag menuTag_DefaultAppDirs;
|
|
-FmXmlFileTag menuTag_DirectoryDir;
|
|
-FmXmlFileTag menuTag_DefaultDirectoryDirs;
|
|
-FmXmlFileTag menuTag_Include;
|
|
-FmXmlFileTag menuTag_Exclude;
|
|
-FmXmlFileTag menuTag_Filename;
|
|
-FmXmlFileTag menuTag_Or;
|
|
-FmXmlFileTag menuTag_And;
|
|
-FmXmlFileTag menuTag_Not;
|
|
-FmXmlFileTag menuTag_Category;
|
|
-FmXmlFileTag menuTag_MergeFile;
|
|
-FmXmlFileTag menuTag_MergeDir;
|
|
-FmXmlFileTag menuTag_DefaultMergeDirs;
|
|
-FmXmlFileTag menuTag_Directory;
|
|
-FmXmlFileTag menuTag_Name;
|
|
-FmXmlFileTag menuTag_Deleted;
|
|
-FmXmlFileTag menuTag_NotDeleted;
|
|
-FmXmlFileTag menuTag_OnlyUnallocated;
|
|
-FmXmlFileTag menuTag_NotOnlyUnallocated;
|
|
-FmXmlFileTag menuTag_All;
|
|
-FmXmlFileTag menuTag_LegacyDir;
|
|
-FmXmlFileTag menuTag_KDELegacyDirs;
|
|
-FmXmlFileTag menuTag_Move;
|
|
-FmXmlFileTag menuTag_Old;
|
|
-FmXmlFileTag menuTag_New;
|
|
-FmXmlFileTag menuTag_Layout;
|
|
-FmXmlFileTag menuTag_DefaultLayout;
|
|
-FmXmlFileTag menuTag_Menuname;
|
|
-FmXmlFileTag menuTag_Separator;
|
|
-FmXmlFileTag menuTag_Merge;
|
|
+extern FmXmlFileTag menuTag_AppDir;
|
|
+extern FmXmlFileTag menuTag_DirectoryDir;
|
|
+extern FmXmlFileTag menuTag_Include;
|
|
+extern FmXmlFileTag menuTag_Exclude;
|
|
+extern FmXmlFileTag menuTag_Filename;
|
|
+extern FmXmlFileTag menuTag_Or;
|
|
+extern FmXmlFileTag menuTag_And;
|
|
+extern FmXmlFileTag menuTag_Not;
|
|
+extern FmXmlFileTag menuTag_Category;
|
|
+extern FmXmlFileTag menuTag_All;
|
|
+extern FmXmlFileTag menuTag_LegacyDir;
|
|
|
|
typedef enum {
|
|
MERGE_NONE, /* starting value */
|
|
@@ -152,19 +131,19 @@ typedef struct {
|
|
} MenuRule;
|
|
|
|
/* requested language(s) */
|
|
-char **languages;
|
|
+extern char **languages;
|
|
|
|
/* list of menu files to monitor */
|
|
-GSList *MenuFiles;
|
|
+extern GSList *MenuFiles;
|
|
|
|
/* list of menu dirs to monitor */
|
|
-GSList *MenuDirs;
|
|
+extern GSList *MenuDirs;
|
|
|
|
/* list of available app dirs */
|
|
-GSList *AppDirs;
|
|
+extern GSList *AppDirs;
|
|
|
|
/* list of available dir dirs */
|
|
-GSList *DirDirs;
|
|
+extern GSList *DirDirs;
|
|
|
|
/* parse and merge menu files */
|
|
MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error);
|
|
@@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil
|
|
void _free_layout_items(GList *data);
|
|
|
|
/* verbosity level */
|
|
-gint verbose;
|
|
+extern gint verbose;
|
|
|
|
#define DBG if (verbose) g_debug
|
|
#define VDBG if (verbose > 1) g_debug
|