Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e8b6bb56df1d06731c450070731fb5e06227038e
commit e8b6bb56df1d06731c450070731fb5e06227038e Author: James Buren <[email protected]> Date: Sat Nov 9 06:16:38 2013 -0600 efilinux-1.0-1-x86_64 * version bump * enable on i686 * remove old patch diff --git a/source/base-extra/efilinux/FrugalBuild b/source/base-extra/efilinux/FrugalBuild index 9d497fc..f3ac8db 100644 --- a/source/base-extra/efilinux/FrugalBuild +++ b/source/base-extra/efilinux/FrugalBuild @@ -2,25 +2,24 @@ # Maintainer: James Buren <[email protected]> pkgname=efilinux -pkgver=0.8 +pkgver=1.0 pkgrel=1 pkgdesc="A simple Linux bootloader for UEFI." url="http://kernel.org" up2date="$pkgver" depends=() -makedepends=('gnu-efi') +makedepends=('gnu-efi>=3.0u-3') groups=('base-extra') archs=('!i686' 'x86_64') -source=(ftp://ftp.sunet.se/pub/Linux/kernel.org/linux/boot/efilinux/$pkgname-$pkgver.tar.bz2 \ - $pkgname-0.8-stuff.patch) -sha1sums=('1fe8a2b44efacd7df93321006d6bd42866893b9e' \ - '76676a2803117525cb614134152c0a525e6b8076') +source=(ftp://ftp.kernel.org/pub/linux/utils/boot/efilinux/$pkgname-$pkgver.tar.xz fixes.patch) +signatures=(${source[0]/.tar.xz/.tar.sign} '') build() { + Fcd + Fpatchall Fsed "gnuefi/" "" Makefile Fsed "-Werror" "-Werror $CFLAGS" Makefile - Fpatchall Fmake - Ffilerel /boot/efilinux.efi + Ffilerel /usr/lib/efilinux/efilinux.efi } diff --git a/source/base-extra/efilinux/efilinux-0.8-stuff.patch b/source/base-extra/efilinux/efilinux-0.8-stuff.patch deleted file mode 100644 index f76d019..0000000 --- a/source/base-extra/efilinux/efilinux-0.8-stuff.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur a/fs/fs.c b/fs/fs.c ---- a/fs/fs.c 2011-11-10 15:25:45.632753103 -0600 -+++ b/fs/fs.c 2011-11-10 15:26:02.455744027 -0600 -@@ -66,7 +66,7 @@ - if (!f) - return EFI_OUT_OF_RESOURCES; - -- for (i = 0; i < nr_fs_devices; i++) { -+ for (dev_len = i = 0; i < nr_fs_devices; i++) { - EFI_DEVICE_PATH *path; - CHAR16 *dev; - diff --git a/source/base-extra/efilinux/fixes.patch b/source/base-extra/efilinux/fixes.patch new file mode 100644 index 0000000..e9a6ae4 --- /dev/null +++ b/source/base-extra/efilinux/fixes.patch @@ -0,0 +1,29 @@ +diff -ur a/entry.c b/entry.c +--- a/entry.c 2012-03-08 04:22:29.000000000 -0600 ++++ b/entry.c 2013-11-09 06:04:56.466004719 -0600 +@@ -406,9 +406,9 @@ + WCHAR *error_buf; + EFI_STATUS err; + EFI_LOADED_IMAGE *info; +- CHAR16 *name, *options; ++ CHAR16 *name = NULL, *options; + UINT32 options_size; +- char *cmdline; ++ char *cmdline = NULL; + + InitializeLib(image, _table); + sys_table = _table; +diff -ur a/Makefile b/Makefile +--- a/Makefile 2012-03-08 04:22:29.000000000 -0600 ++++ b/Makefile 2013-11-09 06:13:55.458984679 -0600 +@@ -51,8 +51,8 @@ + INCDIR := /usr/include + + # gnuefi sometimes installs these under a gnuefi/ directory, and sometimes not +-CRT0 := $(shell find $(LIBDIR) -name crt0-efi-$(ARCH).o 2>/dev/null | tail -n1) +-LDSCRIPT := $(shell find $(LIBDIR) -name elf_$(ARCH)_efi.lds 2>/dev/null | tail -n1) ++CRT0 := $(LIBDIR)/crt0-efi-$(ARCH).o ++LDSCRIPT := $(LIBDIR)/elf_$(ARCH)_efi.lds + + CFLAGS=-I. -I$(INCDIR)/efi -I$(INCDIR)/efi/$(ARCH) \ + -DEFI_FUNCTION_WRAPPER -fPIC -fshort-wchar -ffreestanding \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
