Update Trixie packaging for libfdt package
This change brings updates from the 'f/trixie' branch into 'master' to ensure consistent functionality and packaging structure across both branches. Test Plan: PASS master trixie build Story: 2011360 Task: 53272 Change-Id: Ifc8f817821b71ae1096064950b08931540d419de Signed-off-by: Abhinav Ayyapasetti <ayyapasetti.abhinav@windriver.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
Metadata-Version: 1.1
|
||||
Name: libfdt
|
||||
Version: 1.4.4
|
||||
Version: 1.7.2
|
||||
Summary: Device Tree Compiler
|
||||
Home-page:
|
||||
Author: David Gibson
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
libfdt (1.4.4-1) UNRELEASED; urgency=low
|
||||
libfdt (1.7.2-2) UNRELEASED; urgency=low
|
||||
|
||||
* Initial release
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ Source: libfdt
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Maintainer: Starlingx Developers <starlingx-discuss@lists.starlingx.io>
|
||||
Build-Depends: debhelper-compat (= 12), bison, flex, gcc
|
||||
Build-Depends: debhelper-compat (= 12), bison, flex, gcc, pkg-config
|
||||
Standards-Version: 4.5.0
|
||||
Homepage: https://www.starlingx.io
|
||||
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
From 0e9225eb0dfec51def612b928d2f1836b092bc7e Mon Sep 17 00:00:00 2001
|
||||
From: Dirk Mueller <dmueller@suse.com>
|
||||
Date: Tue, 14 Jan 2020 18:53:41 +0100
|
||||
Subject: [PATCH] Remove redundant YYLOC global declaration
|
||||
|
||||
gcc 10 will default to -fno-common, which causes this error at link
|
||||
time:
|
||||
|
||||
(.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
|
||||
|
||||
This is because both dtc-lexer as well as dtc-parser define the same
|
||||
global symbol yyloc. Before with -fcommon those were merged into one
|
||||
defintion. The proper solution would be to to mark this as "extern",
|
||||
however that leads to:
|
||||
|
||||
dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
|
||||
26 | extern YYLTYPE yylloc;
|
||||
| ^~~~~~
|
||||
In file included from dtc-lexer.l:24:
|
||||
dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
|
||||
127 | extern YYLTYPE yylloc;
|
||||
| ^~~~~~
|
||||
cc1: all warnings being treated as errors
|
||||
|
||||
which means the declaration is completely redundant and can just be
|
||||
dropped.
|
||||
|
||||
Signed-off-by: Dirk Mueller <dmueller@suse.com>
|
||||
Message-Id: <20200114175341.2994-1-dmueller@suse.com>
|
||||
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
||||
---
|
||||
dtc-lexer.l | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/dtc-lexer.l b/dtc-lexer.l
|
||||
index 5c6c3fd..b3b7270 100644
|
||||
--- a/dtc-lexer.l
|
||||
+++ b/dtc-lexer.l
|
||||
@@ -23,7 +23,6 @@ LINECOMMENT "//".*\n
|
||||
#include "srcpos.h"
|
||||
#include "dtc-parser.tab.h"
|
||||
|
||||
-YYLTYPE yylloc;
|
||||
extern bool treesource_error;
|
||||
|
||||
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
0001-Remove-redundant-YYLOC-global-declaration.patch
|
||||
@@ -1,11 +1,11 @@
|
||||
---
|
||||
debver: 1.4.4-1
|
||||
debver: 1.7.2-2
|
||||
debname: libfdt
|
||||
dl_path:
|
||||
name: dtc-1.4.4.tar.gz
|
||||
url: https://www.kernel.org/pub/software/utils/dtc/dtc-1.4.4.tar.gz
|
||||
md5sum: e558cd0e244f122bcb4ebaca166aea4e
|
||||
sha256sum: 84169ccda61569b2b0f9832b066706e0b58767e0a30fa4194e816aba44e019d9
|
||||
name: dtc-1.7.2.tar.gz
|
||||
url: https://www.kernel.org/pub/software/utils/dtc/dtc-1.7.2.tar.gz
|
||||
md5sum: 81a06ba696bd91d55b4531cdc0b09dc6
|
||||
sha256sum: f200e5ebd7afd20d4b3804a3085af0870fcf3c194f8d7f0f6985cf8bbb4ac0f4
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
PKG_GITREVCOUNT: true
|
||||
|
||||
Reference in New Issue
Block a user