aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro/recipes-extra
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2014-01-22 10:09:53 +0200
committerFathi Boudra <fathi.boudra@linaro.org>2014-01-22 10:14:58 +0200
commit69bf5c4dbde4b5ab52f12bd3c681b1fc261dfe6f (patch)
tree933ac66ed27ac0b69cf7734502ac2c89bab2fc23 /meta-linaro/recipes-extra
parentbffd89f21ccdfd32c9972bb5997247df0074874a (diff)
downloadmeta-linaro-69bf5c4dbde4b5ab52f12bd3c681b1fc261dfe6f.tar.gz
acpica: update to 20131218 release
update git tree URL drop cross-compile.patch in favor of EXTRA_OEMAKE CC=${TARGET_PREFIX}gcc add examples-makefile.patch - synced with Debian package refresh add-testing.patch - synced with Debian package Change-Id: I125bdef02385b4fbcb353e7c0e33eda4e0107c52 Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'meta-linaro/recipes-extra')
-rw-r--r--meta-linaro/recipes-extra/acpica/acpica_20131218.bb (renamed from meta-linaro/recipes-extra/acpica/acpica_20131115.bb)10
-rw-r--r--meta-linaro/recipes-extra/acpica/files/add-testing.patch2
-rw-r--r--meta-linaro/recipes-extra/acpica/files/cross-compile.patch19
-rw-r--r--meta-linaro/recipes-extra/acpica/files/examples-makefile.patch152
4 files changed, 158 insertions, 25 deletions
diff --git a/meta-linaro/recipes-extra/acpica/acpica_20131115.bb b/meta-linaro/recipes-extra/acpica/acpica_20131218.bb
index 94bf68e7..651efc51 100644
--- a/meta-linaro/recipes-extra/acpica/acpica_20131115.bb
+++ b/meta-linaro/recipes-extra/acpica/acpica_20131218.bb
@@ -10,10 +10,10 @@ SECTION = "console/tools"
LICENSE = "BSD | GPLv2"
LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c6280c3aa"
DEPENDS = "bison flex"
-SRCREV = "5dac68d8af691cb66191c071771d6cf4abb54277"
-PV = "20131115+git${SRCPV}"
+SRCREV = "ecc630773260cb10f5202ab3273e447ffd0d1b13"
+PV = "20131218+git${SRCPV}"
-SRC_URI = "git://git.linaro.org/people/ahs3/acpica-tools.git \
+SRC_URI = "git://git.linaro.org/people/al.stone/acpica-tools.git \
file://fix_ftbfs_debian-kfreebsd.patch \
file://debian-big_endian.patch \
file://debian-unaligned.patch \
@@ -21,13 +21,13 @@ SRC_URI = "git://git.linaro.org/people/ahs3/acpica-tools.git \
file://add-testing.patch \
file://name-miscompare.patch \
file://aapits-linux.patch \
- file://cross-compile.patch \
+ file://examples-makefile.patch \
file://no-werror.patch \
"
S = "${WORKDIR}/git"
-EXTRA_OEMAKE = "'OPT_CFLAGS=-Wall'"
+EXTRA_OEMAKE = "CC=${TARGET_PREFIX}gcc 'OPT_CFLAGS=-Wall'"
do_install() {
install -D -p -m0755 generate/unix/bin*/iasl ${D}${bindir}/iasl
diff --git a/meta-linaro/recipes-extra/acpica/files/add-testing.patch b/meta-linaro/recipes-extra/acpica/files/add-testing.patch
index e0ffccf8..9d525417 100644
--- a/meta-linaro/recipes-extra/acpica/files/add-testing.patch
+++ b/meta-linaro/recipes-extra/acpica/files/add-testing.patch
@@ -15,7 +15,7 @@ Index: acpica-unix/Makefile
+ $(CURDIR)/debian/run-aapits.sh $(CURDIR)/tests/aapits $(CURDIR)/generate/unix/bin
+
+ # misc tests
-+ $(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20131115
++ $(CURDIR)/debian/run-misc-tests.sh $(CURDIR) 20131218
+
+ # Template tests
+ cd $(CURDIR)/tests/templates
diff --git a/meta-linaro/recipes-extra/acpica/files/cross-compile.patch b/meta-linaro/recipes-extra/acpica/files/cross-compile.patch
deleted file mode 100644
index f2917ca9..00000000
--- a/meta-linaro/recipes-extra/acpica/files/cross-compile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: add cross compile support
-Forwarded: not-needed
-Author: Fathi Boudra <fathi.boudra@linaro.org>
-
----
- generate/unix/Makefile.config | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/generate/unix/Makefile.config
-+++ b/generate/unix/Makefile.config
-@@ -35,7 +35,7 @@
- .SUFFIXES :
- PROGS = acpibin acpidump acpiexec acpihelp acpinames acpisrc acpixtract iasl
- HOST ?= _CYGWIN
--CC = gcc
-+CC ?= $(CROSS_COMPILE)gcc
-
- #
- # Common defines
diff --git a/meta-linaro/recipes-extra/acpica/files/examples-makefile.patch b/meta-linaro/recipes-extra/acpica/files/examples-makefile.patch
new file mode 100644
index 00000000..e435a199
--- /dev/null
+++ b/meta-linaro/recipes-extra/acpica/files/examples-makefile.patch
@@ -0,0 +1,152 @@
+diff -urN acpica-unix-20131218/generate/unix/acpiexamples/Makefile acpica-unix-20131218-patch/generate/unix/acpiexamples/Makefile
+--- acpica-unix-20131218/generate/unix/acpiexamples/Makefile 1969-12-31 17:00:00.000000000 -0700
++++ acpica-unix-20131218-patch/generate/unix/acpiexamples/Makefile 2014-01-06 19:40:59.042080873 -0700
+@@ -0,0 +1,148 @@
++#
++# acpiexamples - Example ACPICA initialization code and control
++# method execution.
++#
++
++#
++# Note: This makefile is intended to be used from within the native
++# ACPICA directory structure, from under generate/unix. It specifically
++# places all object files in a generate/unix subdirectory, not within
++# the various ACPICA source directories. This prevents collisions
++# between different compilations of the same source file with different
++# compile options, and prevents pollution of the source code.
++#
++include ../Makefile.config
++FINAL_PROG = ../$(BINDIR)/acpiexamples
++PROG = $(OBJDIR)/acpiexamples
++
++#
++# Search paths for source files
++#
++vpath %.c \
++ $(ACPIEXAMPLES)\
++ $(ACPICA_DEBUGGER)\
++ $(ACPICA_DISPATCHER)\
++ $(ACPICA_EXECUTER)\
++ $(ACPICA_NAMESPACE)\
++ $(ACPICA_PARSER)\
++ $(ACPICA_TABLES)\
++ $(ACPICA_UTILITIES)\
++ $(ACPICA_COMMON)\
++ $(ACPICA_OSL)
++
++HEADERS = \
++ $(wildcard $(ACPIEXAMPLES)/*.h)
++
++OBJECTS = \
++ $(OBJDIR)/examples.o\
++ $(OBJDIR)/exstubs.o\
++ $(OBJDIR)/extables.o\
++ $(OBJDIR)/dsargs.o\
++ $(OBJDIR)/dscontrol.o\
++ $(OBJDIR)/dsfield.o\
++ $(OBJDIR)/dsinit.o\
++ $(OBJDIR)/dsmethod.o\
++ $(OBJDIR)/dsmthdat.o\
++ $(OBJDIR)/dsobject.o\
++ $(OBJDIR)/dsopcode.o\
++ $(OBJDIR)/dsutils.o\
++ $(OBJDIR)/dswexec.o\
++ $(OBJDIR)/dswload.o\
++ $(OBJDIR)/dswload2.o\
++ $(OBJDIR)/dswscope.o\
++ $(OBJDIR)/dswstate.o\
++ $(OBJDIR)/exconfig.o\
++ $(OBJDIR)/exconvrt.o\
++ $(OBJDIR)/excreate.o\
++ $(OBJDIR)/exdebug.o\
++ $(OBJDIR)/exdump.o\
++ $(OBJDIR)/exfield.o\
++ $(OBJDIR)/exfldio.o\
++ $(OBJDIR)/exmisc.o\
++ $(OBJDIR)/exmutex.o\
++ $(OBJDIR)/exnames.o\
++ $(OBJDIR)/exoparg1.o\
++ $(OBJDIR)/exoparg2.o\
++ $(OBJDIR)/exoparg3.o\
++ $(OBJDIR)/exoparg6.o\
++ $(OBJDIR)/exprep.o\
++ $(OBJDIR)/exregion.o\
++ $(OBJDIR)/exresnte.o\
++ $(OBJDIR)/exresolv.o\
++ $(OBJDIR)/exresop.o\
++ $(OBJDIR)/exstore.o\
++ $(OBJDIR)/exstoren.o\
++ $(OBJDIR)/exstorob.o\
++ $(OBJDIR)/exsystem.o\
++ $(OBJDIR)/exutils.o\
++ $(OBJDIR)/nsaccess.o\
++ $(OBJDIR)/nsalloc.o\
++ $(OBJDIR)/nsconvert.o\
++ $(OBJDIR)/nsdump.o\
++ $(OBJDIR)/nseval.o\
++ $(OBJDIR)/nsinit.o\
++ $(OBJDIR)/nsload.o\
++ $(OBJDIR)/nsnames.o\
++ $(OBJDIR)/nsobject.o\
++ $(OBJDIR)/nsparse.o\
++ $(OBJDIR)/nssearch.o\
++ $(OBJDIR)/nsutils.o\
++ $(OBJDIR)/nswalk.o\
++ $(OBJDIR)/nsxfeval.o\
++ $(OBJDIR)/nsxfname.o\
++ $(OBJDIR)/nsxfobj.o\
++ $(OBJDIR)/osunixxf.o\
++ $(OBJDIR)/psargs.o\
++ $(OBJDIR)/psloop.o\
++ $(OBJDIR)/psobject.o\
++ $(OBJDIR)/psopcode.o\
++ $(OBJDIR)/psopinfo.o\
++ $(OBJDIR)/psparse.o\
++ $(OBJDIR)/psscope.o\
++ $(OBJDIR)/pstree.o\
++ $(OBJDIR)/psutils.o\
++ $(OBJDIR)/pswalk.o\
++ $(OBJDIR)/psxface.o\
++ $(OBJDIR)/tbfadt.o\
++ $(OBJDIR)/tbfind.o\
++ $(OBJDIR)/tbinstal.o\
++ $(OBJDIR)/tbprint.o\
++ $(OBJDIR)/tbutils.o\
++ $(OBJDIR)/tbxface.o\
++ $(OBJDIR)/tbxfload.o\
++ $(OBJDIR)/tbxfroot.o\
++ $(OBJDIR)/utaddress.o\
++ $(OBJDIR)/utalloc.o\
++ $(OBJDIR)/utbuffer.o\
++ $(OBJDIR)/utcache.o\
++ $(OBJDIR)/utcopy.o\
++ $(OBJDIR)/utdebug.o\
++ $(OBJDIR)/utdecode.o\
++ $(OBJDIR)/utdelete.o\
++ $(OBJDIR)/uterror.o\
++ $(OBJDIR)/utexcep.o\
++ $(OBJDIR)/utglobal.o\
++ $(OBJDIR)/utlock.o\
++ $(OBJDIR)/utmath.o\
++ $(OBJDIR)/utmisc.o\
++ $(OBJDIR)/utmutex.o\
++ $(OBJDIR)/utobject.o\
++ $(OBJDIR)/utosi.o\
++ $(OBJDIR)/utownerid.o\
++ $(OBJDIR)/utstate.o\
++ $(OBJDIR)/utstring.o\
++ $(OBJDIR)/utxface.o\
++ $(OBJDIR)/utxferror.o\
++ $(OBJDIR)/utxfinit.o
++
++#
++# Flags specific to acpinames utility
++#
++CFLAGS += \
++ -DACPI_EXAMPLE_APP\
++ -I$(EXAMPLES)
++
++#
++# Common Rules
++#
++include ../Makefile.rules