device-amazon-tate,soho: update deviceinfo to use single var for boot-deploy header

device/testing/device-amazon-soho/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-soho
 pkgdesc="Amazon Kindle Fire HD (3rd Generation)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -13,7 +13,6 @@ subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	initfs-hook.sh
-	amazon-omap-boot-hack.sh
 	modules-load.conf
 "
 
@@ -23,7 +22,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm755 "$srcdir/amazon-omap-boot-hack.sh" "$pkgdir/usr/share/mkinitfs/amazon-omap-boot-hack.sh"
 }
 
 nonfree_firmware() {
@@ -33,8 +31,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-8b965e229cef643c03f86f53575176cc38537afcfb5199725a9e085a5ba88e2e0803e7522667d5f7a0085bea363b829779162f326a503e5d1a14718fdfbe8fde  deviceinfo
+3fcf78d83dca136863999a0e9b7da6a3cb203656a5ae138da87335be1d87823f71b0427b091f65dad98bf108ce44be1b2f8a0c72eb7fc98ec6b3e86bbddaa8c7  deviceinfo
 1aca985770246b9ca140996a498815b5c9ca3458a6cb84db85825344f01deda8b1de7c88e2e0c610df636ad2179faac7fd90d9992add51186a6449f2d43a3f71  initfs-hook.sh
-b031a2bd8e0e206196df9bfa5299c7172ce5d185c77a148422269e2c8a556769b5f6e29dcfe3f4e50968f8a860a8f927a6fcab2021d48e8912c3d5e76b50d61b  amazon-omap-boot-hack.sh
 61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load.conf
 "

device/testing/device-amazon-soho/amazon-omap-boot-hack.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-echo "==> Amending boot.img for Amazon signature verification exploit"
-SOHO_HEADER_DATA='\x50\x03\x00\x00\x00\x25\xe4\x00'
-SOHO_HEADER_SIZE=848
-SOHO_HEADER_OFFSET=52
-tempfile=$(mktemp)
-bootimgfile=$(echo "${1}" | sed 's/initramfs/boot.img/g')
-dd if=/dev/zero of="${tempfile}" bs=$SOHO_HEADER_SIZE count=1
-printf "%b" $SOHO_HEADER_DATA | dd of="${tempfile}" bs=$SOHO_HEADER_OFFSET seek=1 conv=notrunc
-cat "${bootimgfile}" >> "${tempfile}"
-mv "${tempfile}" "${bootimgfile}"

device/testing/device-amazon-soho/deviceinfo

@@ -20,10 +20,7 @@ deviceinfo_screen_height="1280"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=tty0 mem=1G vmalloc=496M init=/init"
 deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_mkimage="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_mkinitfs_postprocess="/usr/share/mkinitfs/amazon-omap-boot-hack.sh"
+deviceinfo_bootimg_amazon_omap_header_size="848"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"

device/testing/device-amazon-tate/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-amazon-tate
 pkgdesc="Amazon Kindle Fire HD (2nd Generation)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -16,7 +16,6 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	initfs-hook.sh
-	amazon-omap-boot-hack.sh
 "
 
 build() {
@@ -25,11 +24,9 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm755 "$srcdir/amazon-omap-boot-hack.sh" "$pkgdir/usr/share/mkinitfs/amazon-omap-boot-hack.sh"
 }
 
 sha512sums="
-2e06c09046be664bbba5d55aafb06aceafbf41777bf116caa508d461190d546cc7ceae5160f0582dee20d88b5998837c00ffc3de928d1e5892bb32485523ce79  deviceinfo
+2b3b97bad75a3405a15e3282c202c1877f1117196bc9f5487e0bde720d9f5fdea149a766dbce8e7befea0697290d56c3cfb2732e505f7a33fc185eb0781771f6  deviceinfo
 1aca985770246b9ca140996a498815b5c9ca3458a6cb84db85825344f01deda8b1de7c88e2e0c610df636ad2179faac7fd90d9992add51186a6449f2d43a3f71  initfs-hook.sh
-a5027ac9f113018d55e4c5fc065b0498d0a50df099a348fe38d6b841087aa285a8d67b400b9fe88007f41d0fd79c2fe69d62300af6963ecb40c5fb2353cbabf1  amazon-omap-boot-hack.sh
 "

device/testing/device-amazon-tate/amazon-omap-boot-hack.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-echo "==> Amending boot.img for Amazon signature verification exploit"
-BOWSER_HEADER_DATA='\x50\x03\x00\x00\x00\x25\xe4\x00'
-BOWSER_HEADER_SIZE=1024
-BOWSER_HEADER_OFFSET=52
-tempfile=$(mktemp)
-bootimgfile=$(echo "${1}" | sed 's/initramfs/boot.img/g')
-dd if=/dev/zero of="${tempfile}" bs=$BOWSER_HEADER_SIZE count=1
-printf "%b" $BOWSER_HEADER_DATA | dd of="${tempfile}" bs=$BOWSER_HEADER_OFFSET seek=1 conv=notrunc
-cat "${bootimgfile}" >> "${tempfile}"
-mv "${tempfile}" "${bootimgfile}"

device/testing/device-amazon-tate/deviceinfo

@@ -21,10 +21,7 @@ deviceinfo_screen_height="1280"
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=tty0 ignore_loglevel mem=1G init=/init"
 deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_mkimage="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_mkinitfs_postprocess="/usr/share/mkinitfs/amazon-omap-boot-hack.sh"
+deviceinfo_bootimg_amazon_omap_header_size="1024"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"