samsung-lt01wifi: move downstream variant to unmaintained (MR 4435)

- The 3 different variants of the lt01 will be merged into a single
  main device package, so the old package is deprecated.
- We will now be using the mainline kernel, so the downstream kernel is
  no longer necessary.
- Add a patch to fix a new build error.
This commit is contained in:
knuxify 2023-09-30 20:40:09 +02:00 committed by Stefan Hansson
parent d1ba99ce5e
commit c3ed702df9
No known key found for this signature in database
GPG key ID: 8A700086A9FE41FD
11 changed files with 124 additions and 15 deletions

View file

@ -1,13 +1,14 @@
# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-lt01)!
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-samsung-lt01wifi
pkgname=device-samsung-lt01wifi-downstream
pkgdesc="Samsung Galaxy Tab 3 8.0"
pkgver=0.1
pkgrel=14
pkgrel=0
url="https://postmarketos.org"
license="MIT"
arch="armv7"
options="!check !archcheck"
depends="postmarketos-base linux-samsung-lt01wifi mkbootimg"
depends="postmarketos-base linux-samsung-lt01wifi-downstream mkbootimg"
makedepends="devicepkg-dev"
subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
source="deviceinfo
@ -24,12 +25,12 @@ package() {
nonfree_firmware() {
pkgdesc="Wifi firmware"
depends="firmware-samsung-lt01wifi"
depends="firmware-samsung-lt01wifi-downstream"
mkdir "$subpkgdir"
}
sha512sums="
6e527a8506854fa59d83514962cbed0d6404aa1cf547780d88a543a1e133a1366b3d8ab5b4362b84881b1902bebb661ecf1378935d5d73092c989de812f14e06 deviceinfo
b6d8953f5717b81fd1cb6d34e0f5539480b348a52194bbd3e6d83c3ae9e77bc2d948b05303c93ecbd7121f7affd476a9522c32c1a55fd7cee4ae0ca1bc0b88a0 deviceinfo
af036fe35011db078379dbb2e8c16c86546f0a4fcb3d1bcee3502bb1ea5b38f3ec5a9fa8cd1ca8ed8b89592a7f572d6072781289845303e0bf85fc2de4ead9fb modules-load.conf
594d6059ba1b06bce65538d26ce80cf2ce840786605b86e993ffaef858837507c033c0f95b7bcd9914ae7ea3cd2a9e43e32ec879db7c908219ad62d38b4e426a modprobe.conf
"

View file

@ -4,7 +4,7 @@
deviceinfo_format_version="0"
deviceinfo_name="Samsung Galaxy Tab 3 8.0"
deviceinfo_manufacturer="Samsung"
deviceinfo_codename="samsung-lt01wifi"
deviceinfo_codename="samsung-lt01wifi-downstream"
deviceinfo_year="2013"
deviceinfo_arch="armv7"

View file

@ -1,5 +1,6 @@
# Unmaintained: Only used by unmaintained downstream kernel
# Maintainer: knuxify <knuxify@gmail.com>
pkgname=firmware-samsung-lt01wifi
pkgname=firmware-samsung-lt01wifi-downstream
pkgver=0.1
pkgrel=0
_commit="38ea48dbc6a683874aaf3376b63fc97ff3823459"
@ -21,4 +22,6 @@ package() {
"$pkgdir"/lib/firmware/postmarketos/nvram_net.txt
}
sha512sums="33500dccd81d9f4ee8735f2f91e056913f0abb538248244512405f42156dd663b4337f97226fcadc1ed772c56590380cc7a6a8735a6fed46c62b8ac61424d684 firmware-samsung-lt01wifi-38ea48dbc6a683874aaf3376b63fc97ff3823459.tar.gz"
sha512sums="
33500dccd81d9f4ee8735f2f91e056913f0abb538248244512405f42156dd663b4337f97226fcadc1ed772c56590380cc7a6a8735a6fed46c62b8ac61424d684 firmware-samsung-lt01wifi-downstream-38ea48dbc6a683874aaf3376b63fc97ff3823459.tar.gz
"

View file

@ -1,13 +1,14 @@
# Unmaintained: Downstream kernel, only for testing. Use linux-postmarketos-exynos4.
# Reference: <https://postmarketos.org/vendorkernel>
# Kernel config based on: arch/arm/configs/lineage_lt01wifi_defconfig
pkgname=linux-samsung-lt01wifi
pkgname=linux-samsung-lt01wifi-downstream
pkgver=3.0.31
pkgrel=4
pkgdesc="Samsung Galaxy Tab 3 8.0 kernel fork"
pkgrel=0
pkgdesc="Samsung Galaxy Tab 3 8.0 kernel fork (downstream, unmaintained)"
arch="armv7"
_carch="arm"
_flavor="samsung-lt01wifi"
_flavor="samsung-lt01wifi-downstream"
url="https://kernel.org"
license="GPL-2.0-only"
options="!strip !check !tracedeps pmb:cross-native"
@ -21,6 +22,7 @@ source="
$pkgname-$_commit.tar.gz::https://github.com/gr8nole/$_repository/archive/$_commit.tar.gz
$_config
0001-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch
linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
gcc7-give-up-on-ilog2-const-optimizations.patch
gcc8-fix-put-user.patch
"
@ -48,8 +50,11 @@ package() {
INSTALL_MOD_PATH="$pkgdir" modules_install
}
sha512sums="43c9a5cfe9a6f66d7fbdec04ea6a04c06864d2f6140f458fba7bcde7a871d0128d5f1bf45724923c6e7fc592863a1a0a01a067dd6255b5f7ee0dbef46958140c linux-samsung-lt01wifi-6ad0b18a63deacaebbc3d12751c3230cedbf7335.tar.gz
cdd1902822b25c023ad9efd333387e59b18a73727bcb3963d67b979b9da0cd6c87032cbdb5f0e87f9ac0030444afdc7ffb4aaccada2683201694e8da52cffbbc config-samsung-lt01wifi.armv7
sha512sums="
43c9a5cfe9a6f66d7fbdec04ea6a04c06864d2f6140f458fba7bcde7a871d0128d5f1bf45724923c6e7fc592863a1a0a01a067dd6255b5f7ee0dbef46958140c linux-samsung-lt01wifi-downstream-6ad0b18a63deacaebbc3d12751c3230cedbf7335.tar.gz
cdd1902822b25c023ad9efd333387e59b18a73727bcb3963d67b979b9da0cd6c87032cbdb5f0e87f9ac0030444afdc7ffb4aaccada2683201694e8da52cffbbc config-samsung-lt01wifi-downstream.armv7
df6e20ac3c29cee1aa652a78cd5270bc785e824bcd5a9cd25e0681be506bf6a7547683fca1fc4170b175fa649602bddc98c34beb094ea59e8273aeb8f9703807 0001-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch
b14c0033045dd1ec5dd03612d8fb6361c4a0fa3eb54f7e262628d18756456c2e569a437d1b35099a8302577d1e471bbf9222b4b1b30f6578af7e4342a0009815 linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch
197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch"
197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch
"

View file

@ -0,0 +1,100 @@
From 3020e3a81b63e05891ef5d40f3acfbd00040ba17 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Mon, 4 Nov 2019 19:31:45 +0100
Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
directive
It looks like a section directive was using "Solaris style" to declare
the section flags. Replace this with the GNU style so that Clang's
integrated assembler can assemble this directive.
The modified instances were identified via:
$ ag \.section | grep #
Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119
Link: https://github.com/ClangBuiltLinux/linux/issues/744
Link: https://bugs.llvm.org/show_bug.cgi?id=43759
Link: https://reviews.llvm.org/D69296
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Suggested-by: Fangrui Song <maskray@google.com>
Suggested-by: Jian Cai <jiancai@google.com>
Suggested-by: Peter Smith <peter.smith@linaro.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
[ partial backport to 3.4 ]
---
arch/arm/boot/bootp/init.S | 2 +-
arch/arm/boot/compressed/big-endian.S | 2 +-
arch/arm/boot/compressed/head.S | 2 +-
arch/arm/boot/compressed/piggy.lzma.S | 2 +-
arch/arm/mm/proc-v7.S | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
index 78b508075161..868eeeaaa46e 100644
--- a/arch/arm/boot/bootp/init.S
+++ b/arch/arm/boot/bootp/init.S
@@ -16,7 +16,7 @@
* size immediately following the kernel, we could build this into
* a binary blob, and concatenate the zImage using the cat command.
*/
- .section .start,#alloc,#execinstr
+ .section .start, "ax"
.type _start, #function
.globl _start
diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
index 25ab26f1c6f0..f22428e275f8 100644
--- a/arch/arm/boot/compressed/big-endian.S
+++ b/arch/arm/boot/compressed/big-endian.S
@@ -5,7 +5,7 @@
* Author: Nicolas Pitre
*/
- .section ".start", #alloc, #execinstr
+ .section ".start", "ax"
mrc p15, 0, r0, c1, c0, 0 @ read control reg
orr r0, r0, #(1 << 7) @ enable big endian mode
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 77a716bdf4d3..b70606652d21 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -113,7 +113,7 @@
#endif
.endm
- .section ".start", #alloc, #execinstr
+ .section ".start", "ax"
/*
* sort out different calling conventions
*/
diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
index d7e69cffbc0a..cfea81ae8f4b 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"
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 69363be2f241..321cb1c6a091 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -422,7 +422,7 @@ __v7_setup_stack:
string cpu_elf_name, "v7"
.align
- .section ".proc.info.init", #alloc, #execinstr
+ .section ".proc.info.init", "ax"
/*
* Standard v7 proc info content
--
2.30.2