forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

postmarketos-update-kernel: drop kernel 'flavor' option (MR 2426)

Browse source 
boot files are generic names (vmlinuz/initramfs), and 'flavor' is not
included in the filenames anymore
This commit is contained in:
Clayton Craft 2021-08-17 16:48:49 -07:00
parent 50ee94d8e3
commit a2c83efeda
No known key found for this signature in database
GPG key ID: 7A3461CA187CEA54
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/postmarketos-update-kernel/APKBUILD
View file

@ -1,5 +1,5 @@
pkgname=postmarketos-update-kernel pkgname=postmarketos-update-kernel
pkgver=0.0.5 pkgver=0.0.6
pkgrel=0 pkgrel=0
pkgdesc="kernel updater script for postmarketOS" pkgdesc="kernel updater script for postmarketOS"
url="https://postmarketos.org" url="https://postmarketos.org"
@ -14,5 +14,5 @@ package() {
} }
sha512sums=" sha512sums="
256892629581fb9813ef9e7aa5bc18e7c1b80c88b97baeb96d7d432418f4cba79e0687193d7eca48bb3dba1543a3b7d1685f686206497c82df2e1ef80e026eb1 update-kernel.sh e321b5bc601e87f9431140bdb89613cae105fe9e86a7ceab5444a378ab3397a717250a035b5389e227afb1f998f7a959af5009b83c9346d65f83a0e4d3cce114 update-kernel.sh
" "

14
main/postmarketos-update-kernel/update-kernel.sh
View file

@ -2,13 +2,6 @@
# shellcheck shell=dash # shellcheck shell=dash
set -e set -e
case $1 in
--help|-h|'')
echo "Usage: pmos-update-kernel [flavor]"
exit 1
;;
esac
# Declare used deviceinfo variables to pass shellcheck # Declare used deviceinfo variables to pass shellcheck
deviceinfo_append_dtb="" deviceinfo_append_dtb=""
@ -29,14 +22,14 @@ update_android_fastboot() {
BOOT_PART_SUFFIX=$(ab_get_slot) # Empty for non-A/B devices BOOT_PART_SUFFIX=$(ab_get_slot) # Empty for non-A/B devices
BOOT_PARTITION=$(findfs PARTLABEL="boot${BOOT_PART_SUFFIX}") BOOT_PARTITION=$(findfs PARTLABEL="boot${BOOT_PART_SUFFIX}")
echo "Flashing boot.img to '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() { update_android_split_kernel_initfs() {
KERNEL_PARTITION=$(findfs PARTLABEL="${deviceinfo_flash_heimdall_partition_kernel:?}") KERNEL_PARTITION=$(findfs PARTLABEL="${deviceinfo_flash_heimdall_partition_kernel:?}")
INITFS_PARTITION=$(findfs PARTLABEL="${deviceinfo_flash_heimdall_partition_initfs:?}") INITFS_PARTITION=$(findfs PARTLABEL="${deviceinfo_flash_heimdall_partition_initfs:?}")
KERNEL="vmlinuz-$FLAVOR" KERNEL="vmlinuz"
if [ "${deviceinfo_append_dtb}" = "true" ]; then if [ "${deviceinfo_append_dtb}" = "true" ]; then
KERNEL="$KERNEL-dtb" KERNEL="$KERNEL-dtb"
fi fi
@ -45,10 +38,9 @@ update_android_split_kernel_initfs() {
dd if=/boot/"$KERNEL" of="$KERNEL_PARTITION" bs=1M dd if=/boot/"$KERNEL" of="$KERNEL_PARTITION" bs=1M
echo "Flashing initramfs..." 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:?} METHOD=${deviceinfo_flash_method:?}
case $METHOD in case $METHOD in
fastboot|heimdall-bootimg) fastboot|heimdall-bootimg)