From 18135abad536ca014746358a740cc9764150d919 Mon Sep 17 00:00:00 2001 From: Karl Chan Date: Fri, 1 Dec 2023 21:29:54 +0800 Subject: [PATCH] linux-samsung-treltexx: fix build --- ...is-style-flag-on-section-xz-supplementation.patch | 12 ++++++++++++ device/testing/linux-samsung-treltexx/APKBUILD | 6 +++++- ...is-style-flag-on-section-xz-supplementation.patch | 1 + ...1-replace-Sun-Solaris-style-flag-on-section.patch | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch create mode 120000 device/testing/linux-samsung-treltexx/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch create mode 120000 device/testing/linux-samsung-treltexx/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch diff --git a/device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch b/device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch new file mode 100644 index 000000000..4155f162a --- /dev/null +++ b/device/.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch @@ -0,0 +1,12 @@ +This patch is the supplementation of linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch. + +diff --git a/arch/arm/boot/compressed/piggy.xzkern.S b/arch/arm/boot/compressed/piggy.xzkern.S +index d7e69cffbc0a..cfea81ae8f4b 100644 +--- a/arch/arm/boot/compressed/piggy.xzkern.S ++++ b/arch/arm/boot/compressed/piggy.xzkern.S +@@ -1,4 +1,4 @@ +- .section .piggydata,#alloc ++ .section .piggydata, "a" + .globl input_data + input_data: + .incbin "arch/arm/boot/compressed/piggy.xzkern" diff --git a/device/testing/linux-samsung-treltexx/APKBUILD b/device/testing/linux-samsung-treltexx/APKBUILD index 24280fef6..f221b78d2 100644 --- a/device/testing/linux-samsung-treltexx/APKBUILD +++ b/device/testing/linux-samsung-treltexx/APKBUILD @@ -2,7 +2,7 @@ # Kernel config based on: arch/arm/configs/lineage_trelte_defconfig pkgname=linux-samsung-treltexx pkgver=3.10.9 -pkgrel=0 +pkgrel=1 pkgdesc="samsung Galaxy Note 4 kernel fork" arch="armv7" _carch="arm" @@ -38,6 +38,8 @@ source=" drivers-muic-fix.patch security-tima_uevent-fix.patch treltexx_hw_rev.patch + linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch + linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch " builddir="$srcdir/$_repository-$_commit" _outdir="out" @@ -79,4 +81,6 @@ dd5d6ec38bd6f026bd811e0dfd190bfa8926b088669315ed179c16f1c32008592c585bbc6681c589 e2e550d9d5020c2f51e1af0576236ac9d57b2e0c10c14a2a92dc7b1bf4100ebc15a6bf0fff4f57232164e84358dc37d24721e1d9f133a526bf78b610eaf00add drivers-muic-fix.patch f48216b4f2068d7ee2788d18deee4af769bcfa8cb88d4257275285a6017e8f193d527a1ede1ef1fb3a1bf7795f633434b57c13aed95ab1161066f215619a8c8b security-tima_uevent-fix.patch fc618784b85fd77609e32a2af3a68456d66a3b6126c52d00e8a531e6c2c3c54c455330d9f4a9f857f2cc6e3d406a47c5d01ec9f7a96fede031f2dde136184ae1 treltexx_hw_rev.patch +b14c0033045dd1ec5dd03612d8fb6361c4a0fa3eb54f7e262628d18756456c2e569a437d1b35099a8302577d1e471bbf9222b4b1b30f6578af7e4342a0009815 linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch +a6b6c781dd23f9a45a1605456d8c9af3ec6b5c389acd2b5d4c32280dcb59118996d794165bea2005dbdd9415297e5060bcac7579f908f7d65406a862b743fed5 linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch " diff --git a/device/testing/linux-samsung-treltexx/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch b/device/testing/linux-samsung-treltexx/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch new file mode 120000 index 000000000..5dbf2a3be --- /dev/null +++ b/device/testing/linux-samsung-treltexx/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section-xz-supplementation.patch \ No newline at end of file diff --git a/device/testing/linux-samsung-treltexx/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/testing/linux-samsung-treltexx/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-samsung-treltexx/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