From 41f2cc0155d3b786d65581205d4acb569de1276d Mon Sep 17 00:00:00 2001 From: Stefan Hansson Date: Mon, 6 May 2024 00:06:57 +0200 Subject: [PATCH] linux-samsung-m0-downstream: fix build (MR 5098) Part of https://gitlab.com/postmarketOS/pmaports/-/issues/2401 [ci:skip-build]: already built successfully in CI --- .../linux/linux3.0-fix-piggy.lzma.S.patch | 22 +++++++++++++++++++ .../linux-samsung-m0-downstream/APKBUILD | 8 ++++++- ...ce-Sun-Solaris-style-flag-on-section.patch | 1 + .../linux3.0-fix-piggy.lzma.S.patch | 1 + .../linux3.4-fix-piggy.gzip.S.patch | 1 + 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 device/.shared-patches/linux/linux3.0-fix-piggy.lzma.S.patch create mode 120000 device/unmaintained/linux-samsung-m0-downstream/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch create mode 120000 device/unmaintained/linux-samsung-m0-downstream/linux3.0-fix-piggy.lzma.S.patch create mode 120000 device/unmaintained/linux-samsung-m0-downstream/linux3.4-fix-piggy.gzip.S.patch diff --git a/device/.shared-patches/linux/linux3.0-fix-piggy.lzma.S.patch b/device/.shared-patches/linux/linux3.0-fix-piggy.lzma.S.patch new file mode 100644 index 000000000..34e7da150 --- /dev/null +++ b/device/.shared-patches/linux/linux3.0-fix-piggy.lzma.S.patch @@ -0,0 +1,22 @@ +From c6b821b1281f7ce2b54aad3b0b2acd0e29039c8f Mon Sep 17 00:00:00 2001 +From: Stefan Hansson +Date: Mon, 6 May 2024 10:59:58 +0200 +Subject: [PATCH] Fix lzma piggy + +--- + arch/arm/boot/compressed/piggy.lzma.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S +index d7e69cffbc0..cfea81ae8f4 100644 +--- a/arch/arm/boot/compressed/piggy.lzma.S ++++ b/arch/arm/boot/compressed/piggy.lzma.S +@@ -1,4 +1,4 @@ +- .section .piggydata,#alloc ++ .section .piggydata, "a" + .globl input_data + input_data: + .incbin "arch/arm/boot/compressed/piggy.lzma" +-- +2.45.0 + diff --git a/device/unmaintained/linux-samsung-m0-downstream/APKBUILD b/device/unmaintained/linux-samsung-m0-downstream/APKBUILD index a765f6d9e..47147ebc3 100644 --- a/device/unmaintained/linux-samsung-m0-downstream/APKBUILD +++ b/device/unmaintained/linux-samsung-m0-downstream/APKBUILD @@ -4,7 +4,7 @@ pkgname=linux-samsung-m0-downstream pkgver=3.0.101 -pkgrel=0 +pkgrel=1 pkgdesc="Samsung Galaxy S III kernel fork" arch="armv7" _carch="arm" @@ -30,6 +30,9 @@ _config="config-$_flavor.$arch" source=" $pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz $_config + linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch + linux3.0-fix-piggy.lzma.S.patch + linux3.4-fix-piggy.gzip.S.patch " builddir="$srcdir/$_repository-$_commit" _outdir="out" @@ -63,4 +66,7 @@ package() { sha512sums=" d87dd54152980b30012fead62e639dde6ff0862d376790eac32800aeffd91482a220c7b1f233933a1879796dcaa3722e86c42a5f0e4df4168ae1f65362952779 linux-samsung-m0-downstream-fa8fa332fdec11744ffe0c742775cc22efe0d041.tar.gz 2923f9ea030633e320799f92ba4c898f66864ed3aed214e321d95f5dadd8c5ebf1fc35bfea5aeffecc668992b1b1101ace301aa930f9d965f199a345e0687d6e config-samsung-m0-downstream.armv7 +66ab793bb1fa50a07f10e2cdb0f49ea05a787c6b1fe5358e69a76e43295ac5be3b68cdf6a882e868bfe6969cac981c5545587cd57eee4b5cec26078ae0ecaa1c linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch +3c098328e45db14cbeff6a515bb373129e0d0983884178f413c5a4206704b356ddecdf58557a04b828b391dbfef3cea0e98b47834aa97b86496aa2fce0013b92 linux3.0-fix-piggy.lzma.S.patch +080745ca4ecaa804ee1df26ea81975ca93b74372e0c08322a6c481e97807495ae6ceb6cc77653afa24f9f2df45da8ebf8e5de6b06037fbb08e0279877ce42188 linux3.4-fix-piggy.gzip.S.patch " diff --git a/device/unmaintained/linux-samsung-m0-downstream/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/unmaintained/linux-samsung-m0-downstream/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch new file mode 120000 index 000000000..128f8a274 --- /dev/null +++ b/device/unmaintained/linux-samsung-m0-downstream/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch \ No newline at end of file diff --git a/device/unmaintained/linux-samsung-m0-downstream/linux3.0-fix-piggy.lzma.S.patch b/device/unmaintained/linux-samsung-m0-downstream/linux3.0-fix-piggy.lzma.S.patch new file mode 120000 index 000000000..62ecad53b --- /dev/null +++ b/device/unmaintained/linux-samsung-m0-downstream/linux3.0-fix-piggy.lzma.S.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.0-fix-piggy.lzma.S.patch \ No newline at end of file diff --git a/device/unmaintained/linux-samsung-m0-downstream/linux3.4-fix-piggy.gzip.S.patch b/device/unmaintained/linux-samsung-m0-downstream/linux3.4-fix-piggy.gzip.S.patch new file mode 120000 index 000000000..e5975978e --- /dev/null +++ b/device/unmaintained/linux-samsung-m0-downstream/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