fix chromeos-installer

Author: yangtsao

chromeos-base/chromeos-installer/chromeos-installer.bashrc

@@ -5,10 +5,10 @@ unset -f cros_pre_src_prepare_openfyde_patches
 
 cros_post_src_install_rock5b_openfyde_flash_spi() {
   exeinto /usr/sbin
-  doexe ${ROCK5B_OPENFYDE_BASE_BASHRC_FILEPATH}/flash_spi.sh
+  doexe ${ROCK5B_OPENFYDE_BASHRC_FILEPATH}/flash_spi.sh
+  doexe ${ROCK5B_OPENFYDE_BASHRC_FILEPATH}/copy_kernel.sh
 }
 
 cros_pre_src_prepare_rock5b_openfyde_patches() {
-  eapply -p2 ${ROCK5B_OPENFYDE_BASE_BASHRC_FILEPATH}/install.patch
-  eapply -p2 ${ROCK5B_OPENFYDE_BASE_BASHRC_FILEPATH}/postinst.patch
+  eapply -p1 ${ROCK5B_OPENFYDE_BASHRC_FILEPATH}/rock5b.patch
 }

chromeos-base/chromeos-installer/files/copy_kernel.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+disk_dev=$1
+EFI_NUM=12
+
+help() {
+  echo "$0 [root_partition_num] [disk_dev]"
+}
+
+die() {
+  echo $@
+  help
+  exit 1
+}
+
+remove_old_kernel() {
+  local efi_mnt=$1
+
+  rm -f "${efi_mnt}/boot/Image"
+  rm -rf "${efi_mnt}/boot/rockchip"
+}
+
+copy_kernel_to() {
+  local efi_mnt=$1
+
+  [ -f /mnt/stateful_partition/fyde/Env.txt ] && \
+      cp /mnt/stateful_partition/fyde/Env.txt "${efi_mnt}/boot/"
+  cp /boot/boot.scr.uimg ${efi_mnt}/boot/
+}
+
+main() {
+ local disk_dev=$1
+ [ -z "${disk_dev}" ] && disk_dev=$(rootdev -d)
+
+ local tmpdir=$(mktemp -d)
+ local efi_dev=""
+
+ if [[ $disk_dev =~ [a-z]$ ]]; then
+   efi_dev=${disk_dev}${EFI_NUM}
+ else
+   efi_dev=${disk_dev}p${EFI_NUM}
+ fi
+
+ mount $efi_dev $tmpdir || die "error mounting efi"
+ remove_old_kernel $tmpdir || die "error removing old kernel"
+ copy_kernel_to $tmpdir || die "error copy new kernel"
+
+ umount $tmpdir
+ rmdir $tmpdir
+}
+
+main $@

chromeos-base/chromeos-installer/files/install.patch

@@ -0,0 +1,68 @@
+Index: installer/chromeos-install
+===================================================================
+--- installer.orig/chromeos-install
++++ installer/chromeos-install
+@@ -722,6 +722,7 @@ install_stateful() {
+       var_overlay/db/pkg
+       var_overlay/lib/portage
+       dev_image
++      fyde
+     "
+ 
+     local rootfs_dlc="${ROOT}/opt/google/dlc"
+@@ -1026,6 +1027,8 @@ do_post_install() {
+   fi
+   local dst_rootfs_dev=""
+ 
++  FLAGS_skip_postinstall="${FLAGS_FALSE}"
++  echo "Ignoring --skip_postinstall"
+   # Now run the postinstall script on one new rootfs. Note that even though
+   # we're passing the new destination partition number as an arg, the postinst
+   # script had better not try to access it, for the reasons we just gave.
+Index: installer/chromeos-postinst
+===================================================================
+--- installer.orig/chromeos-postinst
++++ installer/chromeos-postinst
+@@ -58,6 +58,32 @@ get_android_version() {
+   echo ${version#*=}
+ }
+ 
++get_mtd_dev()
++{
++  echo '/dev/mtdblock0'
++}
++
++get_boot_type()
++{
++  cat /mnt/stateful_partition/fyde/Env.txt \
++    | grep -o '^[^#]*' | grep 'overlays=' | grep -q 'ssd-sata'
++
++  if [ "$?" -eq "0" ]; then
++    echo 'SATA'
++    return 0
++  fi
++
++  cat /mnt/stateful_partition/fyde/Env.txt \
++    | grep -o '^[^#]*' | grep 'fdtfile=' | grep -q 'rk3588s-orangepi-5b'
++
++  if [ "$?" -eq "0" ]; then
++    echo 'EMMC'
++  else
++    echo 'NVME'
++  fi
++}
++
++
+ main() {
+   local target_disk=$(get_disk_dev)
+   local target_part_num=$(get_part_num)
+@@ -80,6 +106,9 @@ main() {
+   fi
+ 
+   local install_dev="$1"
++
++  chroot . /usr/sbin/flash_spi.sh "$(get_mtd_dev)" "$(get_boot_type)"
++  chroot . /usr/sbin/copy_kernel.sh "$target_disk"
+   shift
+   chroot . /usr/bin/cros_installer --type="postinst" \
+          --install_dev="${install_dev}" --install_dir="/" "$@"