Use _EFI_ARCH

4 files changed, 15 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba605aba22d3..c0e70eb16a6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = elilo-efi
 	pkgdesc = UEFI version of LILO Boot Loader
 	pkgver = 3.16
-	pkgrel = 3
+	pkgrel = 4
 	url = http://sourceforge.net/projects/elilo/
 	install = elilo-efi.install
 	arch = x86_64
@@ -18,7 +18,7 @@ pkgbase = elilo-efi
 	source = http://downloads.sourceforge.net/project/elilo/elilo/elilo-3.16/elilo-3.16-all.tar.gz
 	source = elilo.conf
 	sha1sums = bd0bd4f1b3dc2d23a304f957ffbf907ae104f323
-	sha1sums = b4c2eb097f733f0169d930af12ad590e47adf4b7
+	sha1sums = 68e47ded8d0a049c6285a591c53deece8fdbebc0
 
 pkgname = elilo-efi
 
diff --git a/PKGBUILD b/PKGBUILD
index 7af4ea1a3f4d..3c0c2f1b563f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname="elilo"
 pkgname="${_pkgname}-efi"
 
 pkgver="3.16"
-pkgrel="3"
+pkgrel="4"
 pkgdesc="UEFI version of LILO Boot Loader"
 arch=('x86_64' 'i686')
 url="http://sourceforge.net/projects/elilo/"
@@ -20,15 +20,13 @@ source=("http://downloads.sourceforge.net/project/elilo/elilo/elilo-${pkgver}/el
         "elilo.conf")
 
 sha1sums=('bd0bd4f1b3dc2d23a304f957ffbf907ae104f323'
-          'b4c2eb097f733f0169d930af12ad590e47adf4b7')
+          '68e47ded8d0a049c6285a591c53deece8fdbebc0')
+
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
 
 build() {
 	
-	if [[ "${CARCH}" != "x86_64" ]]; then
-		echo "${pkgname} package can be built only in a x86_64 system. Exiting."
-		exit 1
-	fi
-	
 	bsdtar -C "${srcdir}/" -xf "${srcdir}/elilo-${pkgver}-source.tar.gz"
 	echo
 	
@@ -64,12 +62,12 @@ build() {
 
 package() {
 	
-	## Install elilo.efi
 	install -d "${pkgdir}/usr/lib/elilo"
-	install -D -m0644 "${srcdir}/elilo-${pkgver}-source/elilo.efi" "${pkgdir}/usr/lib/elilo/elilo.efi"
+	
+	## Install elilo.efi
+	install -D -m0644 "${srcdir}/elilo-${pkgver}-source/elilo.efi" "${pkgdir}/usr/lib/elilo/elilo${_EFI_ARCH}.efi"
 	
 	## Install example elilo.conf
-	install -d "${pkgdir}/usr/lib/elilo/config"
-	install -D -m0644 "${srcdir}/elilo.conf" "${pkgdir}/usr/lib/elilo/config/elilo.conf"
+	install -D -m0644 "${srcdir}/elilo.conf" "${pkgdir}/usr/lib/elilo/elilo.conf"
 	
 }
diff --git a/elilo-efi.install b/elilo-efi.install
index 3be1c99de8ed..faca3fc8a6e4 100644
--- a/elilo-efi.install
+++ b/elilo-efi.install
@@ -4,9 +4,9 @@ post_install() {
 
 Important instructions :-
 
-ELILO is installed at /usr/lib/elilo/elilo.efi
+ELILO is installed at /usr/lib/elilo/*.efi
 
-An example config file has been provided at /usr/lib/elilo/config/elilo.conf
+An example config file has been provided at /usr/lib/elilo/elilo.conf
 
 NOTE: elilo supports only FAT12/16/32 . It does not support EXT2, EXT3, EXT4 and other Unix filesystems.
 
diff --git a/elilo.conf b/elilo.conf
index 12a50a31dfe9..03539358c030 100644
--- a/elilo.conf
+++ b/elilo.conf
@@ -5,10 +5,10 @@ timeout=5
 
 image=/EFI/arch/vmlinuz-arch.efi
 	label=arch
-	append="root=PARTUUID=XXXXXXXXXX rootfstype=XXXX efi_no_storage_paranoia add_efi_memmap"
+	append="root=PARTUUID=XXXXXXXX rootfstype=XXXX efi_pstore.pstore_disable=1 efi_no_storage_paranoia add_efi_memmap"
 	initrd=/EFI/arch/initramfs-arch.img
 
 image=/EFI/arch/vmlinuz-arch.efi
 	label=arch-fallback
-	append="root=PARTUUID=XXXXXXXXXX rootfstype=XXXX efi_no_storage_paranoia add_efi_memmap"
+	append="root=PARTUUID=XXXXXXXX rootfstype=XXXX efi_pstore.pstore_disable=1 efi_no_storage_paranoia add_efi_memmap"
 	initrd=/EFI/arch/initramfs-arch-fallback.img