[packages/efi-boot-update] Use 'x64' and 'x32' architecture names on EFI part

jajcus jajcus at pld-linux.org
Tue Oct 30 21:03:10 CET 2012


commit 5b02c49278b16c28345f2beeabb6883856ac8dca
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Tue Oct 30 21:00:32 2012 +0100

    Use 'x64' and 'x32' architecture names on EFI part

 efi-boot-update | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/efi-boot-update b/efi-boot-update
index 87fba1e..41a8abe 100755
--- a/efi-boot-update
+++ b/efi-boot-update
@@ -217,7 +217,6 @@ else
     EFIBOOTMGR=/bin/true
 fi
 
-
 for bootloader_conf in /etc/efi-boot/update.d/*.conf ; do
     if [ ! -e "$bootloader_conf" ] ; then
         continue
@@ -239,7 +238,17 @@ for bootloader_conf in /etc/efi-boot/update.d/*.conf ; do
         continue
     fi
 
-    DESTDIR="/boot/efi/EFI/$(echo -n "$PLATFORM_DIR"|sed -e's/@ARCH@/'"$ARCH"'/')"
+    local efi_arch
+    if [[ "$ARCH" = i?86 || "$ARCH" = pentium[45] || "$ARCH" = "athlon" ]] ; then
+        # %ix86
+        efi_arch=x32
+    elif [[ "$ARCH" = "x86_64" || "$ARCH" = "amd64" || "$ARCH" = "ia32e" ]] ; then
+        # %x8664
+        efi_arch=x64
+    else
+        efi_arch="$ARCH"
+    fi
+    DESTDIR="/boot/efi/EFI/$(echo -n "$PLATFORM_DIR"|sed -e's/@ARCH@/'"$efi_arch"'/')"
     mkdir -p "$DESTDIR"
 
     verbose "Updating $LABEL..."
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/efi-boot-update.git/commitdiff/24e7240b2b9dbcee7607b5eaf2712cefb55e0e82



More information about the pld-cvs-commit mailing list