From 5c01445385ec1dabe90d346dae684847a614162d Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Tue, 13 May 2025 17:52:06 +0100 Subject: [PATCH] samsung-klimtlte: split downstream into separate package (MR 6491) --- .../APKBUILD | 33 ++++++++++++ .../deviceinfo | 37 ++++++++++++++ .../01-netfilter-symbols.patch | 0 ...andom-rndis-host-MAC-address-to-prev.patch | 0 ...add-guard-for-Finger-Sensing-Pad-cod.patch | 0 .../APKBUILD | 7 +-- .../config-samsung-klimtlte.armv7 | 0 ...cc10-extern_YYLOC_global_declaration.patch | 0 ...give-up-on-ilog2-const-optimizations.patch | 0 .../gcc8-fix-put-user.patch | 0 ...el-use-the-gnu89-standard-explicitly.patch | 0 ...ce-Sun-Solaris-style-flag-on-section.patch | 0 .../testing/device-samsung-klimtlte/APKBUILD | 50 ++----------------- .../device-samsung-klimtlte/deviceinfo | 4 +- 14 files changed, 81 insertions(+), 50 deletions(-) create mode 100644 device/archived/device-samsung-klimtlte-downstream/APKBUILD create mode 100644 device/archived/device-samsung-klimtlte-downstream/deviceinfo rename device/{testing/linux-samsung-klimtlte => archived/linux-samsung-klimtlte-downstream}/01-netfilter-symbols.patch (100%) rename device/{testing/linux-samsung-klimtlte => archived/linux-samsung-klimtlte-downstream}/02-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch (100%) rename device/{testing/linux-samsung-klimtlte => archived/linux-samsung-klimtlte-downstream}/03-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch (100%) rename device/{testing/linux-samsung-klimtlte => archived/linux-samsung-klimtlte-downstream}/APKBUILD (94%) rename device/{testing/linux-samsung-klimtlte => archived/linux-samsung-klimtlte-downstream}/config-samsung-klimtlte.armv7 (100%) rename device/{testing/linux-samsung-klimtlte => archived/linux-samsung-klimtlte-downstream}/gcc10-extern_YYLOC_global_declaration.patch (100%) rename device/{testing/linux-samsung-klimtlte => archived/linux-samsung-klimtlte-downstream}/gcc7-give-up-on-ilog2-const-optimizations.patch (100%) rename device/{testing/linux-samsung-klimtlte => archived/linux-samsung-klimtlte-downstream}/gcc8-fix-put-user.patch (100%) rename device/{testing/linux-samsung-klimtlte => archived/linux-samsung-klimtlte-downstream}/kernel-use-the-gnu89-standard-explicitly.patch (100%) rename device/{testing/linux-samsung-klimtlte => archived/linux-samsung-klimtlte-downstream}/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch (100%) diff --git a/device/archived/device-samsung-klimtlte-downstream/APKBUILD b/device/archived/device-samsung-klimtlte-downstream/APKBUILD new file mode 100644 index 000000000..798d7ec1f --- /dev/null +++ b/device/archived/device-samsung-klimtlte-downstream/APKBUILD @@ -0,0 +1,33 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Maintainer: Henrik Grimler +# Reference: +pkgname=device-samsung-klimtlte-downstream +pkgdesc="Samsung Galaxy Tab S 8.4 LTE (Downstream)" +pkgver=5 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="armv7" +options="!check !archcheck" +depends=" + firmware-samsung-klimt-downstream + linux-samsung-klimtlte + mkbootimg + msm-fb-refresher + postmarketos-base + postmarketos-base-downstream +" +makedepends="devicepkg-dev" +source="deviceinfo" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname +} + +sha512sums=" +d22eafa935e6bbe943246bfd2868988a155ce00a4d263c54c17daaad87cc245afa4f8d55e8b3b7ef9199be179173b0787c9d129322fc84304b4c298c766ec2ec deviceinfo +" diff --git a/device/archived/device-samsung-klimtlte-downstream/deviceinfo b/device/archived/device-samsung-klimtlte-downstream/deviceinfo new file mode 100644 index 000000000..276bab077 --- /dev/null +++ b/device/archived/device-samsung-klimtlte-downstream/deviceinfo @@ -0,0 +1,37 @@ +# Reference: +# Please use double quotes only. You can source this file in shell +# scripts. + +deviceinfo_format_version="0" +deviceinfo_name="Samsung Galaxy Tab S 8.4 LTE" +deviceinfo_manufacturer="Samsung" +deviceinfo_codename="samsung-klimtlte-downstream" +deviceinfo_year="2014" +deviceinfo_arch="armv7" +deviceinfo_getty="ttySAC2;115200" +deviceinfo_flash_kernel_on_update="true" + +# Device related +deviceinfo_chassis="tablet" +deviceinfo_keyboard="false" +deviceinfo_external_storage="true" +deviceinfo_screen_width="1600" +deviceinfo_screen_height="2560" +deviceinfo_create_initfs_extra="true" + +# Bootloader related +deviceinfo_flash_method="heimdall-bootimg" +deviceinfo_generate_bootimg="true" +deviceinfo_bootimg_qcdt="false" +deviceinfo_bootimg_append_seandroidenforce="true" +deviceinfo_bootimg_dtb_second="false" +deviceinfo_flash_offset_base="0x10000000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x01000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x00000100" +deviceinfo_flash_pagesize="2048" + +# Heimdall related +deviceinfo_flash_heimdall_partition_kernel="BOOT" +deviceinfo_flash_heimdall_partition_rootfs="SYSTEM" diff --git a/device/testing/linux-samsung-klimtlte/01-netfilter-symbols.patch b/device/archived/linux-samsung-klimtlte-downstream/01-netfilter-symbols.patch similarity index 100% rename from device/testing/linux-samsung-klimtlte/01-netfilter-symbols.patch rename to device/archived/linux-samsung-klimtlte-downstream/01-netfilter-symbols.patch diff --git a/device/testing/linux-samsung-klimtlte/02-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch b/device/archived/linux-samsung-klimtlte-downstream/02-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch similarity index 100% rename from device/testing/linux-samsung-klimtlte/02-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch rename to device/archived/linux-samsung-klimtlte-downstream/02-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch diff --git a/device/testing/linux-samsung-klimtlte/03-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch b/device/archived/linux-samsung-klimtlte-downstream/03-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch similarity index 100% rename from device/testing/linux-samsung-klimtlte/03-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch rename to device/archived/linux-samsung-klimtlte-downstream/03-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch diff --git a/device/testing/linux-samsung-klimtlte/APKBUILD b/device/archived/linux-samsung-klimtlte-downstream/APKBUILD similarity index 94% rename from device/testing/linux-samsung-klimtlte/APKBUILD rename to device/archived/linux-samsung-klimtlte-downstream/APKBUILD index b1704d0af..c57496eca 100644 --- a/device/testing/linux-samsung-klimtlte/APKBUILD +++ b/device/archived/linux-samsung-klimtlte-downstream/APKBUILD @@ -1,10 +1,11 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Maintainer: Henrik Grimler # Reference: # Kernel config based on: arch/arm/configs/lineageos_klimtlte_defconfig -pkgname=linux-samsung-klimtlte +pkgname=linux-samsung-klimtlte-downstream pkgver=3.4.113 -pkgrel=3 +pkgrel=0 pkgdesc="Samsung Galaxy Tab S 8.4 LTE kernel fork" arch="armv7" _carch="arm" @@ -49,7 +50,7 @@ package() { } sha512sums=" -38bb1af78097f32ec594d3c7dd393c1fe449c4c892b567b1558a999143049e1bc2fa7375ecd54477be97066534e0dd875c01453e4658b4ae3f91e346e0b3b6ea linux-samsung-klimtlte-c1a203cee565eb20a9b5bc2daf1c1b650a420fe5.tar.gz +38bb1af78097f32ec594d3c7dd393c1fe449c4c892b567b1558a999143049e1bc2fa7375ecd54477be97066534e0dd875c01453e4658b4ae3f91e346e0b3b6ea linux-samsung-klimtlte-downstream-c1a203cee565eb20a9b5bc2daf1c1b650a420fe5.tar.gz 896fadb4d8a1da5f9d7406b174c5adb6cd5e431342fa0d84b05fefcb6bdc251d48a848615d543548a0f6ef46e682b3bb53e159b94f406cdff09ffb5cbd3d7906 config-samsung-klimtlte.armv7 5214a850d496bed9e17575bd0b52e9e4415bcbd5a89863f924c5bfed848f684c0a95e8d10c9ef93c0e00149f034cf5e897d1b268be35676a600b3ee6e1917501 01-netfilter-symbols.patch 5fad0940e90da71277b70b6e72fbb75fcc5e12625e65f827ae896d448628b252b3312539f9c184b26ffe5ca3b343a56b388ea6addb7fe446c7d1ae2aefb4b51e 02-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch diff --git a/device/testing/linux-samsung-klimtlte/config-samsung-klimtlte.armv7 b/device/archived/linux-samsung-klimtlte-downstream/config-samsung-klimtlte.armv7 similarity index 100% rename from device/testing/linux-samsung-klimtlte/config-samsung-klimtlte.armv7 rename to device/archived/linux-samsung-klimtlte-downstream/config-samsung-klimtlte.armv7 diff --git a/device/testing/linux-samsung-klimtlte/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-samsung-klimtlte-downstream/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-samsung-klimtlte/gcc10-extern_YYLOC_global_declaration.patch rename to device/archived/linux-samsung-klimtlte-downstream/gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/testing/linux-samsung-klimtlte/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/archived/linux-samsung-klimtlte-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch similarity index 100% rename from device/testing/linux-samsung-klimtlte/gcc7-give-up-on-ilog2-const-optimizations.patch rename to device/archived/linux-samsung-klimtlte-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch diff --git a/device/testing/linux-samsung-klimtlte/gcc8-fix-put-user.patch b/device/archived/linux-samsung-klimtlte-downstream/gcc8-fix-put-user.patch similarity index 100% rename from device/testing/linux-samsung-klimtlte/gcc8-fix-put-user.patch rename to device/archived/linux-samsung-klimtlte-downstream/gcc8-fix-put-user.patch diff --git a/device/testing/linux-samsung-klimtlte/kernel-use-the-gnu89-standard-explicitly.patch b/device/archived/linux-samsung-klimtlte-downstream/kernel-use-the-gnu89-standard-explicitly.patch similarity index 100% rename from device/testing/linux-samsung-klimtlte/kernel-use-the-gnu89-standard-explicitly.patch rename to device/archived/linux-samsung-klimtlte-downstream/kernel-use-the-gnu89-standard-explicitly.patch diff --git a/device/testing/linux-samsung-klimtlte/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/archived/linux-samsung-klimtlte-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch similarity index 100% rename from device/testing/linux-samsung-klimtlte/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch rename to device/archived/linux-samsung-klimtlte-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch diff --git a/device/testing/device-samsung-klimtlte/APKBUILD b/device/testing/device-samsung-klimtlte/APKBUILD index 2231311ec..7776dba0b 100644 --- a/device/testing/device-samsung-klimtlte/APKBUILD +++ b/device/testing/device-samsung-klimtlte/APKBUILD @@ -2,25 +2,20 @@ # Reference: pkgname=device-samsung-klimtlte pkgdesc="Samsung Galaxy Tab S 8.4 LTE" -pkgver=4 +pkgver=5 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" - postmarketos-base + firmware-samsung-klimt-mainline + linux-postmarketos-exynos5 mkbootimg + postmarketos-base " makedepends="devicepkg-dev" source="deviceinfo" -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-nonfree-firmware-downstream:nonfree_firmware_downstream - $pkgname-nonfree-firmware-mainline:nonfree_firmware_mainline -" build() { devicepkg_build $startdir $pkgname @@ -30,41 +25,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_downstream() { - pkgdesc="Display works, wifi is broken (see device table for details)" - depends=" - linux-samsung-klimtlte - msm-fb-refresher - postmarketos-base-downstream - " - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Mainline WIP (usb networking and wifi works but not much else)" - depends="linux-postmarketos-exynos5" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -nonfree_firmware() { - pkgdesc="Non-free firmware for the Samsung Galaxy Tab S 8.4" - mkdir "$subpkgdir" -} - -nonfree_firmware_downstream() { - pkgdesc="Non-free firmware for klimtlte when using downstream kernel" - install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware=$pkgver-r$pkgrel $pkgname-kernel-downstream" - depends="firmware-samsung-klimt-downstream>=3.0-r0" - mkdir "$subpkgdir" -} - -nonfree_firmware_mainline() { - pkgdesc="Non-free firmware for klimtlte when using mainline kernel" - install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware=$pkgver-r$pkgrel $pkgname-kernel-mainline" - depends="firmware-samsung-klimt-mainline>=3.0-r0" - mkdir "$subpkgdir" -} - sha512sums=" -1d90ff9d62176f063c8ca13d7a492002269726e438e16e76d6be29609fa6aef5e1d8e4414482f068c8e0223d220c2af7c87c8c94876d621d62b2fbc4e7bb7e92 deviceinfo +d6a4d20b9bce77a3c6f1cd9ab281c4ae3937920d76257acab88814856ba5eb906fa16d4c76b57739ee3af490489308708ffaf827b6a361f4c1eb06b979fed97d deviceinfo " diff --git a/device/testing/device-samsung-klimtlte/deviceinfo b/device/testing/device-samsung-klimtlte/deviceinfo index fa5902f9f..0d10cab7e 100644 --- a/device/testing/device-samsung-klimtlte/deviceinfo +++ b/device/testing/device-samsung-klimtlte/deviceinfo @@ -7,8 +7,8 @@ deviceinfo_name="Samsung Galaxy Tab S 8.4 LTE" deviceinfo_manufacturer="Samsung" deviceinfo_codename="samsung-klimtlte" deviceinfo_year="2014" -deviceinfo_append_dtb_mainline="true" -deviceinfo_dtb_mainline="exynos5420-klimt-lte" +deviceinfo_append_dtb="true" +deviceinfo_dtb="exynos5420-klimt-lte" deviceinfo_arch="armv7" deviceinfo_getty="ttySAC2;115200" deviceinfo_flash_kernel_on_update="true"