Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=107358ebf06b31f67c10bbeace4c862fbb003dce

commit 107358ebf06b31f67c10bbeace4c862fbb003dce
Author: James Buren <[email protected]>
Date:   Sat Nov 9 05:46:25 2013 -0600

elilo-3.16-1-x86_64
* version bump
* enable i686

diff --git a/source/base-extra/elilo/FrugalBuild 
b/source/base-extra/elilo/FrugalBuild
index 889fbe1..38e29a1 100644
--- a/source/base-extra/elilo/FrugalBuild
+++ b/source/base-extra/elilo/FrugalBuild
@@ -2,25 +2,30 @@
# Maintainer: James Buren <[email protected]>

pkgname=elilo
-pkgver=3.14
-pkgrel=21
+pkgver=3.16
+pkgrel=1
pkgdesc="A clone of LILO designed to work on EFI and UEFI systems on 
x86/x86_64."
depends=()
-makedepends=('gnu-efi')
+makedepends=('gnu-efi>=3.0u-3')
groups=('base-extra')
-archs=('!i686' 'x86_64')
+archs=('i686' 'x86_64')
_F_sourceforge_ext='-all.tar.gz'
Finclude sourceforge
-sha1sums=('631fdf211627510b270f0759c26587edb8d30001')
+source=(${source[@]} fixes.patch)
+sha1sums=('bd0bd4f1b3dc2d23a304f957ffbf907ae104f323' \
+          'c4f8bfbd894e1be9a7c687afa3f271b4bf1854b1')

build()
{
Fextract $pkgname-$pkgver-source.tar.gz
-       Fcd $pkgname
+       Fcd $pkgname-$pkgver-source
+       Fpatchall
Fsed "-O2" "$CFLAGS" Make.defaults
Fmake
-       Ffilerel /boot/elilo.efi
+       Ffilerel /usr/lib/elilo/elilo.efi
Fdocrel docs/*.txt
+       Fdocrel examples/textmenu_chooser/*
+       Fdocrel examples/netboot/*
}

# optimization OK
diff --git a/source/base-extra/elilo/fixes.patch 
b/source/base-extra/elilo/fixes.patch
new file mode 100644
index 0000000..40f7eb4
--- /dev/null
+++ b/source/base-extra/elilo/fixes.patch
@@ -0,0 +1,40 @@
+diff -ur a/Make.defaults b/Make.defaults
+--- a/Make.defaults    2013-03-29 14:03:14.000000000 -0500
++++ b/Make.defaults    2013-11-09 05:43:49.370051831 -0600
+@@ -63,8 +63,8 @@
+ TOPDIR  =
+ ALLSUBDIRS = ia32 ia64 x86_64 fs choosers devschemes tools
+
+-HOSTARCH   = $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed 
s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
+-ARCH     := $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed 
s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
++HOSTARCH   = $(shell uname -m | sed 's|i[0-9]86|ia32|')
++ARCH     := $(shell uname -m | sed 's|i[0-9]86|ia32|')
+ INCDIR           = -I. -I$(TOPDIR) -I$(EFIINC) -I$(EFIINC)/$(ARCH) 
-I$(EFIINC)/protocol -I$(TOPDIR)/efi110
+ CPPFLAGS   = -DCONFIG_$(ARCH)
+
+@@ -115,9 +115,9 @@
+       ARCH3264 = -m64
+       LD3264 = -melf_x86_64
+
+-      GNUEFILIB := $(GNUEFILIB)64
+-      EFILIB    := $(EFILIB)64
+-      EFICRT0   := $(EFICRT0)64
++      GNUEFILIB := $(GNUEFILIB)
++      EFILIB    := $(EFILIB)
++      EFICRT0   := $(EFICRT0)
+   endif
+
+         CFLAGS   += -DEFI_FUNCTION_WRAPPER
+@@ -129,9 +129,9 @@
+       ARCH3264 = -m32
+       LD3264 = -melf_i386
+
+-      GNUEFILIB := /usr/lib32
+-      EFILIB    := /usr/lib32
+-      EFICRT0   := /usr/lib32
++      GNUEFILIB := /usr/lib
++      EFILIB    := /usr/lib
++      EFICRT0   := /usr/lib
+   endif
+ endif
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to