Merge pull request #2822 from adamg88/fix-amlogic-updates

Amlogic: fix updates and align with the rest of the project
JustEnoughLinuxOS · Feb 4, 2024 · 69637dd · 69637dd
2 parents 8ff5701 + 07b9bfe
commit 69637dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/projects/Amlogic/bootloader/boot.ini b/projects/Amlogic/bootloader/boot.ini
@@ -3,7 +3,7 @@ JELOS-UBOOT-CONFIG
 setenv dtb_loadaddr "0x10000000"
 setenv loadaddr "0x1B00000"
 
-setenv bootargs "boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ @EXTRA_CMDLINE@"
+setenv bootargs "boot=UUID=@UUID_SYSTEM@ disk=UUID=@UUID_STORAGE@ @EXTRA_CMDLINE@"
 
 load mmc ${devno}:1 ${loadaddr} KERNEL
 load mmc ${devno}:1 ${dtb_loadaddr} ${fdtfile}

diff --git a/projects/Amlogic/bootloader/extlinux/extlinux.conf b/projects/Amlogic/bootloader/extlinux/extlinux.conf
@@ -1,4 +1,4 @@
 LABEL JELOS
   LINUX /KERNEL
   FDTDIR /
-  APPEND boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ @EXTRA_CMDLINE@
+  APPEND boot=UUID=@UUID_SYSTEM@ disk=UUID=@UUID_STORAGE@ @EXTRA_CMDLINE@
diff --git a/projects/Amlogic/bootloader/update.sh b/projects/Amlogic/bootloader/update.sh
@@ -97,8 +97,8 @@ if [ -f $BOOT_ROOT/extlinux/extlinux.conf ] || [ -n "${1}" ]; then
       mkdir "${BOOT_ROOT}/extlinux"
     fi
     cp -p $SYSTEM_ROOT/usr/share/bootloader/extlinux/extlinux.conf $BOOT_ROOT/extlinux
-    sed -e "s/@BOOT_UUID@/$BOOT_UUID/" \
-        -e "s/@DISK_UUID@/$DISK_UUID/" \
+    sed -e "s/@UUID_SYSTEM@/$UUID_SYSTEM/" \
+        -e "s/@UUID_STORAGE@/$UUID_STORAGE/" \
         -i $BOOT_ROOT/extlinux/extlinux.conf
   fi
 fi
@@ -107,8 +107,8 @@ if [ -f $BOOT_ROOT/boot.ini ] || [ -n "${1}" ]; then
   if [ -f /usr/share/bootloader/boot.ini ]; then
     echo "Updating boot.ini"
     cp -p /usr/share/bootloader/boot.ini $BOOT_ROOT/boot.ini
-    sed -e "s/@BOOT_UUID@/$BOOT_UUID/" \
-        -e "s/@DISK_UUID@/$DISK_UUID/" \
+    sed -e "s/@UUID_SYSTEM@/$UUID_SYSTEM/" \
+        -e "s/@UUID_STORAGE@/$UUID_STORAGE/" \
         -i $BOOT_ROOT/boot.ini
   fi
 fi