From a2a377334be2a09c681c6af7a38b7f6abca2fb5b Mon Sep 17 00:00:00 2001 From: socksinspace Date: Sun, 25 Feb 2024 16:16:34 +0100 Subject: [PATCH] lg-vee7e: fix build, and add a new shared patch (MR 4860) This fixes building for linux-lg-vee7e, and adds a shared patch. The shared patch replaces the "Solaris style flags" in piggy.gzip.S [ci:skip-build]: already built successfully in CI --- .../linux/linux3.4-fix-piggy.gzip.S.patch | 10 ++++++++++ device/testing/linux-lg-vee7e/APKBUILD | 6 +++++- ...3-1-replace-Sun-Solaris-style-flag-on-section.patch | 1 + .../linux-lg-vee7e/linux3.4-fix-piggy.gzip.S.patch | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 device/.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch create mode 120000 device/testing/linux-lg-vee7e/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch create mode 120000 device/testing/linux-lg-vee7e/linux3.4-fix-piggy.gzip.S.patch diff --git a/device/.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch b/device/.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch new file mode 100644 index 000000000..d3b8e4383 --- /dev/null +++ b/device/.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch @@ -0,0 +1,10 @@ +diff --git a/arch/arm/boot/compressed/piggy.gzip.S b/arch/arm/boot/compressed/piggy.gzip.S +index a68adf91a16..175ed02a6ac 100644 +--- a/arch/arm/boot/compressed/piggy.gzip.S ++++ b/arch/arm/boot/compressed/piggy.gzip.S +@@ -1,4 +1,4 @@ +- .section .piggydata,#alloc ++ .section .piggydata, "a" + .globl input_data + input_data: + .incbin "arch/arm/boot/compressed/piggy.gzip" diff --git a/device/testing/linux-lg-vee7e/APKBUILD b/device/testing/linux-lg-vee7e/APKBUILD index 8d578f82a..9af2bddfd 100644 --- a/device/testing/linux-lg-vee7e/APKBUILD +++ b/device/testing/linux-lg-vee7e/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-lg-vee7e pkgver=3.4.0 -pkgrel=8 +pkgrel=9 pkgdesc="LG Optimus L7 II kernel fork" arch="armv7" _carch="arm" @@ -44,6 +44,8 @@ source=" 02_gpu-msm-fix-gcc5-compile.patch 0001-Makefile-fix-build-with-new-binutils.patch linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch + linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch + linux3.4-fix-piggy.gzip.S.patch " builddir="$srcdir/$_repository-$_commit" _outdir="out" @@ -75,4 +77,6 @@ ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch ea8d5913bb28a2e1b7a22e7e2257c90b21b20382c4a08254b12dda1592c20cb5ec59ed4047ee8890380739889a7365ca087c398581f8702568d3cd575a59d158 0001-Makefile-fix-build-with-new-binutils.patch 5e81c20b0b30c1ab09bd59f1e1b77fcce945a27de8144c68617ddc5e8f10e1f6fa8b1e4cd5d63e43511d61dace46fb26b14a6227a667b9718d44c8b81dbe6100 linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch +9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch +080745ca4ecaa804ee1df26ea81975ca93b74372e0c08322a6c481e97807495ae6ceb6cc77653afa24f9f2df45da8ebf8e5de6b06037fbb08e0279877ce42188 linux3.4-fix-piggy.gzip.S.patch " diff --git a/device/testing/linux-lg-vee7e/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/testing/linux-lg-vee7e/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch new file mode 120000 index 000000000..858243081 --- /dev/null +++ b/device/testing/linux-lg-vee7e/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch \ No newline at end of file diff --git a/device/testing/linux-lg-vee7e/linux3.4-fix-piggy.gzip.S.patch b/device/testing/linux-lg-vee7e/linux3.4-fix-piggy.gzip.S.patch new file mode 120000 index 000000000..e5975978e --- /dev/null +++ b/device/testing/linux-lg-vee7e/linux3.4-fix-piggy.gzip.S.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch \ No newline at end of file