From 95518b7a66d8a1c76f8828052b188cebe758eed7 Mon Sep 17 00:00:00 2001 From: Alexander Martinz Date: Sat, 26 Apr 2025 22:56:43 +0200 Subject: [PATCH] device-shift-otter: remove initfs compression and kernel cmdline The initfs compression was a leftover from when the device aport was using the sdm845 mainline kernel (as we played with the otter bringup there). This resulted in causing the device to not boot. Also remove the kernel cmdline as it is already handled by getty. Signed-off-by: Alexander Martinz Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6455 [ci:skip-build]: already built successfully in CI --- device/testing/device-shift-otter/APKBUILD | 6 +++--- device/testing/device-shift-otter/deviceinfo | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/device/testing/device-shift-otter/APKBUILD b/device/testing/device-shift-otter/APKBUILD index ff19a8312..c07a5fd8d 100644 --- a/device/testing/device-shift-otter/APKBUILD +++ b/device/testing/device-shift-otter/APKBUILD @@ -3,8 +3,8 @@ # Co-Maintainer: Alexander Martinz pkgname=device-shift-otter pkgdesc="SHIFTphone 8" -pkgver=1 -pkgrel=1 +pkgver=2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -35,6 +35,6 @@ package() { } sha512sums=" -3e4ea7fa643dfa0205707dfa6ad8c12c8e35be8ae0c7684479e3981b498d33ee55b636760cb4574f99d8f88df49a4f098cb6fc3b8b248840ab9886501108f309 deviceinfo +ab28fb1476523ddab595be8d784f9dc3f7e97b56936e21590571b1e57c149a257bc34e6ea7027fa051958b08a61584531f08d131a83142dfba4dcd29d3336a53 deviceinfo 57316402c428390cb683f03da817308e008e246e01e88c95d60fc14d736156ce6cc7915633d973347a56c721022913192928799310f14839afe8d00de2efa14c modules-initfs " diff --git a/device/testing/device-shift-otter/deviceinfo b/device/testing/device-shift-otter/deviceinfo index 5a79795ea..d89872070 100644 --- a/device/testing/device-shift-otter/deviceinfo +++ b/device/testing/device-shift-otter/deviceinfo @@ -20,7 +20,6 @@ deviceinfo_getty="ttyMSM0;115200" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline="console=ttyMSM0,115200" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false" @@ -38,7 +37,6 @@ deviceinfo_flash_sparse="true" deviceinfo_append_dtb="true" deviceinfo_dtb="qcom/qcm6490-shift-otter" deviceinfo_flash_kernel_on_update="true" -deviceinfo_initfs_compression="zstd:fast" # Required for devices using UFS as storage (instead of e.g. eMMC) deviceinfo_rootfs_image_sector_size="4096"