main/linux-postmarketos-qcom-msm8974: upgrade to 5.9.0_rc4 (MR 1572)

Config changes:
* DRM_PANEL_PANASONIC_VVX10F034N00 for sony-castor
* GPIO_PCA953X for samsung-klte
This commit is contained in:
Luca Weiss 2020-09-12 11:42:18 +02:00
parent b0255ecb87
commit b7dfa002c1
No known key found for this signature in database
GPG key ID: 72D843B89D4DD756
3 changed files with 550 additions and 196 deletions

View file

@ -3,9 +3,9 @@ _flavor=postmarketos-qcom-msm8974
_config="config-$_flavor.$CARCH"
pkgname=linux-$_flavor
pkgver=5.6.0_rc6
pkgrel=7
_commit="b9f39bdf61e5c8f5db63afe7ab1c9ff77aa6b4bc"
pkgver=5.9.0_rc4
pkgrel=0
_commit="0aa15376cf66e41bb980b24a388cdf2dcb770a68"
pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8974 devices"
arch="armv7"
_carch="arm"
@ -22,7 +22,6 @@ makedepends="
"
source="https://gitlab.com/postmarketOS/linux-postmarketos/-/archive/$_commit/linux-postmarketos-$_commit.tar.gz
config-$_flavor.armv7
fix-gcc10-build.patch
"
builddir="$srcdir/linux-postmarketos-$_commit"
@ -50,6 +49,5 @@ package() {
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
}
sha512sums="92866a037fd1bd3b17572754548c19423f6e762d90fb1ebca52c252ace85c87b6f747515f8606fe627d34c59828cbebf83054b9d6e5dd977e0398d9c46fcc176 linux-postmarketos-b9f39bdf61e5c8f5db63afe7ab1c9ff77aa6b4bc.tar.gz
bcaf8bcba8a16cf6ff0218fe857a2c8e064edf495d168422c80e4785e1b2b17346319a3bcb3f1a33f9f6caab8cb4a13032dfd1cfdba40bb2acb74379c52d077a config-postmarketos-qcom-msm8974.armv7
fcb8c823e9943f409876bbec88e78ee2bbac3a30888ed3b10eb790157f568167e29d37763af4ebbf3ae9ce7fc0ed7f39710f58487069579a5eafa7e540e1e7e1 fix-gcc10-build.patch"
sha512sums="77e13b23fdbaf36cc91b3c55b9c5f9f7bec6c5c31c6d255daad18e0c1e27176218d465a03c449bd3678f7cb37b5a21970145fc6a8dac5400f9eb318281157f47 linux-postmarketos-0aa15376cf66e41bb980b24a388cdf2dcb770a68.tar.gz
8c918d1fa9fdda74829b7df5d3b9fb91536e8430e9d689d0eb515336cba5bf0ac09f0d0810bac6331ef76ecb5cdb119a9c20d1c10ee22234513ee5bee2cc1fa5 config-postmarketos-qcom-msm8974.armv7"

View file

@ -1,43 +0,0 @@
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>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
[robh: cherry-pick from upstream]
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
scripts/dtc/dtc-lexer.l | 1 -
1 file changed, 1 deletion(-)
--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
@@ -38,7 +38,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() */