From 532f9ece588dc3649afe675ac531695343ce0398 Mon Sep 17 00:00:00 2001
From: Pratham Patel <thefirst1322@gmail.com>
Date: Sun, 8 Oct 2023 13:17:46 +0530
Subject: [PATCH] safsdf

---
 boot.cmd      | 7 ++++---
 opi5-efi.spec | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/boot.cmd b/boot.cmd
index 74124a1..246f05f 100644
--- a/boot.cmd
+++ b/boot.cmd
@@ -14,11 +14,12 @@ setenv docker_optimizations "on"
 setenv earlycon "off"
 setenvrootdev
 setenvuname_r
+setenvefiver
 
 echo "Boot script loaded from ${devtype} ${devnum}"
 
-if test -e ${devtype} ${devnum} uEnv.txt; then
-	load ${devtype} ${devnum} ${load_addr} uEnv.txt
+if test -e ${devtype} ${devnum}:1 uEnv.txt-${efi_ver}; then
+	load ${devtype} ${devnum}:1 ${load_addr} uEnv.txt-${efi_ver}
 	env import -t ${load_addr} ${filesize}
 fi
 
@@ -43,7 +44,7 @@ if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgro
 #load ${devtype} ${devnum}:2 ${ramdisk_addr_r} uInitrd
 #load ${devtype} ${devnum}:2 ${kernel_addr_r} Image
 load ${devtype} ${devnum}:2 ${ramdisk_addr_r} uInitrd-${uname_r}
-load ${devtype} ${devnum}:2 ${kernel_addr_r} vmlinuz-${uname_r}
+load ${devtype} ${devnum}:2 ${kernel_addr_r} vmlinuz-${uname_r}.old
 
 load ${devtype} ${devnum}:2 ${fdt_addr_r} dtb-${uname_r}/${fdtfile}
 fdt addr ${fdt_addr_r}
diff --git a/opi5-efi.spec b/opi5-efi.spec
index 3c07195..c6c3913 100644
--- a/opi5-efi.spec
+++ b/opi5-efi.spec
@@ -5,7 +5,7 @@
 
 Name: opi5-efi
 Version: 0.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Necessary files for booting from vendor U-Boot on Orange Pi 5
 License: GPL
 Provides: %{name}-%{version}
@@ -33,6 +33,7 @@ cp %{SOURCE0} $RPM_BUILD_ROOT/opt/opi5-efi/boot.cmd
 cp %{SOURCE1} $RPM_BUILD_ROOT/opt/opi5-efi/uEnv.txt
 cp %{SOURCE2} $RPM_BUILD_ROOT/opt/opi5-efi/post.sh
 sed -i "s/replacewithfullver/FULL_VER=%{full_ver}/" $RPM_BUILD_ROOT/opt/opi5-efi/post.sh
+sed -i "s/setenvefiver/setenv efi_ver %{full_ver}/" $RPM_BUILD_ROOT/opt/opi5-efi/boot.cmd
 
 %clean
 rm -rf $RPM_BUILD_ROOT