From 7d187405de8a276933770530f93d0b0ec20abcfd Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Mon, 20 Sep 2021 13:44:45 +0200
Subject: [PATCH] Fix hybrid spelling (#1548)

Fix misspelled word "hybrid" for hybrid GPT/MBR partition tables.
---
 buildroot-external/board/asus/tinker/meta         | 2 +-
 buildroot-external/board/raspberrypi/rpi/meta     | 2 +-
 buildroot-external/board/raspberrypi/rpi0-w/meta  | 2 +-
 buildroot-external/board/raspberrypi/rpi2/meta    | 2 +-
 buildroot-external/board/raspberrypi/rpi3-64/meta | 2 +-
 buildroot-external/board/raspberrypi/rpi3/meta    | 2 +-
 buildroot-external/board/raspberrypi/rpi4-64/meta | 2 +-
 buildroot-external/board/raspberrypi/rpi4/meta    | 2 +-
 buildroot-external/scripts/hdd-image.sh           | 6 +++---
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/buildroot-external/board/asus/tinker/meta b/buildroot-external/board/asus/tinker/meta
index 469c02439..e1fbf89ab 100644
--- a/buildroot-external/board/asus/tinker/meta
+++ b/buildroot-external/board/asus/tinker/meta
@@ -3,7 +3,7 @@ BOARD_NAME="Asus TinkerBoard"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=hyprid
+BOOT_SYS=hybrid
 BOOT_SPL=true
 BOOT_ENV_SIZE=0x8000
 SUPERVISOR_MACHINE=tinker
diff --git a/buildroot-external/board/raspberrypi/rpi/meta b/buildroot-external/board/raspberrypi/rpi/meta
index cdddc887f..bd8a90005 100644
--- a/buildroot-external/board/raspberrypi/rpi/meta
+++ b/buildroot-external/board/raspberrypi/rpi/meta
@@ -3,7 +3,7 @@ BOARD_NAME="RaspberryPi"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=hyprid
+BOOT_SYS=hybrid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
 SUPERVISOR_MACHINE=raspberrypi
diff --git a/buildroot-external/board/raspberrypi/rpi0-w/meta b/buildroot-external/board/raspberrypi/rpi0-w/meta
index b7dd5bb00..21515102d 100644
--- a/buildroot-external/board/raspberrypi/rpi0-w/meta
+++ b/buildroot-external/board/raspberrypi/rpi0-w/meta
@@ -3,7 +3,7 @@ BOARD_NAME="RaspberryPi Zero-W"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=hyprid
+BOOT_SYS=hybrid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
 SUPERVISOR_MACHINE=raspberrypi
diff --git a/buildroot-external/board/raspberrypi/rpi2/meta b/buildroot-external/board/raspberrypi/rpi2/meta
index c5e4f9cb5..644a6c8f0 100644
--- a/buildroot-external/board/raspberrypi/rpi2/meta
+++ b/buildroot-external/board/raspberrypi/rpi2/meta
@@ -3,7 +3,7 @@ BOARD_NAME="RaspberryPi 2"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=hyprid
+BOOT_SYS=hybrid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
 SUPERVISOR_MACHINE=raspberrypi2
diff --git a/buildroot-external/board/raspberrypi/rpi3-64/meta b/buildroot-external/board/raspberrypi/rpi3-64/meta
index f4a761086..35238ade7 100644
--- a/buildroot-external/board/raspberrypi/rpi3-64/meta
+++ b/buildroot-external/board/raspberrypi/rpi3-64/meta
@@ -3,7 +3,7 @@ BOARD_NAME="RaspberryPi 3 64bit"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
-BOOT_SYS=hyprid
+BOOT_SYS=hybrid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
 SUPERVISOR_MACHINE=raspberrypi3-64
diff --git a/buildroot-external/board/raspberrypi/rpi3/meta b/buildroot-external/board/raspberrypi/rpi3/meta
index 18bcf8fb0..f5709778a 100644
--- a/buildroot-external/board/raspberrypi/rpi3/meta
+++ b/buildroot-external/board/raspberrypi/rpi3/meta
@@ -3,7 +3,7 @@ BOARD_NAME="RaspberryPi 3"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=hyprid
+BOOT_SYS=hybrid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
 SUPERVISOR_MACHINE=raspberrypi3
diff --git a/buildroot-external/board/raspberrypi/rpi4-64/meta b/buildroot-external/board/raspberrypi/rpi4-64/meta
index b721dc96e..f59e98217 100644
--- a/buildroot-external/board/raspberrypi/rpi4-64/meta
+++ b/buildroot-external/board/raspberrypi/rpi4-64/meta
@@ -3,7 +3,7 @@ BOARD_NAME="RaspberryPi 4 64bit"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
-BOOT_SYS=hyprid
+BOOT_SYS=hybrid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
 SUPERVISOR_MACHINE=raspberrypi4-64
diff --git a/buildroot-external/board/raspberrypi/rpi4/meta b/buildroot-external/board/raspberrypi/rpi4/meta
index 579ac1162..488d792c4 100644
--- a/buildroot-external/board/raspberrypi/rpi4/meta
+++ b/buildroot-external/board/raspberrypi/rpi4/meta
@@ -3,7 +3,7 @@ BOARD_NAME="RaspberryPi 4"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=hyprid
+BOOT_SYS=hybrid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
 SUPERVISOR_MACHINE=raspberrypi4
diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh
index 23fd20763..51079a0e0 100755
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -179,8 +179,8 @@ function _create_disk_gpt() {
     dd if="${data_img}" of="${hdd_img}" conv=notrunc,sparse bs=512 seek="${data_offset}"
 
     # Set Hyprid partition
-    if [ "${BOOT_SYS}" == "hyprid" ]; then
-        _fix_disk_hyprid
+    if [ "${BOOT_SYS}" == "hybrid" ]; then
+        _fix_disk_hybrid
     fi
 
     # Write SPL
@@ -264,7 +264,7 @@ function _create_disk_mbr() {
 }
 
 
-function _fix_disk_hyprid() {
+function _fix_disk_hybrid() {
     local hdd_img="$(hassos_image_name img)"
 
     sgdisk -t 1:"E3C9E316-0B5C-4DB8-817D-F92DF00215AE" "${hdd_img}"