From eb9240d44d52e7dacbbf162b6e7c395d2ad20be0 Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Wed, 12 Mar 2014 13:53:08 +0200 Subject: common/recipes-bsp: remove gnu-efi and gummiboot recipes Nothing in meta-intel requires these and now they are in OE-core anyway. Signed-off-by: Stefan Stanacar Signed-off-by: Tom Zanussi --- .../gnu-efi/gnu-efi/parallel-make-archives.patch | 48 ---------------------- .../gnu-efi/gnu-efi/parallel-make.patch | 22 ---------- common/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb | 35 ---------------- common/recipes-bsp/gummiboot/gummiboot_git.bb | 26 ------------ 4 files changed, 131 deletions(-) delete mode 100644 common/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch delete mode 100644 common/recipes-bsp/gnu-efi/gnu-efi/parallel-make.patch delete mode 100644 common/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb delete mode 100644 common/recipes-bsp/gummiboot/gummiboot_git.bb (limited to 'common/recipes-bsp') 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 e5b47c19..00000000 --- a/common/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch +++ /dev/null @@ -1,48 +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. - -See http://www.chemie.fu-berlin.de/chemnet/use/info/make/make_toc.html#TOC105 -for details. - -Signed-off-by: Saul Wold -Signed-off-by: Darren Hart ---- ---- - 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: $(patsubst %,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: $(patsubst %,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/parallel-make.patch b/common/recipes-bsp/gnu-efi/gnu-efi/parallel-make.patch deleted file mode 100644 index 27c94e8a..00000000 --- a/common/recipes-bsp/gnu-efi/gnu-efi/parallel-make.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix parallel make failure - -Upstream-Status: Submitted [Maintainer directly] - -Add a missing dependency which resulted in a race leading to failure -on larger values of -j. - -Signed-off-by: Darren Hart - -Index: gnu-efi-3.0/Makefile -=================================================================== ---- gnu-efi-3.0.orig/Makefile -+++ gnu-efi-3.0/Makefile -@@ -42,6 +42,8 @@ include $(SRCDIR)/Make.defaults - - SUBDIRS = lib gnuefi inc apps - -+gnuefi: lib -+ - all: check_gcc $(SUBDIRS) - - $(SUBDIRS): diff --git a/common/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb b/common/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb deleted file mode 100644 index 505c4887..00000000 --- a/common/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Libraries for producing EFI binaries" -HOMEPAGE = "http://sourceforge.net/projects/gnu-efi/" -SECTION = "devel" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=5fb358a180f484b285b0d99acdc29666" - -PR = "r0" - -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] = "d15d3c700e79a1e2938544d73edc572d" -SRC_URI[sha256sum] = "3c0d450d5829204ca05dcb3b2aae772e52c379b7c7e09146759c6315606f934e" - -COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux" - -S = "${WORKDIR}/gnu-efi-3.0" - -def gnu_efi_arch(d): - import re - tarch = d.getVar("TARGET_ARCH", True) - if re.match("i[3456789]86", tarch): - return "ia32" - return tarch - -EXTRA_OEMAKE = "'ARCH=${@gnu_efi_arch(d)}' 'CC=${CC}' 'AS=${AS}' 'LD=${LD}' 'AR=${AR}' \ - 'RANLIB=${RANLIB}' 'OBJCOPY=${OBJCOPY}' 'PREFIX=${prefix}'\ - " - -do_install() { - oe_runmake install INSTALLROOT="${D}" -} - -FILES_${PN} += "${libdir}/*.lds" diff --git a/common/recipes-bsp/gummiboot/gummiboot_git.bb b/common/recipes-bsp/gummiboot/gummiboot_git.bb deleted file mode 100644 index ff088a8c..00000000 --- a/common/recipes-bsp/gummiboot/gummiboot_git.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Gummiboot is a simple UEFI boot manager which executes configured EFI images." -HOMEPAGE = "http://freedesktop.org/wiki/Software/gummiboot" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "gnu-efi util-linux" - -inherit autotools -inherit deploy - -PV = "35+git${SRCPV}" -PR = "r0" -SRCREV = "6feb7d971f79e88ed395637390d58404fba5f3c3" -SRC_URI = "git://anongit.freedesktop.org/gummiboot" - -S = "${WORKDIR}/git" - -EXTRA_OECONF = "--disable-biostest --with-efi-includedir=${STAGING_INCDIR} \ - --with-efi-ldsdir=${STAGING_LIBDIR} \ - --with-efi-libdir=${STAGING_LIBDIR}" - -do_deploy () { - install ${S}/gummiboot*.efi ${DEPLOYDIR}/ -} -addtask deploy before do_build after do_compile -- cgit v1.2.3-54-g00ecf