From 9d165a3f1058d796cda41ebe4e42df1732043b19 Mon Sep 17 00:00:00 2001
From: Pratham Patel <thefirst1322@gmail.com>
Date: Sun, 8 Oct 2023 08:37:01 +0530
Subject: [PATCH] add hypen and use a better var name (uname_r) instead of
 "unamer"

---
 boot.cmd      | 14 +++++++-------
 opi5-efi.spec |  2 +-
 post.sh       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/boot.cmd b/boot.cmd
index 935c2ff..4f354b2 100644
--- a/boot.cmd
+++ b/boot.cmd
@@ -13,7 +13,7 @@ setenv rootfstype "ext4"
 setenv docker_optimizations "on"
 setenv earlycon "off"
 setenvrootdev
-setenvunamer
+setenvuname_r
 
 echo "Boot script loaded from ${devtype} ${devnum}"
 
@@ -42,14 +42,14 @@ if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgro
 
 #load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
 #load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
-load ${devtype} ${devnum}:1 ${ramdisk_addr_r} ${prefix}uInitrd${unamer}
-load ${devtype} ${devnum}:1 ${kernel_addr_r} ${prefix}vmlinuz${unamer}
+load ${devtype} ${devnum}:1 ${ramdisk_addr_r} ${prefix}uInitrd-${uname_r}
+load ${devtype} ${devnum}:1 ${kernel_addr_r} ${prefix}vmlinuz-${uname_r}
 
-load ${devtype} ${devnum}:1 ${fdt_addr_r} ${prefix}dtb${unamer}/${fdtfile}
+load ${devtype} ${devnum}:1 ${fdt_addr_r} ${prefix}dtb-${uname_r}/${fdtfile}
 fdt addr ${fdt_addr_r}
 fdt resize 65536
 for overlay_file in ${overlays}; do
-	if load ${devtype} ${devnum}:1 ${load_addr} ${prefix}dtb${unamer}/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+	if load ${devtype} ${devnum}:1 ${load_addr} ${prefix}dtb-${uname_r}/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
 		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
 	fi
@@ -62,9 +62,9 @@ for overlay_file in ${user_overlays}; do
 done
 if test "${overlay_error}" = "true"; then
 	echo "Error applying DT overlays, restoring original DT"
-	load ${devtype} ${devnum}:1 ${fdt_addr_r} ${prefix}dtb${unamer}/${fdtfile}
+	load ${devtype} ${devnum}:1 ${fdt_addr_r} ${prefix}dtb-${uname_r}/${fdtfile}
 else
-	if load ${devtype} ${devnum}:1 ${load_addr} ${prefix}dtb${unamer}/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+	if load ${devtype} ${devnum}:1 ${load_addr} ${prefix}dtb-${uname_r}/rockchip/overlay/${overlay_prefix}-fixup.scr; then
 		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
 		source ${load_addr}
 	fi
diff --git a/opi5-efi.spec b/opi5-efi.spec
index d19773c..25a0378 100644
--- a/opi5-efi.spec
+++ b/opi5-efi.spec
@@ -5,7 +5,7 @@
 
 Name: opi5-efi
 Version: 0.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Necessary files for booting from vendor U-Boot on Orange Pi 5
 License: GPL
 Provides: %{name}-%{version}
diff --git a/post.sh b/post.sh
index b6e5a96..7b9a670 100644
--- a/post.sh
+++ b/post.sh
@@ -20,7 +20,7 @@ fi
 
 echo "rootdev=${BOOT_PART}" >> "/boot/efi/uEnv.txt-${FULL_VER}"
 sed -i "s/setenvrootdev/setenv rootdev \"${BOOT_PART}\"/" "/boot/efi/boot.cmd-${FULL_VER}"
-sed -i "s/setenvunamer/setenv unamer \"${UNAME_R}\"/" "/boot/efi/boot.cmd-${FULL_VER}"
+sed -i "s/setenvuname_r/setenv uname_r \"${UNAME_R}\"/" "/boot/efi/boot.cmd-${FULL_VER}"
 
 mkimage -A arm -T ramdisk -C none -n uInitrd -d "/boot/initramfs-${UNAME_R}.img" "/boot/uInitrd-${UNAME_R}"
 cp "/boot/uInitrd-${UNAME_R}" /boot/uInitrd