[packages/efi-boot-update] It is not 'x32', it is 'ia32'

jajcus jajcus at pld-linux.org
Wed Oct 31 14:16:47 CET 2012


commit f8b86fe2fe5f08a7b2e236cc54ff8d2315b3124d
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Wed Oct 31 14:03:48 2012 +0100

    It is not 'x32', it is 'ia32'

 efi-boot-update                 | 2 +-
 efi-boot-update.spec            | 6 +++---
 shellx32.conf => shellia32.conf | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/efi-boot-update.spec b/efi-boot-update.spec
index cba2ebf..32cc0e9 100644
--- a/efi-boot-update.spec
+++ b/efi-boot-update.spec
@@ -9,7 +9,7 @@ Group:		Applications
 Source0:	%{name}
 Source1:	update.conf
 Source2:	shellx64.conf
-Source3:	shellx32.conf
+Source3:	shellia32.conf
 Source4:	grub.conf
 Source10:	README
 Source11:	TODO
@@ -35,7 +35,7 @@ help2man --no-info ./%{name} > %{name}.8
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/efi-boot/update.d
-install -d $RPM_BUILD_ROOT{/lib/efi/{x32,x64},%{_sbindir},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{/lib/efi/{ia32,x64},%{_sbindir},%{_mandir}/man8}
 
 install %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
@@ -61,6 +61,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) /etc/efi-boot/update.d/*.conf
 %dir /etc/efi-boot/update.d
 %dir /lib/efi
-%dir /lib/efi/x32
+%dir /lib/efi/ia32
 %dir /lib/efi/x64
 %{_mandir}/man8/%{name}.8*
diff --git a/efi-boot-update b/efi-boot-update
index 930e936..cf3aa71 100755
--- a/efi-boot-update
+++ b/efi-boot-update
@@ -247,7 +247,7 @@ for bootloader_conf in /etc/efi-boot/update.d/*.conf ; do
     local efi_arch
     if [[ "$ARCH" = i?86 || "$ARCH" = pentium[45] || "$ARCH" = "athlon" ]] ; then
         # %ix86
-        efi_arch=x32
+        efi_arch=ia32
     elif [[ "$ARCH" = "x86_64" || "$ARCH" = "amd64" || "$ARCH" = "ia32e" ]] ; then
         # %x8664
         efi_arch=x64
diff --git a/shellx32.conf b/shellia32.conf
similarity index 100%
rename from shellx32.conf
rename to shellia32.conf
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list