From b8c51ec2763c83e7379600ac8c4ef4366131cd6e Mon Sep 17 00:00:00 2001 From: Alexey Minnekhanov Date: Fri, 25 Jun 2021 01:55:45 +0300 Subject: [PATCH] linux-lg-us996: remove cross-compiler from makedepends (MR 2272) and disable CONFIG_COMPAT_VDSO, otherwise build fails without armv7 compiler --- device/testing/linux-lg-us996/APKBUILD | 5 ++--- device/testing/linux-lg-us996/config-lg-us996.aarch64 | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/device/testing/linux-lg-us996/APKBUILD b/device/testing/linux-lg-us996/APKBUILD index efc3aec8b..5c6e83cf6 100644 --- a/device/testing/linux-lg-us996/APKBUILD +++ b/device/testing/linux-lg-us996/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-lg-us996 pkgver=3.18.113 -pkgrel=0 +pkgrel=1 pkgdesc="LG V20 (us996) kernel fork" arch="aarch64" _carch="arm64" @@ -18,7 +18,6 @@ makedepends=" bash flex gcc6 - gcc-armv7 gmp-dev bc linux-headers @@ -64,7 +63,7 @@ package() { sha512sums=" bc15ff2fc2f452fc3e30704c36800e029a1911d5852b113b47f48264fcf43266ad1185cc69a5e8978bb9c091b94ef36f40a607545199546e0a554269de3ae71a linux-lg-us996-c0cf2a6e4ccceb664492ca47b8b1c9f9d4a680c2.tar.gz -762375e506ce2ef47912d874afee327781d494b4c80308633a0055f72372678c05b4ad8f999bc925c772755c41092046d49f3dd780ad656ee58029f9de4096c2 config-lg-us996.aarch64 +9ef29a250902e6f896788e1d443a86848f7bc762d21a72c89cc306a02844dfc1b709296cc12b3391339fcfed2b762ae14950d0686150d7507c28f3ef1fd723cc config-lg-us996.aarch64 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch 531e8d26eb5a152e051d582f8e626b62299193b5099f953135ed944239a9eadab0d0cfb3c4566d3e86706d61a59dcf3b04d7760621b926e619d13944d5af387f fix_include_paths.patch 19a6c3445bfd8057e4fabe1709f3d2344f3a99fef49b44636c07a18ba8791fab1bcff77f93aadff887946ae6f83c9d86e1c28f9b88d03c6ba156704d430b4470 vdsomunge_upstream.patch diff --git a/device/testing/linux-lg-us996/config-lg-us996.aarch64 b/device/testing/linux-lg-us996/config-lg-us996.aarch64 index f901500b0..004b0a782 100644 --- a/device/testing/linux-lg-us996/config-lg-us996.aarch64 +++ b/device/testing/linux-lg-us996/config-lg-us996.aarch64 @@ -505,7 +505,7 @@ CONFIG_COREDUMP=y CONFIG_COMPAT=y CONFIG_KUSER_HELPERS=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_COMPAT_VDSO=y +# CONFIG_COMPAT_VDSO is not set CONFIG_CROSS_COMPILE_ARM32="armv7-alpine-linux-musleabihf-" #