diff --git a/main/postmarketos-update-kernel/APKBUILD b/main/postmarketos-update-kernel/APKBUILD index 9a0a5ebc9..125a50a51 100644 --- a/main/postmarketos-update-kernel/APKBUILD +++ b/main/postmarketos-update-kernel/APKBUILD @@ -1,5 +1,5 @@ pkgname=postmarketos-update-kernel -pkgver=0.0.5 +pkgver=0.0.6 pkgrel=0 pkgdesc="kernel updater script for postmarketOS" url="https://postmarketos.org" @@ -14,5 +14,5 @@ package() { } sha512sums=" -256892629581fb9813ef9e7aa5bc18e7c1b80c88b97baeb96d7d432418f4cba79e0687193d7eca48bb3dba1543a3b7d1685f686206497c82df2e1ef80e026eb1 update-kernel.sh +e321b5bc601e87f9431140bdb89613cae105fe9e86a7ceab5444a378ab3397a717250a035b5389e227afb1f998f7a959af5009b83c9346d65f83a0e4d3cce114 update-kernel.sh " diff --git a/main/postmarketos-update-kernel/update-kernel.sh b/main/postmarketos-update-kernel/update-kernel.sh index 1907b4270..8feb93239 100644 --- a/main/postmarketos-update-kernel/update-kernel.sh +++ b/main/postmarketos-update-kernel/update-kernel.sh @@ -2,13 +2,6 @@ # shellcheck shell=dash set -e -case $1 in - --help|-h|'') - echo "Usage: pmos-update-kernel [flavor]" - exit 1 - ;; -esac - # Declare used deviceinfo variables to pass shellcheck deviceinfo_append_dtb="" @@ -29,14 +22,14 @@ update_android_fastboot() { BOOT_PART_SUFFIX=$(ab_get_slot) # Empty for non-A/B devices BOOT_PARTITION=$(findfs PARTLABEL="boot${BOOT_PART_SUFFIX}") echo "Flashing boot.img to 'boot${BOOT_PART_SUFFIX}'" - dd if=/boot/boot.img-"$FLAVOR" of="$BOOT_PARTITION" bs=1M + dd if=/boot/boot.img of="$BOOT_PARTITION" bs=1M } update_android_split_kernel_initfs() { KERNEL_PARTITION=$(findfs PARTLABEL="${deviceinfo_flash_heimdall_partition_kernel:?}") INITFS_PARTITION=$(findfs PARTLABEL="${deviceinfo_flash_heimdall_partition_initfs:?}") - KERNEL="vmlinuz-$FLAVOR" + KERNEL="vmlinuz" if [ "${deviceinfo_append_dtb}" = "true" ]; then KERNEL="$KERNEL-dtb" fi @@ -45,10 +38,9 @@ update_android_split_kernel_initfs() { dd if=/boot/"$KERNEL" of="$KERNEL_PARTITION" bs=1M echo "Flashing initramfs..." - gunzip -c /boot/initramfs-"$FLAVOR" | lzop | dd of="$INITFS_PARTITION" bs=1M + gunzip -c /boot/initramfs | lzop | dd of="$INITFS_PARTITION" bs=1M } -FLAVOR=$1 METHOD=${deviceinfo_flash_method:?} case $METHOD in fastboot|heimdall-bootimg)