xiaomi-ysl: clean up device packages (MR 4433)

It add necessary modules to intramfs for fix fde.
modem package has been removed in favor of soc-qcom-msm8953-modem.
30-gpu-firmware-files has been removed in favor of
soc-qcom-msm8953-initramfs.

[ci:skip-build] already built successfully in CI
This commit is contained in:
Barnabás Czémán 2023-09-30 16:01:58 +02:00 committed by Clayton Craft
parent 00b7fe46b3
commit c64ac9bba0
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
6 changed files with 37 additions and 53 deletions

View file

@ -2,16 +2,22 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-xiaomi-ysl
pkgdesc="Xiaomi Redmi S2/Y2"
pkgver=1
pkgrel=5
pkgver=2
pkgrel=0
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
options="!check !archcheck"
depends="postmarketos-base mkbootimg soc-qcom-msm8953 linux-postmarketos-qcom-msm8953 lk2nd-msm8953"
depends="
linux-postmarketos-qcom-msm8953
lk2nd-msm8953
mkbootimg
postmarketos-base
soc-qcom-msm8953
"
makedepends="devicepkg-dev"
source="deviceinfo modules-initfs"
subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-modem"
subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
build() {
devicepkg_build $startdir $pkgname
@ -22,18 +28,17 @@ package() {
}
nonfree_firmware() {
pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware, also needed for osk-sdl"
depends="msm-firmware-loader firmware-xiaomi-ysl"
mkdir "$subpkgdir"
}
modem() {
depends="qrtr rmtfs rmtfs-openrc msm-modem-uim-selection"
install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware"
pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
depends="
firmware-xiaomi-ysl
msm-firmware-loader
soc-qcom-msm8953-initramfs
soc-qcom-msm8953-modem
"
mkdir "$subpkgdir"
}
sha512sums="
22192de042c4e6bbdc79a3dc6244358387df653fdb6996e5f703d804c72331fe4465cff0531ecb3ec70728070955955f59658ac8ca1d0ac22c5839be9d842d2b deviceinfo
38069a10a275779c2acffcccb6426192c520cacdbe21329933f589be08184c9fb87b18b1bd90ccae6ddaccdacfe6473e5c7521bc959ba4f330bfbfeafc467c01 modules-initfs
b80c6f67c97d4ed3292a4f68fefea75e2944125232a1862c2088e3806f37a43043e193341d7d81abd59ad2fea9d696af04ae576acdc21a6125e925570cbaafa7 deviceinfo
e273b7848a6ccc479668e8670092fe9062a3485093b3581dfb12a6085ee89f6784ea5c0040e1f8353f636b9f25d7921079074b97437405d256bfcc2d17a17388 modules-initfs
"

View file

@ -17,11 +17,10 @@ deviceinfo_keyboard="false"
deviceinfo_external_storage="true"
deviceinfo_screen_width="720"
deviceinfo_screen_height="1440"
deviceinfo_getty="ttyMSM0;115200"
# Bootloader related
deviceinfo_flash_method="fastboot"
deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
deviceinfo_kernel_cmdline="console=null"
deviceinfo_generate_bootimg="true"
deviceinfo_bootimg_qcdt="false"
deviceinfo_bootimg_dtb_second="false"

View file

@ -1,5 +1,6 @@
bam_dma
edt_ft5x06
msm
edt-ft5x06
panel-xiaomi-ysl-hx8394f
panel-xiaomi-ysl-ili7807d
panel-xiaomi-ysl-ili9881c
panel_xiaomi_ysl_hx8394f
panel_xiaomi_ysl_ili7807d
panel_xiaomi_ysl_ili9881c

View file

@ -1,6 +0,0 @@
/lib/firmware/postmarketos/a506_zap.b00
/lib/firmware/postmarketos/a506_zap.b01
/lib/firmware/postmarketos/a506_zap.b02
/lib/firmware/postmarketos/a506_zap.mdt
/lib/firmware/postmarketos/a530_pfp.fw
/lib/firmware/postmarketos/a530_pm4.fw

View file

@ -1,37 +1,28 @@
# Maintainer: Barnabas Czeman <trabarni@gmail.com>
pkgname=firmware-xiaomi-ysl
pkgver=2
pkgrel=1
pkgver=3
pkgrel=0
pkgdesc="Firmware files for Xiaomi Redmi S2/Y2"
url="https://gitlab.com/barni2000/$pkgname"
arch="aarch64"
depends="firmware-xiaomi-ysl-initramfs"
license="proprietary"
options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
_commit="ccfd274b825aec2d80e834b16499a6d9ba96c3f5"
source="$pkgname.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
firmware.files
30-gpu-firmware.files"
subpackages="$pkgname-initramfs:firmware_initramfs"
source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
builddir="$srcdir/$pkgname-$_commit/lib/firmware/postmarketos"
_fwdir="/lib/firmware"
package() {
cd "$srcdir/$pkgname-$_commit/"
while IFS="" read -r _i || [ -n "$_i" ]; do
[ ! -d $(dirname $_i) ] && mkdir -p $(dirname $_i)
install -Dm644 $_i "$pkgdir/$_i"
done < "$srcdir/firmware.files"
}
firmware_initramfs() {
mkdir "$subpkgdir"
install -Dm644 "$srcdir"/30-gpu-firmware.files -t \
"$subpkgdir"/usr/share/mkinitfs/files
# GPU Firmware files
install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/postmarketos"
install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/postmarketos"
install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir/qcom"
install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir/qcom"
}
sha512sums="
cd2d84dac3660fe554cba6d6d2ac0c6c7468cfd37bc443400ee1c2bc4a2ed3cb3e7120a413d7bed3c0bad2b5acb234599dd5a0f2e42f6696779c07c3e5c3c575 firmware-xiaomi-ysl.tar.gz
ee34a50ff58f3a829e37194c5ce60c89d4dce7734a271af1944ecd5232e9f9df0cbf0dbcca8ea2ef094b63cca7d0f2c4431e0a17ebe2533b62a25ac59d370274 firmware.files
302c0bec754bb79ef561c1a8d4ff34ba52b904c853bce6a15a79ba7b5b7a3d02c1c75bbe86d59be7b608a6dc744dd3e3c638eaa4539c53d20fa55fa5ea397d74 30-gpu-firmware.files
cd2d84dac3660fe554cba6d6d2ac0c6c7468cfd37bc443400ee1c2bc4a2ed3cb3e7120a413d7bed3c0bad2b5acb234599dd5a0f2e42f6696779c07c3e5c3c575 firmware-xiaomi-ysl-ccfd274b825aec2d80e834b16499a6d9ba96c3f5.tar.gz
"

View file

@ -1,6 +0,0 @@
./lib/firmware/postmarketos/a506_zap.b00
./lib/firmware/postmarketos/a506_zap.b01
./lib/firmware/postmarketos/a506_zap.b02
./lib/firmware/postmarketos/a506_zap.mdt
./lib/firmware/postmarketos/a530_pfp.fw
./lib/firmware/postmarketos/a530_pm4.fw