From a57701d1313d3a056c7897c11d06ea4f58e506f9 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Wed, 27 Apr 2022 15:27:58 +0200 Subject: [PATCH] main/postmarketos-upgrade-kernel: fix custom boot partition being ignored (MR 3095) This code wasn't actually working for me on samsung-m0, so I investigated and came up with that this fixes it. I'm not sure if you are supposed to be able to omit the deviceinfo_ prefix? Either way, it doesn't seem to work, so let's fix it. Fixes fad7c7ef8e4b47e054f6d571b451f310e12dbff4 --- main/postmarketos-update-kernel/APKBUILD | 4 ++-- main/postmarketos-update-kernel/update-kernel.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/postmarketos-update-kernel/APKBUILD b/main/postmarketos-update-kernel/APKBUILD index a5a491af1..61ebfb5b1 100644 --- a/main/postmarketos-update-kernel/APKBUILD +++ b/main/postmarketos-update-kernel/APKBUILD @@ -1,5 +1,5 @@ pkgname=postmarketos-update-kernel -pkgver=0.0.7 +pkgver=0.0.8 pkgrel=0 pkgdesc="kernel updater script for postmarketOS" url="https://postmarketos.org" @@ -14,5 +14,5 @@ package() { } sha512sums=" -dae5ab226de812f3368d115a7906e3070929b58a90f428bb65bd60bde46a0802cb56189c4bbf7d686f4cbf3a78c667979080c9a5535244090118b7163362f9aa update-kernel.sh +97b8a84db059cc8e3df69d8d187e08067a1015a01f2528287a4036f7f2c5e5c95a5d9fc2c2533cc7484cc896c1e3a664c2273fa34208d89f2561e3dc3a3a911a update-kernel.sh " diff --git a/main/postmarketos-update-kernel/update-kernel.sh b/main/postmarketos-update-kernel/update-kernel.sh index 5f84036e4..c3911165a 100644 --- a/main/postmarketos-update-kernel/update-kernel.sh +++ b/main/postmarketos-update-kernel/update-kernel.sh @@ -45,10 +45,10 @@ update_android_split_kernel_initfs() { METHOD=${deviceinfo_flash_method:?} case $METHOD in fastboot) - update_android_fastboot "${flash_fastboot_partition_kernel:-boot}" + update_android_fastboot "${deviceinfo_flash_fastboot_partition_kernel:-boot}" ;; heimdall-bootimg) - update_android_fastboot "${flash_heimdall_partition_kernel:-KERNEL}" + update_android_fastboot "${deviceinfo_flash_heimdall_partition_kernel:-KERNEL}" ;; heimdall-isorec) update_android_split_kernel_initfs