aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-07-26 10:36:06 -0700
committerDarren Hart <dvhart@linux.intel.com>2013-07-30 12:58:26 -0700
commit8834d8376838487bfc3ff04a16cffb064cb765cf (patch)
tree184748a5020b7f4646e3a926662178c602feb816
parent1759e70a22abfa34652d0ba08bd697dff7a89b3c (diff)
downloadmeta-intel-8834d8376838487bfc3ff04a16cffb064cb765cf.tar.gz
meta-intel-8834d8376838487bfc3ff04a16cffb064cb765cf.tar.bz2
meta-intel-8834d8376838487bfc3ff04a16cffb064cb765cf.zip
gnu-efi: Update to 3.0u
Update to 3.0u. Remove the now upstreamed cross-compile-support patch and update the parallel-make-archives patch for the 3.0u Makefiles. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--common/recipes-bsp/gnu-efi/gnu-efi/cross-compile-support.patch31
-rw-r--r--common/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch45
-rw-r--r--common/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb (renamed from common/recipes-bsp/gnu-efi/gnu-efi_3.0m.bb)15
3 files changed, 6 insertions, 85 deletions
diff --git a/common/recipes-bsp/gnu-efi/gnu-efi/cross-compile-support.patch b/common/recipes-bsp/gnu-efi/gnu-efi/cross-compile-support.patch
deleted file mode 100644
index 221f80ed..00000000
--- a/common/recipes-bsp/gnu-efi/gnu-efi/cross-compile-support.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Add cross compile support
-
-Upstream-Status: Submitted [Maintainer directly]
-
-All the user to specify the build variables in the environment.
-
-Signed-off-by: Darren Hart <dvhart@Linux.intel.com>
-
-Index: gnu-efi-3.0/Make.defaults
-===================================================================
---- gnu-efi-3.0.orig/Make.defaults
-+++ gnu-efi-3.0/Make.defaults
-@@ -54,12 +55,12 @@ LDFLAGS = -nostdlib
- INSTALL = install
- prefix = /usr/bin/
-
--CC = $(prefix)gcc
--AS = $(prefix)as
--LD = $(prefix)ld
--AR = $(prefix)ar
--RANLIB = $(prefix)ranlib
--OBJCOPY = $(prefix)objcopy
-+CC := $(prefix)gcc
-+AS := $(prefix)as
-+LD := $(prefix)ld
-+AR := $(prefix)ar
-+RANLIB := $(prefix)ranlib
-+OBJCOPY := $(prefix)objcopy
-
- ifeq ($(ARCH),ia64)
- CFLAGS += -mfixed-range=f32-f127
diff --git a/common/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch b/common/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
deleted file mode 100644
index 092bd903..00000000
--- a/common/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix parallel make failure for archives
-
-Upstream-Status: Pending
-
-The lib and gnuefi makefiles were using the lib.a() form which compiles
-and ar's as a pair instead of compiling all and then ar'ing which can
-parallelize better. This was resulting in build failures on larger values
-of -j.
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-Signed-off-by: Darren Hart <dvhart@linux.intel.com>
----
----
- gnuefi/Makefile | 3 ++-
- lib/Makefile | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-Index: gnu-efi-3.0/lib/Makefile
-===================================================================
---- gnu-efi-3.0.orig/lib/Makefile
-+++ gnu-efi-3.0/lib/Makefile
-@@ -66,7 +66,8 @@ all: libsubdirs libefi.a
- libsubdirs:
- for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
-
--libefi.a: libefi.a($(OBJS))
-+libefi.a: $(OBJS)
-+ $(AR) rv $@ $(OBJS)
-
- clean:
- rm -f libefi.a *~ $(OBJS) */*.o
-Index: gnu-efi-3.0/gnuefi/Makefile
-===================================================================
---- gnu-efi-3.0.orig/gnuefi/Makefile
-+++ gnu-efi-3.0/gnuefi/Makefile
-@@ -51,7 +51,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
-
- all: $(TARGETS)
-
--libgnuefi.a: libgnuefi.a($(OBJS))
-+libgnuefi.a: $(OBJS)
-+ $(AR) rv $@ $(OBJS)
-
- clean:
- rm -f $(TARGETS) *~ *.o $(OBJS)
diff --git a/common/recipes-bsp/gnu-efi/gnu-efi_3.0m.bb b/common/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb
index 16ba5404..505c4887 100644
--- a/common/recipes-bsp/gnu-efi/gnu-efi_3.0m.bb
+++ b/common/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb
@@ -4,17 +4,14 @@ SECTION = "devel"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://debian/copyright;md5=5fb358a180f484b285b0d99acdc29666"
-PR = "r3"
+PR = "r0"
-SRCREV = "74"
-
-SRC_URI = "http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0m.orig.tar.gz \
- file://cross-compile-support.patch \
+SRC_URI = "http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0u.orig.tar.gz \
file://parallel-make.patch \
file://parallel-make-archives.patch \
"
-SRC_URI[md5sum] = "d0a21125aee56c0c7291ad260e916cb3"
-SRC_URI[sha256sum] = "b7fb638f5ec8faa6edebe54beb90957f01ccccf70a2a948d1b58b834c8d7f86d"
+SRC_URI[md5sum] = "d15d3c700e79a1e2938544d73edc572d"
+SRC_URI[sha256sum] = "3c0d450d5829204ca05dcb3b2aae772e52c379b7c7e09146759c6315606f934e"
COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
@@ -28,11 +25,11 @@ def gnu_efi_arch(d):
return tarch
EXTRA_OEMAKE = "'ARCH=${@gnu_efi_arch(d)}' 'CC=${CC}' 'AS=${AS}' 'LD=${LD}' 'AR=${AR}' \
- 'RANLIB=${RANLIB}' 'OBJCOPY=${OBJCOPY}' \
+ 'RANLIB=${RANLIB}' 'OBJCOPY=${OBJCOPY}' 'PREFIX=${prefix}'\
"
do_install() {
- oe_runmake install INSTALLROOT="${D}${prefix}"
+ oe_runmake install INSTALLROOT="${D}"
}
FILES_${PN} += "${libdir}/*.lds"